fix build problem with lpcxrepsso

11 files changed, 58 insertions, 58 deletions

diff --git a/demos/device/src/cdc_device_app.c b/demos/device/src/cdc_device_app.c
index 90b38e21d..d4f295d76 100644
--- a/demos/device/src/cdc_device_app.c
+++ b/demos/device/src/cdc_device_app.c
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     cdcd_app.c

+    @file     cdc_device_app.c

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -36,7 +36,7 @@
 */

 /**************************************************************************/

 

-#include "cdcd_app.h"

+#include "cdc_device_app.h"

 

 #if TUSB_CFG_DEVICE_CDC

 

diff --git a/demos/device/src/cdc_device_app.h b/demos/device/src/cdc_device_app.h
index c11019bd7..e65e48bb6 100644
--- a/demos/device/src/cdc_device_app.h
+++ b/demos/device/src/cdc_device_app.h
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     cdcd_app.h

+    @file     cdc_device_app.h

     @author   hathach (tinyusb.org)

 

     @section LICENSE

diff --git a/demos/device/src/keyboard_device_app.c b/demos/device/src/keyboard_device_app.c
index 0fa73aa59..64be878ea 100644
--- a/demos/device/src/keyboard_device_app.c
+++ b/demos/device/src/keyboard_device_app.c
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     keyboardd_app.c

+    @file     keyboard_device_app.c

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -36,7 +36,7 @@
 */

 /**************************************************************************/

 

-#include "keyboardd_app.h"

+#include "keyboard_device_app.h"

 

 #if TUSB_CFG_DEVICE_HID_KEYBOARD

 //--------------------------------------------------------------------+

@@ -50,7 +50,7 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-OSAL_TASK_DEF(keyboardd_app_task, 128, KEYBOARDD_APP_TASK_PRIO);

+OSAL_TASK_DEF(keyboard_device_app_task, 128, KEYBOARDD_APP_TASK_PRIO);

 

 TUSB_CFG_ATTR_USBRAM hid_keyboard_report_t keyboard_report;

 

@@ -116,12 +116,12 @@ void tusbd_hid_keyboard_set_report_cb(uint8_t coreid, hid_request_report_type_t
 //--------------------------------------------------------------------+

 // APPLICATION CODE

 //--------------------------------------------------------------------+

-void keyboardd_app_init(void)

+void keyboard_device_app_init(void)

 {

-  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(keyboardd_app_task) ), VOID_RETURN);

+  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(keyboard_device_app_task) ), VOID_RETURN);

 }

 

-OSAL_TASK_FUNCTION( keyboardd_app_task , p_task_para)

+OSAL_TASK_FUNCTION( keyboard_device_app_task , p_task_para)

 {

   OSAL_TASK_LOOP_BEGIN

 

diff --git a/demos/device/src/keyboard_device_app.h b/demos/device/src/keyboard_device_app.h
index 0e7ae4360..5639d4669 100644
--- a/demos/device/src/keyboard_device_app.h
+++ b/demos/device/src/keyboard_device_app.h
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     keyboardd_app.h

+    @file     keyboard_device_app.h

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -55,13 +55,13 @@
 

 #if TUSB_CFG_DEVICE_HID_KEYBOARD

 

-void keyboardd_app_init(void);

-OSAL_TASK_FUNCTION( keyboardd_app_task , p_task_para);

+void keyboard_device_app_init(void);

+OSAL_TASK_FUNCTION( keyboard_device_app_task , p_task_para);

 

 #else

 

-#define keyboardd_app_init()

-#define keyboardd_app_task(x)

+#define keyboard_device_app_init()

+#define keyboard_device_app_task(x)

 

 #endif

 

diff --git a/demos/device/src/main.c b/demos/device/src/main.c
index f4a027fb6..f0639da5d 100644
--- a/demos/device/src/main.c
+++ b/demos/device/src/main.c
@@ -46,10 +46,10 @@
 #include "board.h"

 #include "tusb.h"

 

-#include "mscd_app.h"

-#include "keyboardd_app.h"

-#include "moused_app.h"

-#include "cdcd_app.h"

+#include "msc_device_app.h"

+#include "keyboard_device_app.h"

+#include "mouse_device_app.h"

+#include "cdc_device_app.h"

 

 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

@@ -69,9 +69,9 @@ void os_none_start_scheduler(void)
     tusb_task_runner();

     led_blinking_task(NULL);

 

-    mscd_app_task(NULL);

-    keyboardd_app_task(NULL);

-    moused_app_task(NULL);

+    msc_device_app_task(NULL);

+    keyboard_device_app_task(NULL);

+    mouse_device_app_task(NULL);

     cdcd_serial_app_task(NULL);

   }

 }

@@ -87,9 +87,9 @@ int main(void)
   //------------- application task init -------------//

   led_blinking_init();

 

-  mscd_app_init();

-  keyboardd_app_init();

-  moused_app_init();

+  msc_device_app_init();

+  keyboard_device_app_init();

+  mouse_device_app_init();

   cdcd_serial_app_init();

 

   //------------- start OS scheduler (never return) -------------//

diff --git a/demos/device/src/mouse_device_app.c b/demos/device/src/mouse_device_app.c
index e123e1bb8..982a4829c 100644
--- a/demos/device/src/mouse_device_app.c
+++ b/demos/device/src/mouse_device_app.c
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     moused_app.c

+    @file     mouse_device_app.c

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -36,7 +36,7 @@
 */

 /**************************************************************************/

 

-#include "moused_app.h"

+#include "mouse_device_app.h"

 

 #if TUSB_CFG_DEVICE_HID_MOUSE

 //--------------------------------------------------------------------+

@@ -50,7 +50,7 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-OSAL_TASK_DEF(moused_app_task, 128, MOUSED_APP_TASK_PRIO);

+OSAL_TASK_DEF(mouse_device_app_task, 128, MOUSED_APP_TASK_PRIO);

 

 TUSB_CFG_ATTR_USBRAM hid_mouse_report_t mouse_report;

 

@@ -93,12 +93,12 @@ void tusbd_hid_mouse_set_report_cb(uint8_t coreid, hid_request_report_type_t rep
 //--------------------------------------------------------------------+

 // APPLICATION CODE

 //--------------------------------------------------------------------+

-void moused_app_init(void)

+void mouse_device_app_init(void)

 {

-  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(moused_app_task) ), VOID_RETURN);

+  ASSERT( TUSB_ERROR_NONE == osal_task_create( OSAL_TASK_REF(mouse_device_app_task) ), VOID_RETURN);

 }

 

-OSAL_TASK_FUNCTION( moused_app_task , p_task_para)

+OSAL_TASK_FUNCTION( mouse_device_app_task , p_task_para)

 {

   OSAL_TASK_LOOP_BEGIN

 

diff --git a/demos/device/src/mouse_device_app.h b/demos/device/src/mouse_device_app.h
index 39c33da0d..d3459f303 100644
--- a/demos/device/src/mouse_device_app.h
+++ b/demos/device/src/mouse_device_app.h
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     moused_app.h

+    @file     mouse_device_app.h

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -55,13 +55,13 @@
 

 #if TUSB_CFG_DEVICE_HID_MOUSE

 

-void moused_app_init(void);

-OSAL_TASK_FUNCTION( moused_app_task , p_task_para);

+void mouse_device_app_init(void);

+OSAL_TASK_FUNCTION( mouse_device_app_task , p_task_para);

 

 #else

 

-#define moused_app_init()

-#define moused_app_task(x)

+#define mouse_device_app_init()

+#define mouse_device_app_task(x)

 

 #endif

 

diff --git a/demos/device/src/msc_device_app.c b/demos/device/src/msc_device_app.c
index 55f0448cd..852fdf34e 100644
--- a/demos/device/src/msc_device_app.c
+++ b/demos/device/src/msc_device_app.c
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     mscd_app.c

+    @file     msc_device_app.c

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -36,7 +36,7 @@
 */

 /**************************************************************************/

 

-#include "mscd_app.h"

+#include "msc_device_app.h"

 

 #if TUSB_CFG_DEVICE_MSC

 //--------------------------------------------------------------------+

@@ -149,14 +149,14 @@ msc_csw_status_t tusbd_msc_scsi_cb (uint8_t coreid, uint8_t lun, uint8_t scsi_cm
 //--------------------------------------------------------------------+

 // IMPLEMENTATION

 //--------------------------------------------------------------------+

-OSAL_TASK_FUNCTION( mscd_app_task , p_task_para)

+OSAL_TASK_FUNCTION( msc_device_app_task , p_task_para)

 { // no need to implement the task yet

   OSAL_TASK_LOOP_BEGIN

 

   OSAL_TASK_LOOP_END

 }

 

-void mscd_app_init (void)

+void msc_device_app_init (void)

 {

 

 }

diff --git a/demos/device/src/msc_device_app.h b/demos/device/src/msc_device_app.h
index 885c2b425..aad18bc93 100644
--- a/demos/device/src/msc_device_app.h
+++ b/demos/device/src/msc_device_app.h
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     mscd_app.h

+    @file     msc_device_app.h

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -72,15 +72,15 @@ issue at github.com/hathach/tinyusb"
   #define MSCD_APP_RAMDISK

 #endif

 

-void mscd_app_init(void);

-OSAL_TASK_FUNCTION( mscd_app_task , p_task_para);

+void msc_device_app_init(void);

+OSAL_TASK_FUNCTION( msc_device_app_task , p_task_para);

 

 extern scsi_sense_fixed_data_t mscd_sense_data;

 

 #else

 

-#define mscd_app_init()

-#define mscd_app_task(x)

+#define msc_device_app_init()

+#define msc_device_app_task(x)

 

 #endif

 

diff --git a/demos/device/src/msc_device_ramdisk.c b/demos/device/src/msc_device_ramdisk.c
index b4fde39cd..b835b37d4 100644
--- a/demos/device/src/msc_device_ramdisk.c
+++ b/demos/device/src/msc_device_ramdisk.c
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     mscd_app_ramdisk.c

+    @file     msc_device_ramdisk.c

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -36,7 +36,7 @@
 */

 /**************************************************************************/

 

-#include "mscd_app.h"

+#include "msc_device_app.h"

 

 #if TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_RAMDISK)

 

@@ -48,7 +48,7 @@
 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

 TUSB_CFG_ATTR_USBRAM

-uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =

+uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =

 {

   //------------- Boot Sector -------------//

   // byte_per_sector    = DISK_BLOCK_SIZE; fat12_sector_num_16  = DISK_BLOCK_NUM;

@@ -93,13 +93,13 @@ uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
 //--------------------------------------------------------------------+

 uint16_t tusbd_msc_read10_cb (uint8_t coreid, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)

 {

-  (*pp_buffer) = mscd_app_ramdisk[lba];

+  (*pp_buffer) = msc_device_ramdisk[lba];

 

   return min16_of(block_count, DISK_BLOCK_NUM);

 }

 uint16_t tusbd_msc_write10_cb(uint8_t coreid, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)

 {

-  (*pp_buffer) = mscd_app_ramdisk[lba];

+  (*pp_buffer) = msc_device_ramdisk[lba];

 

   return min16_of(block_count, DISK_BLOCK_NUM);

 }

@@ -165,7 +165,7 @@ typedef ATTR_PACKED_STRUCT(struct) {
 

 STATIC_ASSERT(sizeof(fat_directory_t) == 32, "size is not correct");

 

-void fat12_fs_init(uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE])

+void fat12_fs_init(uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE])

 {

   uint8_t const readme_contents[] =

 "This is tinyusb's MassStorage Class demo.\r\n\r\n\

@@ -173,7 +173,7 @@ If you find any bugs or get any questions, feel free to file an\r\n\
 issue at https://github.com/hathach/tinyusb";

 

   //------------- Boot Sector -------------//

-  fat12_boot_sector_t* p_boot_fat = (fat12_boot_sector_t* ) mscd_app_ramdisk[0];

+  fat12_boot_sector_t* p_boot_fat = (fat12_boot_sector_t* ) msc_device_ramdisk[0];

   memclr_(p_boot_fat, sizeof(fat12_boot_sector_t));

 

   memcpy(p_boot_fat->jump_code, "\xEB\x3C\x90", 3);

@@ -198,10 +198,10 @@ issue at https://github.com/hathach/tinyusb";
   p_boot_fat->fat_signature           = 0xAA55;

 

   //------------- FAT12 Table (first 2 entries are F8FF, third entry is cluster end of readme file-------------//

-  memcpy(mscd_app_ramdisk[1], "\xF8\xFF\xFF\xFF\x0F", 5);

+  memcpy(msc_device_ramdisk[1], "\xF8\xFF\xFF\xFF\x0F", 5);

 

   //------------- Root Directory -------------//

-  fat_directory_t* p_entry = (fat_directory_t*) mscd_app_ramdisk[2];

+  fat_directory_t* p_entry = (fat_directory_t*) msc_device_ramdisk[2];

 

   // first entry is volume label

   (*p_entry) = (fat_directory_t)

@@ -228,7 +228,7 @@ issue at https://github.com/hathach/tinyusb";
   }; // first entry is volume label

 

   //------------- Readme Content -------------//

-  memcpy(mscd_app_ramdisk[3], readme_contents, sizeof(readme_contents)-1);

+  memcpy(msc_device_ramdisk[3], readme_contents, sizeof(readme_contents)-1);

 

 }

 #endif

diff --git a/demos/device/src/msc_device_romdisk.c b/demos/device/src/msc_device_romdisk.c
index a4a22a6bf..7452262e1 100644
--- a/demos/device/src/msc_device_romdisk.c
+++ b/demos/device/src/msc_device_romdisk.c
@@ -1,6 +1,6 @@
 /**************************************************************************/

 /*!

-    @file     mscd_app_romdisk.c

+    @file     msc_device_romdisk.c

     @author   hathach (tinyusb.org)

 

     @section LICENSE

@@ -36,7 +36,7 @@
 */

 /**************************************************************************/

 

-#include "mscd_app.h"

+#include "msc_device_app.h"

 

 #if TUSB_CFG_DEVICE_MSC && defined (MSCD_APP_ROMDISK)

 

@@ -51,7 +51,7 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

 //--------------------------------------------------------------------+

-const uint8_t mscd_app_rommdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =

+const uint8_t msc_device_app_rommdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =

 {

   //------------- Boot Sector -------------//

   // byte_per_sector    = DISK_BLOCK_SIZE; fat12_sector_num_16  = DISK_BLOCK_NUM;

@@ -99,7 +99,7 @@ static uint8_t sector_buffer[DISK_BLOCK_SIZE];
 //--------------------------------------------------------------------+

 uint16_t tusbd_msc_read10_cb (uint8_t coreid, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)

 {

-  memcpy(sector_buffer, mscd_app_rommdisk[lba], DISK_BLOCK_SIZE);

+  memcpy(sector_buffer, msc_device_app_rommdisk[lba], DISK_BLOCK_SIZE);

   (*pp_buffer) = sector_buffer;

 

   return 1;