Apply pointer formatting
This commit is contained in:
		@@ -88,7 +88,7 @@ void spiBegin() {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /** SPI read data  */
 | 
			
		||||
  void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
  void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
    if (nbyte-- == 0) return;
 | 
			
		||||
    SPDR = 0xFF;
 | 
			
		||||
    for (uint16_t i = 0; i < nbyte; i++) {
 | 
			
		||||
@@ -107,7 +107,7 @@ void spiBegin() {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  /** SPI send block  */
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
    SPDR = token;
 | 
			
		||||
    for (uint16_t i = 0; i < 512; i += 2) {
 | 
			
		||||
      while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
 | 
			
		||||
@@ -215,7 +215,7 @@ void spiBegin() {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Soft SPI read data
 | 
			
		||||
  void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
  void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
    for (uint16_t i = 0; i < nbyte; i++)
 | 
			
		||||
      buf[i] = spiRec();
 | 
			
		||||
  }
 | 
			
		||||
@@ -242,7 +242,7 @@ void spiBegin() {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  // Soft SPI send block
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
    spiSend(token);
 | 
			
		||||
    for (uint16_t i = 0; i < 512; i++)
 | 
			
		||||
      spiSend(buf[i]);
 | 
			
		||||
 
 | 
			
		||||
@@ -56,8 +56,8 @@
 | 
			
		||||
  #pragma GCC optimize (3)
 | 
			
		||||
 | 
			
		||||
  typedef uint8_t (*pfnSpiTransfer)(uint8_t b);
 | 
			
		||||
  typedef void    (*pfnSpiRxBlock)(uint8_t* buf, uint32_t nbyte);
 | 
			
		||||
  typedef void    (*pfnSpiTxBlock)(const uint8_t* buf, uint32_t nbyte);
 | 
			
		||||
  typedef void    (*pfnSpiRxBlock)(uint8_t *buf, uint32_t nbyte);
 | 
			
		||||
  typedef void    (*pfnSpiTxBlock)(const uint8_t *buf, uint32_t nbyte);
 | 
			
		||||
 | 
			
		||||
  /* ---------------- Macros to be able to access definitions from asm */
 | 
			
		||||
  #define _PORT(IO) DIO ##  IO ## _WPORT
 | 
			
		||||
@@ -270,7 +270,7 @@
 | 
			
		||||
  static pfnSpiTransfer spiTransferTx = (pfnSpiTransfer)spiTransferX;
 | 
			
		||||
 | 
			
		||||
  // Block transfers run at ~8 .. ~10Mhz - Tx version (Rx data discarded)
 | 
			
		||||
  static void spiTxBlock0(const uint8_t* ptr, uint32_t todo) {
 | 
			
		||||
  static void spiTxBlock0(const uint8_t *ptr, uint32_t todo) {
 | 
			
		||||
    uint32_t MOSI_PORT_PLUS30 = ((uint32_t) PORT(SD_MOSI_PIN)) + 0x30;  /* SODR of port */
 | 
			
		||||
    uint32_t MOSI_MASK = PIN_MASK(SD_MOSI_PIN);
 | 
			
		||||
    uint32_t SCK_PORT_PLUS30 = ((uint32_t) PORT(SD_SCK_PIN)) + 0x30;    /* SODR of port */
 | 
			
		||||
@@ -349,7 +349,7 @@
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static void spiRxBlock0(uint8_t* ptr, uint32_t todo) {
 | 
			
		||||
  static void spiRxBlock0(uint8_t *ptr, uint32_t todo) {
 | 
			
		||||
    uint32_t bin = 0;
 | 
			
		||||
    uint32_t work = 0;
 | 
			
		||||
    uint32_t BITBAND_MISO_PORT = BITBAND_ADDRESS( ((uint32_t)PORT(SD_MISO_PIN))+0x3C, PIN_SHIFT(SD_MISO_PIN));  /* PDSR of port in bitband area */
 | 
			
		||||
@@ -425,13 +425,13 @@
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static void spiTxBlockX(const uint8_t* buf, uint32_t todo) {
 | 
			
		||||
  static void spiTxBlockX(const uint8_t *buf, uint32_t todo) {
 | 
			
		||||
    do {
 | 
			
		||||
      (void)spiTransferTx(*buf++);
 | 
			
		||||
    } while (--todo);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  static void spiRxBlockX(uint8_t* buf, uint32_t todo) {
 | 
			
		||||
  static void spiRxBlockX(uint8_t *buf, uint32_t todo) {
 | 
			
		||||
    do {
 | 
			
		||||
      *buf++ = spiTransferRx(0xFF);
 | 
			
		||||
    } while (--todo);
 | 
			
		||||
@@ -463,7 +463,7 @@
 | 
			
		||||
    return b;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
  void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
    if (nbyte) {
 | 
			
		||||
      _SS_WRITE(LOW);
 | 
			
		||||
      WRITE(SD_MOSI_PIN, HIGH); // Output 1s 1
 | 
			
		||||
@@ -478,7 +478,7 @@
 | 
			
		||||
    _SS_WRITE(HIGH);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
    _SS_WRITE(LOW);
 | 
			
		||||
    (void)spiTransferTx(token);
 | 
			
		||||
    spiTxBlock(buf, 512);
 | 
			
		||||
@@ -645,7 +645,7 @@
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Read from SPI into buffer
 | 
			
		||||
    void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
    void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
      if (!nbyte) return;
 | 
			
		||||
      --nbyte;
 | 
			
		||||
      for (int i = 0; i < nbyte; i++) {
 | 
			
		||||
@@ -668,7 +668,7 @@
 | 
			
		||||
      //DELAY_US(1U);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void spiSend(const uint8_t* buf, size_t nbyte) {
 | 
			
		||||
    void spiSend(const uint8_t *buf, size_t nbyte) {
 | 
			
		||||
      if (!nbyte) return;
 | 
			
		||||
      --nbyte;
 | 
			
		||||
      for (size_t i = 0; i < nbyte; i++) {
 | 
			
		||||
@@ -689,7 +689,7 @@
 | 
			
		||||
      FLUSH_RX();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void spiSend(uint32_t chan, const uint8_t* buf, size_t nbyte) {
 | 
			
		||||
    void spiSend(uint32_t chan, const uint8_t *buf, size_t nbyte) {
 | 
			
		||||
      if (!nbyte) return;
 | 
			
		||||
      --nbyte;
 | 
			
		||||
      for (size_t i = 0; i < nbyte; i++) {
 | 
			
		||||
@@ -702,7 +702,7 @@
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Write from buffer to SPI
 | 
			
		||||
    void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
    void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
      SPI0->SPI_TDR = (uint32_t)token | SPI_PCS(SPI_CHAN);
 | 
			
		||||
      WHILE_TX(0);
 | 
			
		||||
      //WHILE_RX(0);
 | 
			
		||||
@@ -801,19 +801,19 @@
 | 
			
		||||
 | 
			
		||||
    uint8_t spiRec() { return (uint8_t)spiTransfer(0xFF); }
 | 
			
		||||
 | 
			
		||||
    void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
    void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
      for (int i = 0; i < nbyte; i++)
 | 
			
		||||
        buf[i] = spiTransfer(0xFF);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void spiSend(uint8_t data) { spiTransfer(data); }
 | 
			
		||||
 | 
			
		||||
    void spiSend(const uint8_t* buf, size_t nbyte) {
 | 
			
		||||
    void spiSend(const uint8_t *buf, size_t nbyte) {
 | 
			
		||||
      for (uint16_t i = 0; i < nbyte; i++)
 | 
			
		||||
        spiTransfer(buf[i]);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
    void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
      spiTransfer(token);
 | 
			
		||||
      for (uint16_t i = 0; i < 512; i++)
 | 
			
		||||
        spiTransfer(buf[i]);
 | 
			
		||||
 
 | 
			
		||||
@@ -139,7 +139,7 @@ static void ee_Dump(const int page, const void* data) {
 | 
			
		||||
 | 
			
		||||
  #ifdef EE_EMU_DEBUG
 | 
			
		||||
 | 
			
		||||
    const uint8_t* c = (const uint8_t*) data;
 | 
			
		||||
    const uint8_t *c = (const uint8_t*) data;
 | 
			
		||||
    char buffer[80];
 | 
			
		||||
 | 
			
		||||
    sprintf_P(buffer, PSTR("Page: %d (0x%04x)\n"), page, page);
 | 
			
		||||
@@ -293,8 +293,8 @@ static bool ee_PageWrite(uint16_t page, const void* data) {
 | 
			
		||||
      ee_Dump(-page, data);
 | 
			
		||||
 | 
			
		||||
      // Calculate count of changed bits
 | 
			
		||||
      uint32_t* p1 = (uint32_t*)addrflash;
 | 
			
		||||
      uint32_t* p2 = (uint32_t*)data;
 | 
			
		||||
      uint32_t *p1 = (uint32_t*)addrflash;
 | 
			
		||||
      uint32_t *p2 = (uint32_t*)data;
 | 
			
		||||
      int count = 0;
 | 
			
		||||
      for (i =0; i<PageSize >> 2; i++) {
 | 
			
		||||
        if (p1[i] != p2[i]) {
 | 
			
		||||
@@ -470,7 +470,7 @@ static uint8_t ee_Read(uint32_t address, bool excludeRAMBuffer=false) {
 | 
			
		||||
  for (int page = curPage - 1; page >= 0; --page) {
 | 
			
		||||
 | 
			
		||||
    // Get a pointer to the flash page
 | 
			
		||||
    uint8_t* pflash = (uint8_t*)getFlashStorage(page + curGroup * PagesPerGroup);
 | 
			
		||||
    uint8_t *pflash = (uint8_t*)getFlashStorage(page + curGroup * PagesPerGroup);
 | 
			
		||||
 | 
			
		||||
    uint16_t i = 0;
 | 
			
		||||
    while (i <= (PageSize - 4)) { /* (PageSize - 4) because otherwise, there is not enough room for data and headers */
 | 
			
		||||
@@ -550,7 +550,7 @@ static uint32_t ee_GetAddrRange(uint32_t address, bool excludeRAMBuffer=false) {
 | 
			
		||||
  for (int page = curPage - 1; page >= 0; --page) {
 | 
			
		||||
 | 
			
		||||
    // Get a pointer to the flash page
 | 
			
		||||
    uint8_t* pflash = (uint8_t*)getFlashStorage(page + curGroup * PagesPerGroup);
 | 
			
		||||
    uint8_t *pflash = (uint8_t*)getFlashStorage(page + curGroup * PagesPerGroup);
 | 
			
		||||
 | 
			
		||||
    uint16_t i = 0;
 | 
			
		||||
    while (i <= (PageSize - 4)) { /* (PageSize - 4) because otherwise, there is not enough room for data and headers */
 | 
			
		||||
@@ -589,7 +589,7 @@ static uint32_t ee_GetAddrRange(uint32_t address, bool excludeRAMBuffer=false) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static bool ee_IsPageClean(int page) {
 | 
			
		||||
  uint32_t* pflash = (uint32_t*) getFlashStorage(page);
 | 
			
		||||
  uint32_t *pflash = (uint32_t*) getFlashStorage(page);
 | 
			
		||||
  for (uint16_t i = 0; i < (PageSize >> 2); ++i)
 | 
			
		||||
    if (*pflash++ != 0xFFFFFFFF) return false;
 | 
			
		||||
  return true;
 | 
			
		||||
@@ -599,7 +599,7 @@ static bool ee_Flush(uint32_t overrideAddress = 0xFFFFFFFF, uint8_t overrideData
 | 
			
		||||
 | 
			
		||||
  // Check if RAM buffer has something to be written
 | 
			
		||||
  bool isEmpty = true;
 | 
			
		||||
  uint32_t* p = (uint32_t*) &buffer[0];
 | 
			
		||||
  uint32_t *p = (uint32_t*) &buffer[0];
 | 
			
		||||
  for (uint16_t j = 0; j < (PageSize >> 2); j++) {
 | 
			
		||||
    if (*p++ != 0xFFFFFFFF) {
 | 
			
		||||
      isEmpty = false;
 | 
			
		||||
 
 | 
			
		||||
@@ -675,11 +675,11 @@ iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void* buf, iram_size_t s
 | 
			
		||||
 *   - \code // Waits and gets a value on CDC line
 | 
			
		||||
	int udi_cdc_getc(void);
 | 
			
		||||
	// Reads a RAM buffer on CDC line
 | 
			
		||||
	iram_size_t udi_cdc_read_buf(int* buf, iram_size_t size);
 | 
			
		||||
	iram_size_t udi_cdc_read_buf(int *buf, iram_size_t size);
 | 
			
		||||
	// Puts a byte on CDC line
 | 
			
		||||
	int udi_cdc_putc(int value);
 | 
			
		||||
	// Writes a RAM buffer on CDC line
 | 
			
		||||
	iram_size_t udi_cdc_write_buf(const int* buf, iram_size_t size); \endcode
 | 
			
		||||
	iram_size_t udi_cdc_write_buf(const int *buf, iram_size_t size); \endcode
 | 
			
		||||
 *
 | 
			
		||||
 * \section udi_cdc_use_cases Advanced use cases
 | 
			
		||||
 * For more advanced use of the UDI CDC module, see the following use cases:
 | 
			
		||||
 
 | 
			
		||||
@@ -264,7 +264,7 @@ bool usb_task_extra_string(void) {
 | 
			
		||||
** Handle device requests that the ASF stack doesn't
 | 
			
		||||
*/
 | 
			
		||||
bool usb_task_other_requests(void) {
 | 
			
		||||
  uint8_t* ptr = 0;
 | 
			
		||||
  uint8_t *ptr = 0;
 | 
			
		||||
  uint16_t size = 0;
 | 
			
		||||
 | 
			
		||||
  if (Udd_setup_type() == USB_REQ_TYPE_VENDOR) {
 | 
			
		||||
 
 | 
			
		||||
@@ -85,7 +85,7 @@ uint8_t spiRec() {
 | 
			
		||||
  return returnByte;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPI.transferBytes(0, buf, nbyte);
 | 
			
		||||
  SPI.endTransaction();
 | 
			
		||||
@@ -97,7 +97,7 @@ void spiSend(uint8_t b) {
 | 
			
		||||
  SPI.endTransaction();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPI.transfer(token);
 | 
			
		||||
  SPI.writeBytes(const_cast<uint8_t*>(buf), 512);
 | 
			
		||||
 
 | 
			
		||||
@@ -137,7 +137,7 @@ size_t WebSocketSerial::write(const uint8_t c) {
 | 
			
		||||
  return ret;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
size_t WebSocketSerial::write(const uint8_t* buffer, size_t size) {
 | 
			
		||||
size_t WebSocketSerial::write(const uint8_t *buffer, size_t size) {
 | 
			
		||||
  size_t written = 0;
 | 
			
		||||
  for (size_t i = 0; i < size; i++)
 | 
			
		||||
    written += write(buffer[i]);
 | 
			
		||||
 
 | 
			
		||||
@@ -54,7 +54,7 @@ public:
 | 
			
		||||
  ring_buffer_pos_t read(uint8_t *buffer);
 | 
			
		||||
  void flush();
 | 
			
		||||
  ring_buffer_pos_t write(const uint8_t c);
 | 
			
		||||
  ring_buffer_pos_t write(const uint8_t* buffer, ring_buffer_pos_t size);
 | 
			
		||||
  ring_buffer_pos_t write(const uint8_t *buffer, ring_buffer_pos_t size);
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class WebSocketSerial: public Stream {
 | 
			
		||||
@@ -70,7 +70,7 @@ public:
 | 
			
		||||
  int read();
 | 
			
		||||
  void flush();
 | 
			
		||||
  size_t write(const uint8_t c);
 | 
			
		||||
  size_t write(const uint8_t* buffer, size_t size);
 | 
			
		||||
  size_t write(const uint8_t *buffer, size_t size);
 | 
			
		||||
 | 
			
		||||
  #if ENABLED(SERIAL_STATS_DROPPED_RX)
 | 
			
		||||
    FORCE_INLINE uint32_t dropped() { return 0; }
 | 
			
		||||
 
 | 
			
		||||
@@ -93,12 +93,12 @@
 | 
			
		||||
 | 
			
		||||
  void spiSend(uint8_t b) { (void)spiTransfer(b); }
 | 
			
		||||
 | 
			
		||||
  void spiSend(const uint8_t* buf, size_t nbyte) {
 | 
			
		||||
  void spiSend(const uint8_t *buf, size_t nbyte) {
 | 
			
		||||
    for (uint16_t i = 0; i < nbyte; i++)
 | 
			
		||||
      (void)spiTransfer(buf[i]);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
    (void)spiTransfer(token);
 | 
			
		||||
    for (uint16_t i = 0; i < 512; i++)
 | 
			
		||||
      (void)spiTransfer(buf[i]);
 | 
			
		||||
@@ -135,13 +135,13 @@
 | 
			
		||||
 | 
			
		||||
  void spiSend(uint8_t b) { doio(b); }
 | 
			
		||||
 | 
			
		||||
  void spiSend(const uint8_t* buf, size_t nbyte) {
 | 
			
		||||
  void spiSend(const uint8_t *buf, size_t nbyte) {
 | 
			
		||||
    for (uint16_t i = 0; i < nbyte; i++) doio(buf[i]);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  void spiSend(uint32_t chan, byte b) {}
 | 
			
		||||
 | 
			
		||||
  void spiSend(uint32_t chan, const uint8_t* buf, size_t nbyte) {}
 | 
			
		||||
  void spiSend(uint32_t chan, const uint8_t *buf, size_t nbyte) {}
 | 
			
		||||
 | 
			
		||||
  // Read single byte from SPI
 | 
			
		||||
  uint8_t spiRec() { return doio(0xFF); }
 | 
			
		||||
@@ -156,7 +156,7 @@
 | 
			
		||||
  uint8_t spiTransfer(uint8_t b) { return doio(b); }
 | 
			
		||||
 | 
			
		||||
  // Write from buffer to SPI
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
   (void)spiTransfer(token);
 | 
			
		||||
    for (uint16_t i = 0; i < 512; i++)
 | 
			
		||||
      (void)spiTransfer(buf[i]);
 | 
			
		||||
 
 | 
			
		||||
@@ -66,7 +66,7 @@
 | 
			
		||||
void spiBegin();
 | 
			
		||||
void spiInit(uint8_t spiRate);
 | 
			
		||||
void spiSend(uint8_t b);
 | 
			
		||||
void spiSend(const uint8_t* buf, size_t n);
 | 
			
		||||
void spiSend(const uint8_t *buf, size_t n);
 | 
			
		||||
 | 
			
		||||
static uint8_t rs_last_state = 255;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -103,7 +103,7 @@
 | 
			
		||||
   * @param  nbyte Number of bytes to receive.
 | 
			
		||||
   * @return Nothing
 | 
			
		||||
   */
 | 
			
		||||
  void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
  void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
    if (nbyte == 0) return;
 | 
			
		||||
    memset(buf, 0xFF, nbyte);
 | 
			
		||||
    sdSPI.beginTransaction(spiConfig);
 | 
			
		||||
@@ -132,7 +132,7 @@
 | 
			
		||||
   *
 | 
			
		||||
   * @details Uses DMA
 | 
			
		||||
   */
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
    sdSPI.beginTransaction(spiConfig);
 | 
			
		||||
    sdSPI.transfer(token);
 | 
			
		||||
    sdSPI.transfer((uint8_t*)buf, nullptr, 512);
 | 
			
		||||
 
 | 
			
		||||
@@ -193,7 +193,7 @@ static SPISettings spiConfig;
 | 
			
		||||
   *
 | 
			
		||||
   * @details Uses DMA
 | 
			
		||||
   */
 | 
			
		||||
  void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
  void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
    if (nbyte == 0) return;
 | 
			
		||||
    memset(buf, 0xFF, nbyte);
 | 
			
		||||
    SPI.transfer(buf, nbyte);
 | 
			
		||||
@@ -218,7 +218,7 @@ static SPISettings spiConfig;
 | 
			
		||||
   *
 | 
			
		||||
   * @details Use DMA
 | 
			
		||||
   */
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
  void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
    uint8_t rxBuf[512];
 | 
			
		||||
    SPI.transfer(token);
 | 
			
		||||
    SPI.transfer((uint8_t*)buf, &rxBuf, 512);
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ struct MarlinSerial : public HardwareSerial {
 | 
			
		||||
  void begin(unsigned long baud, uint8_t config);
 | 
			
		||||
  inline void begin(unsigned long baud) { begin(baud, SERIAL_8N1); }
 | 
			
		||||
 | 
			
		||||
  void _rx_complete_irq(serial_t* obj);
 | 
			
		||||
  void _rx_complete_irq(serial_t *obj);
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
  usart_rx_callback_t _rx_callback;
 | 
			
		||||
 
 | 
			
		||||
@@ -123,7 +123,7 @@ uint8_t spiRec() {
 | 
			
		||||
 *
 | 
			
		||||
 * @details Uses DMA
 | 
			
		||||
 */
 | 
			
		||||
void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
  SPI.dmaTransfer(0, const_cast<uint8_t*>(buf), nbyte);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -146,7 +146,7 @@ void spiSend(uint8_t b) {
 | 
			
		||||
 *
 | 
			
		||||
 * @details Use DMA
 | 
			
		||||
 */
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
  SPI.send(token);
 | 
			
		||||
  SPI.dmaSend(const_cast<uint8_t*>(buf), 512);
 | 
			
		||||
}
 | 
			
		||||
@@ -160,7 +160,7 @@ uint8_t spiRec(uint32_t chan) { return SPI.transfer(0xFF); }
 | 
			
		||||
void spiSend(uint32_t chan, byte b) { SPI.send(b); }
 | 
			
		||||
 | 
			
		||||
// Write buffer to specified SPI channel
 | 
			
		||||
void spiSend(uint32_t chan, const uint8_t* buf, size_t n) {
 | 
			
		||||
void spiSend(uint32_t chan, const uint8_t *buf, size_t n) {
 | 
			
		||||
  for (size_t p = 0; p < n; p++) spiSend(chan, buf[p]);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -48,8 +48,8 @@ static uint8_t ram_eeprom[MARLIN_EEPROM_SIZE] __attribute__((aligned(4))) = {0};
 | 
			
		||||
static bool eeprom_dirty = false;
 | 
			
		||||
 | 
			
		||||
bool PersistentStore::access_start() {
 | 
			
		||||
  const uint32_t* source = reinterpret_cast<const uint32_t*>(EEPROM_PAGE0_BASE);
 | 
			
		||||
  uint32_t* destination = reinterpret_cast<uint32_t*>(ram_eeprom);
 | 
			
		||||
  const uint32_t *source = reinterpret_cast<const uint32_t*>(EEPROM_PAGE0_BASE);
 | 
			
		||||
  uint32_t *destination = reinterpret_cast<uint32_t*>(ram_eeprom);
 | 
			
		||||
 | 
			
		||||
  static_assert(0 == (MARLIN_EEPROM_SIZE) % 4, "MARLIN_EEPROM_SIZE is corrupted. (Must be a multiple of 4.)"); // Ensure copying as uint32_t is safe
 | 
			
		||||
  constexpr size_t eeprom_size_u32 = (MARLIN_EEPROM_SIZE) / 4;
 | 
			
		||||
 
 | 
			
		||||
@@ -82,7 +82,7 @@ uint8_t spiRec() {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SPI read data
 | 
			
		||||
void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPI.transfer(buf, nbyte);
 | 
			
		||||
  SPI.endTransaction();
 | 
			
		||||
@@ -107,7 +107,7 @@ void spiSend(uint8_t b) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// SPI send block
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPDR = token;
 | 
			
		||||
  for (uint16_t i = 0; i < 512; i += 2) {
 | 
			
		||||
 
 | 
			
		||||
@@ -80,7 +80,7 @@ uint8_t spiRec() {
 | 
			
		||||
  //return SPDR;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPI.transfer(buf, nbyte);
 | 
			
		||||
  SPI.endTransaction();
 | 
			
		||||
@@ -103,7 +103,7 @@ void spiSend(uint8_t b) {
 | 
			
		||||
  //while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPDR = token;
 | 
			
		||||
  for (uint16_t i = 0; i < 512; i += 2) {
 | 
			
		||||
 
 | 
			
		||||
@@ -97,7 +97,7 @@ uint8_t spiRec() {
 | 
			
		||||
  //return SPDR;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void spiRead(uint8_t* buf, uint16_t nbyte) {
 | 
			
		||||
void spiRead(uint8_t *buf, uint16_t nbyte) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPI.transfer(buf, nbyte);
 | 
			
		||||
  SPI.endTransaction();
 | 
			
		||||
@@ -120,7 +120,7 @@ void spiSend(uint8_t b) {
 | 
			
		||||
  //while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t* buf) {
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t *buf) {
 | 
			
		||||
  SPI.beginTransaction(spiConfig);
 | 
			
		||||
  SPDR = token;
 | 
			
		||||
  for (uint16_t i = 0; i < 512; i += 2) {
 | 
			
		||||
 
 | 
			
		||||
@@ -42,7 +42,7 @@ struct MinSerial {
 | 
			
		||||
      HAL_min_serial_out(ch);
 | 
			
		||||
  }
 | 
			
		||||
  // Send String through UART
 | 
			
		||||
  static void TX(const char* s) { while (*s) TX(*s++); }
 | 
			
		||||
  static void TX(const char *s) { while (*s) TX(*s++); }
 | 
			
		||||
  // Send a digit through UART
 | 
			
		||||
  static void TXDigit(uint32_t d) {
 | 
			
		||||
    if (d < 10) TX((char)(d+'0'));
 | 
			
		||||
 
 | 
			
		||||
@@ -71,10 +71,10 @@ void spiSend(uint8_t b);
 | 
			
		||||
uint8_t spiRec();
 | 
			
		||||
 | 
			
		||||
// Read from SPI into buffer
 | 
			
		||||
void spiRead(uint8_t* buf, uint16_t nbyte);
 | 
			
		||||
void spiRead(uint8_t *buf, uint16_t nbyte);
 | 
			
		||||
 | 
			
		||||
// Write token and then write from 512 byte buffer to SPI (for SD card)
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t* buf);
 | 
			
		||||
void spiSendBlock(uint8_t token, const uint8_t *buf);
 | 
			
		||||
 | 
			
		||||
// Begin SPI transaction, set clock, bit order, data mode
 | 
			
		||||
void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode);
 | 
			
		||||
@@ -87,7 +87,7 @@ void spiBeginTransaction(uint32_t spiClock, uint8_t bitOrder, uint8_t dataMode);
 | 
			
		||||
void spiSend(uint32_t chan, byte b);
 | 
			
		||||
 | 
			
		||||
// Write buffer to specified SPI channel
 | 
			
		||||
void spiSend(uint32_t chan, const uint8_t* buf, size_t n);
 | 
			
		||||
void spiSend(uint32_t chan, const uint8_t *buf, size_t n);
 | 
			
		||||
 | 
			
		||||
// Read single byte from specified SPI channel
 | 
			
		||||
uint8_t spiRec(uint32_t chan);
 | 
			
		||||
 
 | 
			
		||||
@@ -44,7 +44,7 @@ static bool UnwReportOut(void* ctx, const UnwReport* bte) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef UNW_DEBUG
 | 
			
		||||
  void UnwPrintf(const char* format, ...) {
 | 
			
		||||
  void UnwPrintf(const char *format, ...) {
 | 
			
		||||
    char dest[256];
 | 
			
		||||
    va_list argptr;
 | 
			
		||||
    va_start(argptr, format);
 | 
			
		||||
 
 | 
			
		||||
@@ -45,11 +45,11 @@ public:
 | 
			
		||||
 | 
			
		||||
  // Read one or more bytes of data and update the CRC
 | 
			
		||||
  // Return 'true' on read error
 | 
			
		||||
  static bool read_data(int &pos, uint8_t* value, size_t size, uint16_t *crc, const bool writing=true);
 | 
			
		||||
  static bool read_data(int &pos, uint8_t *value, size_t size, uint16_t *crc, const bool writing=true);
 | 
			
		||||
 | 
			
		||||
  // Write one or more bytes of data
 | 
			
		||||
  // Return 'true' on write error
 | 
			
		||||
  static inline bool write_data(const int pos, const uint8_t* value, const size_t size=sizeof(uint8_t)) {
 | 
			
		||||
  static inline bool write_data(const int pos, const uint8_t *value, const size_t size=sizeof(uint8_t)) {
 | 
			
		||||
    int data_pos = pos;
 | 
			
		||||
    uint16_t crc = 0;
 | 
			
		||||
    return write_data(data_pos, value, size, &crc);
 | 
			
		||||
@@ -61,7 +61,7 @@ public:
 | 
			
		||||
 | 
			
		||||
  // Read one or more bytes of data
 | 
			
		||||
  // Return 'true' on read error
 | 
			
		||||
  static inline bool read_data(const int pos, uint8_t* value, const size_t size=1) {
 | 
			
		||||
  static inline bool read_data(const int pos, uint8_t *value, const size_t size=1) {
 | 
			
		||||
    int data_pos = pos;
 | 
			
		||||
    uint16_t crc = 0;
 | 
			
		||||
    return read_data(data_pos, value, size, &crc);
 | 
			
		||||
 
 | 
			
		||||
@@ -55,7 +55,7 @@ static void _eeprom_begin(uint8_t * const pos, const uint8_t cmd) {
 | 
			
		||||
                                  // Leave the Bus in-use
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint8_t eeprom_read_byte(uint8_t* pos) {
 | 
			
		||||
uint8_t eeprom_read_byte(uint8_t *pos) {
 | 
			
		||||
  _eeprom_begin(pos, CMD_READ);   // Set read location and begin transmission
 | 
			
		||||
 | 
			
		||||
  const uint8_t v = spiRec(SPI_CHAN_EEPROM1); // After READ a value sits on the Bus
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user