Merge pull request #3530 from hathach/hcd_ip3516

Add IP3516 HCD support 

16 files changed, 225 insertions, 288 deletions

diff --git a/examples/host/bare_api/only.txt b/examples/host/bare_api/only.txt
index f07d63f9d..1ddfc2b5c 100644
--- a/examples/host/bare_api/only.txt
+++ b/examples/host/bare_api/only.txt
@@ -8,6 +8,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/bare_api/skip.txt b/examples/host/bare_api/skip.txt
new file mode 100644
index 000000000..308796869
--- /dev/null
+++ b/examples/host/bare_api/skip.txt
@@ -0,0 +1 @@
+board:lpcxpresso54114
diff --git a/examples/host/bare_api/src/main.c b/examples/host/bare_api/src/main.c
index 81d4d8731..544f38102 100644
--- a/examples/host/bare_api/src/main.c
+++ b/examples/host/bare_api/src/main.c
@@ -37,11 +37,13 @@
 #define BUF_COUNT   4
 
 
-tusb_desc_device_t desc_device;
+CFG_TUH_MEM_SECTION tusb_desc_device_t desc_device;
 
-uint8_t buf_pool[BUF_COUNT][64];
+CFG_TUH_MEM_SECTION uint8_t buf_pool[BUF_COUNT][64];
 uint8_t buf_owner[BUF_COUNT] = { 0 }; // device address that owns buffer
 
+CFG_TUH_MEM_SECTION uint16_t temp_buf[128]; // temp buffer for string descriptor
+
 //--------------------------------------------------------------------+
 // MACRO CONSTANT TYPEDEF PROTYPES
 //--------------------------------------------------------------------+
@@ -118,8 +120,6 @@ void print_device_descriptor(tuh_xfer_t *xfer) {
   printf("  bcdDevice           %04x\r\n"   , desc_device.bcdDevice);
 
   // Get String descriptor using Sync API
-  uint16_t temp_buf[128];
-
   printf("  iManufacturer       %u     ", desc_device.iManufacturer);
   if (XFER_RESULT_SUCCESS == tuh_descriptor_get_manufacturer_string_sync(daddr, LANGUAGE_ID, temp_buf, sizeof(temp_buf))) {
     print_utf16(temp_buf, TU_ARRAY_SIZE(temp_buf));
@@ -384,12 +384,12 @@ static int _count_utf8_bytes(const uint16_t *buf, size_t len) {
   return (int) total_bytes;
 }
 
-static void print_utf16(uint16_t *temp_buf, size_t buf_len) {
-  if ((temp_buf[0] & 0xff) == 0) return;// empty
-  size_t utf16_len = ((temp_buf[0] & 0xff) - 2) / sizeof(uint16_t);
-  size_t utf8_len = (size_t) _count_utf8_bytes(temp_buf + 1, utf16_len);
-  _convert_utf16le_to_utf8(temp_buf + 1, utf16_len, (uint8_t *) temp_buf, sizeof(uint16_t) * buf_len);
-  ((uint8_t *) temp_buf)[utf8_len] = '\0';
+static void print_utf16(uint16_t *buf, size_t buf_len) {
+  if ((buf[0] & 0xff) == 0) return;// empty
+  size_t utf16_len = ((buf[0] & 0xff) - 2) / sizeof(uint16_t);
+  size_t utf8_len = (size_t) _count_utf8_bytes(buf + 1, utf16_len);
+  _convert_utf16le_to_utf8(buf + 1, utf16_len, (uint8_t *) buf, sizeof(uint16_t) * buf_len);
+  ((uint8_t *) buf)[utf8_len] = '\0';
 
-  printf("%s", (char *) temp_buf);
+  printf("%s", (char *) buf);
 }
diff --git a/examples/host/cdc_msc_hid/only.txt b/examples/host/cdc_msc_hid/only.txt
index f07d63f9d..1ddfc2b5c 100644
--- a/examples/host/cdc_msc_hid/only.txt
+++ b/examples/host/cdc_msc_hid/only.txt
@@ -8,6 +8,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/cdc_msc_hid/skip.txt b/examples/host/cdc_msc_hid/skip.txt
new file mode 100644
index 000000000..308796869
--- /dev/null
+++ b/examples/host/cdc_msc_hid/skip.txt
@@ -0,0 +1 @@
+board:lpcxpresso54114
diff --git a/examples/host/cdc_msc_hid_freertos/only.txt b/examples/host/cdc_msc_hid_freertos/only.txt
index b0460b362..753fa7cd3 100644
--- a/examples/host/cdc_msc_hid_freertos/only.txt
+++ b/examples/host/cdc_msc_hid_freertos/only.txt
@@ -6,6 +6,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/cdc_msc_hid_freertos/skip.txt b/examples/host/cdc_msc_hid_freertos/skip.txt
index 2ba4438fd..54e7be1ba 100644
--- a/examples/host/cdc_msc_hid_freertos/skip.txt
+++ b/examples/host/cdc_msc_hid_freertos/skip.txt
@@ -1 +1,2 @@
 mcu:RP2040
+board:lpcxpresso54114
diff --git a/examples/host/device_info/only.txt b/examples/host/device_info/only.txt
index 714c1078a..742935dcf 100644
--- a/examples/host/device_info/only.txt
+++ b/examples/host/device_info/only.txt
@@ -9,6 +9,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/device_info/skip.txt b/examples/host/device_info/skip.txt
new file mode 100644
index 000000000..308796869
--- /dev/null
+++ b/examples/host/device_info/skip.txt
@@ -0,0 +1 @@
+board:lpcxpresso54114
diff --git a/examples/host/hid_controller/only.txt b/examples/host/hid_controller/only.txt
index 8ec2f5cfe..45ca6846f 100644
--- a/examples/host/hid_controller/only.txt
+++ b/examples/host/hid_controller/only.txt
@@ -8,6 +8,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/hid_controller/skip.txt b/examples/host/hid_controller/skip.txt
new file mode 100644
index 000000000..308796869
--- /dev/null
+++ b/examples/host/hid_controller/skip.txt
@@ -0,0 +1 @@
+board:lpcxpresso54114
diff --git a/examples/host/midi_rx/only.txt b/examples/host/midi_rx/only.txt
index 9d647a340..c71aacd87 100644
--- a/examples/host/midi_rx/only.txt
+++ b/examples/host/midi_rx/only.txt
@@ -11,6 +11,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/midi_rx/skip.txt b/examples/host/midi_rx/skip.txt
new file mode 100644
index 000000000..308796869
--- /dev/null
+++ b/examples/host/midi_rx/skip.txt
@@ -0,0 +1 @@
+board:lpcxpresso54114
diff --git a/examples/host/msc_file_explorer/only.txt b/examples/host/msc_file_explorer/only.txt
index f07d63f9d..1ddfc2b5c 100644
--- a/examples/host/msc_file_explorer/only.txt
+++ b/examples/host/msc_file_explorer/only.txt
@@ -8,6 +8,8 @@ mcu:LPC177X_8X
 mcu:LPC18XX
 mcu:LPC40XX
 mcu:LPC43XX
+mcu:LPC54
+mcu:LPC55
 mcu:MAX3421
 mcu:MIMXRT10XX
 mcu:MIMXRT11XX
diff --git a/examples/host/msc_file_explorer/skip.txt b/examples/host/msc_file_explorer/skip.txt
new file mode 100644
index 000000000..308796869
--- /dev/null
+++ b/examples/host/msc_file_explorer/skip.txt
@@ -0,0 +1 @@
+board:lpcxpresso54114
diff --git a/examples/host/msc_file_explorer/src/msc_app.c b/examples/host/msc_file_explorer/src/msc_app.c
index 7e019818a..6ac63e937 100644
--- a/examples/host/msc_file_explorer/src/msc_app.c
+++ b/examples/host/msc_file_explorer/src/msc_app.c
@@ -49,11 +49,14 @@
 #define CLI_BINDING_COUNT   8
 
 static EmbeddedCli *_cli;
-static CLI_UINT cli_buffer[BYTES_TO_CLI_UINTS(CLI_BUFFER_SIZE)];
+static CLI_UINT     cli_buffer[BYTES_TO_CLI_UINTS(CLI_BUFFER_SIZE)];
 
 //------------- Elm Chan FatFS -------------//
-static FATFS fatfs[CFG_TUH_DEVICE_MAX]; // for simplicity only support 1 LUN per device
-static volatile bool _disk_busy[CFG_TUH_DEVICE_MAX];
+static CFG_TUH_MEM_SECTION FATFS fatfs[CFG_TUH_DEVICE_MAX]; // for simplicity only support 1 LUN per device
+static volatile bool              _disk_busy[CFG_TUH_DEVICE_MAX];
+
+static CFG_TUH_MEM_SECTION FIL     file1, file2;
+static CFG_TUH_MEM_SECTION uint8_t rw_buf[512];
 
 // define the buffer to be place in USB/DMA memory with correct alignment/cache line size
 CFG_TUH_MEM_SECTION static struct {
@@ -67,34 +70,30 @@ CFG_TUH_MEM_SECTION static struct {
 
 bool cli_init(void);
 
-bool msc_app_init(void)
-{
-  for(size_t i=0; i<CFG_TUH_DEVICE_MAX; i++) {
+bool msc_app_init(void) {
+  for (size_t i = 0; i < CFG_TUH_DEVICE_MAX; i++) {
     _disk_busy[i] = false;
   }
 
-  // disable stdout buffered for echoing typing command
-  #ifndef __ICCARM__ // TODO IAR doesn't support stream control ?
+// disable stdout buffered for echoing typing command
+#ifndef __ICCARM__ // TODO IAR doesn't support stream control ?
   setbuf(stdout, NULL);
-  #endif
+#endif
 
   cli_init();
 
   return true;
 }
 
-void msc_app_task(void)
-{
+void msc_app_task(void) {
   if (!_cli) {
     return;
   }
 
   int ch = board_getchar();
-  if ( ch > 0 )
-  {
-    while( ch > 0 )
-    {
-      embeddedCliReceiveChar(_cli, (char) ch);
+  if (ch > 0) {
+    while (ch > 0) {
+      embeddedCliReceiveChar(_cli, (char)ch);
       ch = board_getchar();
     }
     embeddedCliProcess(_cli);
@@ -105,33 +104,32 @@ void msc_app_task(void)
 //
 //--------------------------------------------------------------------+
 
-static bool inquiry_complete_cb(uint8_t dev_addr, tuh_msc_complete_data_t const * cb_data) {
-  msc_cbw_t const* cbw = cb_data->cbw;
-  msc_csw_t const* csw = cb_data->csw;
+static bool inquiry_complete_cb(uint8_t dev_addr, const tuh_msc_complete_data_t *cb_data) {
+  const msc_cbw_t *cbw = cb_data->cbw;
+  const msc_csw_t *csw = cb_data->csw;
 
-  if (csw->status != 0)
-  {
+  if (csw->status != 0) {
     printf("Inquiry failed\r\n");
     return false;
   }
 
   // Print out Vendor ID, Product ID and Rev
-  printf("%.8s %.16s rev %.4s\r\n", scsi_resp.inquiry.vendor_id, scsi_resp.inquiry.product_id, scsi_resp.inquiry.product_rev);
+  printf("%.8s %.16s rev %.4s\r\n", scsi_resp.inquiry.vendor_id, scsi_resp.inquiry.product_id,
+         scsi_resp.inquiry.product_rev);
 
   // Get capacity of device
-  uint32_t const block_count = tuh_msc_get_block_count(dev_addr, cbw->lun);
-  uint32_t const block_size = tuh_msc_get_block_size(dev_addr, cbw->lun);
+  const uint32_t block_count = tuh_msc_get_block_count(dev_addr, cbw->lun);
+  const uint32_t block_size  = tuh_msc_get_block_size(dev_addr, cbw->lun);
 
-  printf("Disk Size: %" PRIu32 " MB\r\n", block_count / ((1024*1024)/block_size));
+  printf("Disk Size: %" PRIu32 " MB\r\n", block_count / ((1024 * 1024) / block_size));
   // printf("Block Count = %lu, Block Size: %lu\r\n", block_count, block_size);
 
   // For simplicity: we only mount 1 LUN per device
-  uint8_t const drive_num = dev_addr-1;
-  char drive_path[3] = "0:";
+  const uint8_t drive_num     = dev_addr - 1;
+  char          drive_path[3] = "0:";
   drive_path[0] += drive_num;
 
-  if ( f_mount(&fatfs[drive_num], drive_path, 1) != FR_OK )
-  {
+  if (f_mount(&fatfs[drive_num], drive_path, 1) != FR_OK) {
     puts("mount failed");
   }
 
@@ -139,144 +137,129 @@ static bool inquiry_complete_cb(uint8_t dev_addr, tuh_msc_complete_data_t const
   f_chdir(drive_path);
 
   // print the drive label
-//  char label[34];
-//  if ( FR_OK == f_getlabel(drive_path, label, NULL) )
-//  {
-//    puts(label);
-//  }
+  //  char label[34];
+  //  if ( FR_OK == f_getlabel(drive_path, label, NULL) )
+  //  {
+  //    puts(label);
+  //  }
 
   return true;
 }
 
 //------------- IMPLEMENTATION -------------//
-void tuh_msc_mount_cb(uint8_t dev_addr)
-{
+void tuh_msc_mount_cb(uint8_t dev_addr) {
   printf("A MassStorage device is mounted\r\n");
 
-  uint8_t const lun = 0;
+  const uint8_t lun = 0;
   tuh_msc_inquiry(dev_addr, lun, &scsi_resp.inquiry, inquiry_complete_cb, 0);
 }
 
-void tuh_msc_umount_cb(uint8_t dev_addr)
-{
+void tuh_msc_umount_cb(uint8_t dev_addr) {
   printf("A MassStorage device is unmounted\r\n");
 
-  uint8_t const drive_num = dev_addr-1;
-  char drive_path[3] = "0:";
+  const uint8_t drive_num     = dev_addr - 1;
+  char          drive_path[3] = "0:";
   drive_path[0] += drive_num;
 
   f_unmount(drive_path);
 
-//  if ( phy_disk == f_get_current_drive() )
-//  { // active drive is unplugged --> change to other drive
-//    for(uint8_t i=0; i<CFG_TUH_DEVICE_MAX; i++)
-//    {
-//      if ( disk_is_ready(i) )
-//      {
-//        f_chdrive(i);
-//        cli_init(); // refractor, rename
-//      }
-//    }
-//  }
+  //  if ( phy_disk == f_get_current_drive() )
+  //  { // active drive is unplugged --> change to other drive
+  //    for(uint8_t i=0; i<CFG_TUH_DEVICE_MAX; i++)
+  //    {
+  //      if ( disk_is_ready(i) )
+  //      {
+  //        f_chdrive(i);
+  //        cli_init(); // refractor, rename
+  //      }
+  //    }
+  //  }
 }
 
 //--------------------------------------------------------------------+
 // DiskIO
 //--------------------------------------------------------------------+
 
-static void wait_for_disk_io(BYTE pdrv)
-{
-  while(_disk_busy[pdrv])
-  {
+static void wait_for_disk_io(BYTE pdrv) {
+  while (_disk_busy[pdrv]) {
     tuh_task();
   }
 }
 
-static bool disk_io_complete(uint8_t dev_addr, tuh_msc_complete_data_t const * cb_data)
-{
-  (void) dev_addr; (void) cb_data;
-  _disk_busy[dev_addr-1] = false;
+static bool disk_io_complete(uint8_t dev_addr, const tuh_msc_complete_data_t *cb_data) {
+  (void)dev_addr;
+  (void)cb_data;
+  _disk_busy[dev_addr - 1] = false;
   return true;
 }
 
-DSTATUS disk_status (
-	BYTE pdrv		/* Physical drive nmuber to identify the drive */
-)
-{
+DSTATUS disk_status(BYTE pdrv /* Physical drive nmuber to identify the drive */
+) {
   uint8_t dev_addr = pdrv + 1;
   return tuh_msc_mounted(dev_addr) ? 0 : STA_NODISK;
 }
 
-DSTATUS disk_initialize (
-	BYTE pdrv				/* Physical drive nmuber to identify the drive */
-)
-{
-  (void) pdrv;
-	return 0; // nothing to do
+DSTATUS disk_initialize(BYTE pdrv /* Physical drive nmuber to identify the drive */
+) {
+  (void)pdrv;
+  return 0;                       // nothing to do
 }
 
-DRESULT disk_read (
-	BYTE pdrv,		/* Physical drive nmuber to identify the drive */
-	BYTE *buff,		/* Data buffer to store read data */
-	LBA_t sector,	/* Start sector in LBA */
-	UINT count		/* Number of sectors to read */
-)
-{
-	uint8_t const dev_addr = pdrv + 1;
-	uint8_t const lun = 0;
+DRESULT disk_read(BYTE  pdrv,     /* Physical drive nmuber to identify the drive */
+                  BYTE *buff,     /* Data buffer to store read data */
+                  LBA_t sector,   /* Start sector in LBA */
+                  UINT  count     /* Number of sectors to read */
+) {
+  const uint8_t dev_addr = pdrv + 1;
+  const uint8_t lun      = 0;
 
-	_disk_busy[pdrv] = true;
-	tuh_msc_read10(dev_addr, lun, buff, sector, (uint16_t) count, disk_io_complete, 0);
-	wait_for_disk_io(pdrv);
+  _disk_busy[pdrv] = true;
+  tuh_msc_read10(dev_addr, lun, buff, sector, (uint16_t)count, disk_io_complete, 0);
+  wait_for_disk_io(pdrv);
 
-	return RES_OK;
+  return RES_OK;
 }
 
 #if FF_FS_READONLY == 0
 
-DRESULT disk_write (
-	BYTE pdrv,			/* Physical drive nmuber to identify the drive */
-	const BYTE *buff,	/* Data to be written */
-	LBA_t sector,		/* Start sector in LBA */
-	UINT count			/* Number of sectors to write */
-)
-{
-	uint8_t const dev_addr = pdrv + 1;
-	uint8_t const lun = 0;
+DRESULT disk_write(BYTE        pdrv,   /* Physical drive nmuber to identify the drive */
+                   const BYTE *buff,   /* Data to be written */
+                   LBA_t       sector, /* Start sector in LBA */
+                   UINT        count   /* Number of sectors to write */
+) {
+  const uint8_t dev_addr = pdrv + 1;
+  const uint8_t lun      = 0;
 
-	_disk_busy[pdrv] = true;
-	tuh_msc_write10(dev_addr, lun, buff, sector, (uint16_t) count, disk_io_complete, 0);
-	wait_for_disk_io(pdrv);
+  _disk_busy[pdrv] = true;
+  tuh_msc_write10(dev_addr, lun, buff, sector, (uint16_t)count, disk_io_complete, 0);
+  wait_for_disk_io(pdrv);
 
-	return RES_OK;
+  return RES_OK;
 }
 
 #endif
 
-DRESULT disk_ioctl (
-	BYTE pdrv,		/* Physical drive nmuber (0..) */
-	BYTE cmd,		/* Control code */
-	void *buff		/* Buffer to send/receive control data */
-)
-{
-  uint8_t const dev_addr = pdrv + 1;
-  uint8_t const lun = 0;
-  switch ( cmd )
-  {
+DRESULT disk_ioctl(BYTE  pdrv, /* Physical drive nmuber (0..) */
+                   BYTE  cmd,  /* Control code */
+                   void *buff  /* Buffer to send/receive control data */
+) {
+  const uint8_t dev_addr = pdrv + 1;
+  const uint8_t lun      = 0;
+  switch (cmd) {
     case CTRL_SYNC:
       // nothing to do since we do blocking
       return RES_OK;
 
     case GET_SECTOR_COUNT:
-      *((DWORD*) buff) = (WORD) tuh_msc_get_block_count(dev_addr, lun);
+      *((DWORD *)buff) = (WORD)tuh_msc_get_block_count(dev_addr, lun);
       return RES_OK;
 
     case GET_SECTOR_SIZE:
-      *((WORD*) buff) = (WORD) tuh_msc_get_block_size(dev_addr, lun);
+      *((WORD *)buff) = (WORD)tuh_msc_get_block_size(dev_addr, lun);
       return RES_OK;
 
     case GET_BLOCK_SIZE:
-      *((DWORD*) buff) = 1;    // erase block size in units of sector size
+      *((DWORD *)buff) = 1; // erase block size in units of sector size
       return RES_OK;
 
     default:
@@ -298,12 +281,11 @@ void cli_cmd_mv(EmbeddedCli *cli, char *args, void *context);
 void cli_cmd_rm(EmbeddedCli *cli, char *args, void *context);
 
 static void cli_write_char(EmbeddedCli *cli, char c) {
-  (void) cli;
-  putchar((int) c);
+  (void)cli;
+  putchar((int)c);
 }
 
-bool cli_init(void)
-{
+bool cli_init(void) {
   EmbeddedCliConfig *config = embeddedCliDefaultConfig();
   config->cliBuffer         = cli_buffer;
   config->cliBufferSize     = CLI_BUFFER_SIZE;
@@ -319,230 +301,173 @@ bool cli_init(void)
 
   _cli->writeChar = cli_write_char;
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "cat",
-    "Usage: cat [FILE]...\r\n\tConcatenate FILE(s) to standard output..",
-    true,
-    NULL,
-    cli_cmd_cat
-  });
+  embeddedCliAddBinding(_cli,
+                        (CliCommandBinding){"cat", "Usage: cat [FILE]...\r\n\tConcatenate FILE(s) to standard output..",
+                                            true, NULL, cli_cmd_cat});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "cd",
-    "Usage: cd [DIR]...\r\n\tChange the current directory to DIR.",
-    true,
-    NULL,
-    cli_cmd_cd
-  });
+  embeddedCliAddBinding(_cli, (CliCommandBinding){"cd", "Usage: cd [DIR]...\r\n\tChange the current directory to DIR.",
+                                                  true, NULL, cli_cmd_cd});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "cp",
-    "Usage: cp SOURCE DEST\r\n\tCopy SOURCE to DEST.",
-    true,
-    NULL,
-    cli_cmd_cp
-  });
+  embeddedCliAddBinding(_cli, (CliCommandBinding){"cp", "Usage: cp SOURCE DEST\r\n\tCopy SOURCE to DEST.", true, NULL,
+                                                  cli_cmd_cp});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "ls",
-    "Usage: ls [DIR]...\r\n\tList information about the FILEs (the current directory by default).",
-    true,
-    NULL,
-    cli_cmd_ls
-  });
+  embeddedCliAddBinding(_cli, (CliCommandBinding){"ls",
+                                                  "Usage: ls [DIR]...\r\n\tList information about the FILEs (the "
+                                                  "current directory by default).",
+                                                  true, NULL, cli_cmd_ls});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "pwd",
-    "Usage: pwd\r\n\tPrint the name of the current working directory.",
-    true,
-    NULL,
-    cli_cmd_pwd
-  });
+  embeddedCliAddBinding(_cli,
+                        (CliCommandBinding){"pwd", "Usage: pwd\r\n\tPrint the name of the current working directory.",
+                                            true, NULL, cli_cmd_pwd});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "mkdir",
-    "Usage: mkdir DIR...\r\n\tCreate the DIRECTORY(ies), if they do not already exist..",
-    true,
-    NULL,
-    cli_cmd_mkdir
-  });
+  embeddedCliAddBinding(_cli, (CliCommandBinding){"mkdir",
+                                                  "Usage: mkdir DIR...\r\n\tCreate the DIRECTORY(ies), if they do not "
+                                                  "already exist..",
+                                                  true, NULL, cli_cmd_mkdir});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "mv",
-    "Usage: mv SOURCE DEST...\r\n\tRename SOURCE to DEST.",
-    true,
-    NULL,
-    cli_cmd_mv
-  });
+  embeddedCliAddBinding(_cli, (CliCommandBinding){"mv", "Usage: mv SOURCE DEST...\r\n\tRename SOURCE to DEST.", true,
+                                                  NULL, cli_cmd_mv});
 
-  embeddedCliAddBinding(_cli, (CliCommandBinding) {
-    "rm",
-    "Usage: rm [FILE]...\r\n\tRemove (unlink) the FILE(s).",
-    true,
-    NULL,
-    cli_cmd_rm
-  });
+  embeddedCliAddBinding(_cli, (CliCommandBinding){"rm", "Usage: rm [FILE]...\r\n\tRemove (unlink) the FILE(s).", true,
+                                                  NULL, cli_cmd_rm});
 
   return true;
 }
 
-void cli_cmd_cat(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_cat(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
 
   // need at least 1 argument
-  if ( argc == 0 )
-  {
+  if (argc == 0) {
     printf("invalid arguments\r\n");
     return;
   }
 
-  for(uint16_t i=0; i<argc; i++)
-  {
-    FIL fi;
-    const char* fpath = embeddedCliGetToken(args, i+1); // token count from 1
+  for (uint16_t i = 0; i < argc; i++) {
+    FIL        *fi    = &file1;
+    const char *fpath = embeddedCliGetToken(args, i + 1); // token count from 1
 
-    if ( FR_OK != f_open(&fi, fpath, FA_READ) )
-    {
+    if (FR_OK != f_open(fi, fpath, FA_READ)) {
       printf("%s: No such file or directory\r\n", fpath);
-    }else
-    {
-      uint8_t buf[512];
+    } else {
       UINT count = 0;
-      while ( (FR_OK == f_read(&fi, buf, sizeof(buf), &count)) && (count > 0) )
-      {
-        for(UINT c = 0; c < count; c++)
-        {
-          const uint8_t ch = buf[c];
-          if (isprint(ch) || iscntrl(ch))
-          {
+      while ((FR_OK == f_read(fi, rw_buf, sizeof(rw_buf), &count)) && (count > 0)) {
+        for (UINT c = 0; c < count; c++) {
+          const uint8_t ch = rw_buf[c];
+          if (isprint(ch) || iscntrl(ch)) {
             putchar(ch);
-          }else
-          {
+          } else {
             putchar('.');
           }
         }
       }
     }
 
-    f_close(&fi);
+    f_close(fi);
   }
 }
 
-void cli_cmd_cd(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_cd(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
 
   // only support 1 argument
-  if ( argc != 1 )
-  {
+  if (argc != 1) {
     printf("invalid arguments\r\n");
     return;
   }
 
   // default is current directory
-  const char* dpath = args;
+  const char *dpath = args;
 
-  if ( FR_OK != f_chdir(dpath) )
-  {
+  if (FR_OK != f_chdir(dpath)) {
     printf("%s: No such file or directory\r\n", dpath);
     return;
   }
 }
 
-void cli_cmd_cp(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_cp(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
-  if ( argc != 2 )
-  {
+  if (argc != 2) {
     printf("invalid arguments\r\n");
     return;
   }
 
   // default is current directory
-  const char* src = embeddedCliGetToken(args, 1);
-  const char* dst = embeddedCliGetToken(args, 2);
+  const char *src = embeddedCliGetToken(args, 1);
+  const char *dst = embeddedCliGetToken(args, 2);
 
-  FIL f_src;
-  FIL f_dst;
+  FIL *f_src = &file1;
+  FIL *f_dst = &file2;
 
-  if ( FR_OK != f_open(&f_src, src, FA_READ) )
-  {
+  if (FR_OK != f_open(f_src, src, FA_READ)) {
     printf("cannot stat '%s': No such file or directory\r\n", src);
     return;
   }
 
-  if ( FR_OK != f_open(&f_dst, dst, FA_WRITE | FA_CREATE_ALWAYS) )
-  {
+  if (FR_OK != f_open(f_dst, dst, FA_WRITE | FA_CREATE_ALWAYS)) {
     printf("cannot create '%s'\r\n", dst);
     return;
-  }else
-  {
-    uint8_t buf[512];
+  } else {
     UINT rd_count = 0;
-    while ( (FR_OK == f_read(&f_src, buf, sizeof(buf), &rd_count)) && (rd_count > 0) )
-    {
+    while ((FR_OK == f_read(f_src, rw_buf, sizeof(rw_buf), &rd_count)) && (rd_count > 0)) {
       UINT wr_count = 0;
 
-      if ( FR_OK != f_write(&f_dst, buf, rd_count, &wr_count) )
-      {
+      if (FR_OK != f_write(f_dst, rw_buf, rd_count, &wr_count)) {
         printf("cannot write to '%s'\r\n", dst);
         break;
       }
     }
   }
 
-  f_close(&f_src);
-  f_close(&f_dst);
+  f_close(f_src);
+  f_close(f_dst);
 }
 
-void cli_cmd_ls(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_ls(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
 
   // only support 1 argument
-  if ( argc > 1 )
-  {
+  if (argc > 1) {
     printf("invalid arguments\r\n");
     return;
   }
 
   // default is current directory
-  const char* dpath = ".";
-  if (argc) dpath = args;
+  const char *dpath = ".";
+  if (argc) {
+    dpath = args;
+  }
 
   DIR dir;
-  if ( FR_OK != f_opendir(&dir, dpath) )
-  {
+  if (FR_OK != f_opendir(&dir, dpath)) {
     printf("cannot access '%s': No such file or directory\r\n", dpath);
     return;
   }
 
   FILINFO fno;
-  while( (f_readdir(&dir, &fno) == FR_OK) && (fno.fname[0] != 0) )
-  {
-    if ( fno.fname[0] != '.' ) // ignore . and .. entry
+  while ((f_readdir(&dir, &fno) == FR_OK) && (fno.fname[0] != 0)) {
+    if (fno.fname[0] != '.') // ignore . and .. entry
     {
-      if ( fno.fattrib & AM_DIR )
-      {
+      if (fno.fattrib & AM_DIR) {
         // directory
         printf("/%s\r\n", fno.fname);
-      }else
-      {
+      } else {
         printf("%-40s", fno.fname);
-        if (fno.fsize < 1024)
-        {
+        if (fno.fsize < 1024) {
           printf("%" PRIu32 " B\r\n", fno.fsize);
-        }else
-        {
+        } else {
           printf("%" PRIu32 " KB\r\n", fno.fsize / 1024);
         }
       }
@@ -552,90 +477,81 @@ void cli_cmd_ls(EmbeddedCli *cli, char *args, void *context)
   f_closedir(&dir);
 }
 
-void cli_cmd_pwd(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_pwd(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
   uint16_t argc = embeddedCliGetTokenCount(args);
 
-  if (argc != 0)
-  {
+  if (argc != 0) {
     printf("invalid arguments\r\n");
     return;
   }
 
   char path[256];
-  if (FR_OK != f_getcwd(path, sizeof(path)))
-  {
+  if (FR_OK != f_getcwd(path, sizeof(path))) {
     printf("cannot get current working directory\r\n");
   }
 
   puts(path);
 }
 
-void cli_cmd_mkdir(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_mkdir(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
 
   // only support 1 argument
-  if ( argc != 1 )
-  {
+  if (argc != 1) {
     printf("invalid arguments\r\n");
     return;
   }
 
   // default is current directory
-  const char* dpath = args;
+  const char *dpath = args;
 
-  if ( FR_OK != f_mkdir(dpath) )
-  {
+  if (FR_OK != f_mkdir(dpath)) {
     printf("%s: cannot create this directory\r\n", dpath);
     return;
   }
 }
 
-void cli_cmd_mv(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_mv(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
-  if ( argc != 2 )
-  {
+  if (argc != 2) {
     printf("invalid arguments\r\n");
     return;
   }
 
   // default is current directory
-  const char* src = embeddedCliGetToken(args, 1);
-  const char* dst = embeddedCliGetToken(args, 2);
+  const char *src = embeddedCliGetToken(args, 1);
+  const char *dst = embeddedCliGetToken(args, 2);
 
-  if ( FR_OK != f_rename(src, dst) )
-  {
+  if (FR_OK != f_rename(src, dst)) {
     printf("cannot mv %s to %s\r\n", src, dst);
     return;
   }
 }
 
-void cli_cmd_rm(EmbeddedCli *cli, char *args, void *context)
-{
-  (void) cli; (void) context;
+void cli_cmd_rm(EmbeddedCli *cli, char *args, void *context) {
+  (void)cli;
+  (void)context;
 
   uint16_t argc = embeddedCliGetTokenCount(args);
 
   // need at least 1 argument
-  if ( argc == 0 )
-  {
+  if (argc == 0) {
     printf("invalid arguments\r\n");
     return;
   }
 
-  for(uint16_t i=0; i<argc; i++)
-  {
-    const char* fpath = embeddedCliGetToken(args, i+1); // token count from 1
+  for (uint16_t i = 0; i < argc; i++) {
+    const char *fpath = embeddedCliGetToken(args, i + 1); // token count from 1
 
-    if ( FR_OK != f_unlink(fpath) )
-    {
+    if (FR_OK != f_unlink(fpath)) {
       printf("cannot remove '%s': No such file or directory\r\n", fpath);
     }
   }