move lpc_chip_13xx files

2 files changed, 45 insertions, 47 deletions

diff --git a/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject b/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject
index 6a579d7c4..57e97c2da 100644
--- a/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject
+++ b/examples/device/cdc_msc_hid/ses/lpc13xx/lpc13xx.emProject
@@ -18,13 +18,13 @@
       arm_target_device_name="LPC1347"
       arm_target_interface_type="SWD"
       c_preprocessor_definitions="__LPC1347FBD64__;__LPC1300_FAMILY;__LPC134x_SUBFAMILY;ARM_MATH_CM3;FLASH_PLACEMENT=1;CORE_M3;BOARD_LPCXPRESSO1347;CFG_TUSB_MCU=OPT_MCU_LPC13XX;CFG_TUSB_MEM_SECTION= __attribute__((section(".bss3")));CFG_TUSB_MEM_ALIGN=__attribute__ ((aligned(64)))"
-      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/src;$(lpcDir)/lpc_chip_13xx/inc"
+      c_user_include_directories="../../src;$(rootDir)/hw;$(rootDir)/src;$(lpcDir)/inc"
       debug_register_definition_file="$(ProjectDir)/LPC13Uxx_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
       linker_memory_map_file="$(ProjectDir)/LPC1347FBD64_MemoryMap.xml"
       linker_section_placement_file="$(ProjectDir)/flash_placement.xml"
-      macros="DeviceFamily=LPC1300;DeviceSubFamily=LPC134x;Target=LPC1347FBD64;Placement=Flash;rootDir=../../../../..;lpcDir=../../../../../hw/mcu/nxp/lpc13xx"
+      macros="DeviceFamily=LPC1300;DeviceSubFamily=LPC134x;Target=LPC1347FBD64;Placement=Flash;rootDir=../../../../..;lpcDir=../../../../../hw/mcu/nxp/lpc_chip_13xx"
       package_dependencies="LPC1300"
       project_directory=""
       project_type="Executable"
@@ -57,50 +57,48 @@
       </folder>
       <folder Name="mcu">
         <folder Name="nxp">
-          <folder Name="lpc13xx">
-            <folder Name="lpc_chip_13xx">
-              <folder Name="inc">
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/adc_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/chip.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/clock_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/cmsis.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/cmsis_1347.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/core_cm3.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/core_cmFunc.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/core_cmInstr.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/error.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/flash_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/fmc_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/gpio_13xx_1.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/gpio_13xx_2.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/gpiogroup_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/i2c_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/i2cm_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/iocon_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/lpc_types.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/pinint_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/pmu_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/ring_buffer.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/ritimer_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/romapi_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/ssp_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/stopwatch.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/sys_config.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/sysctl_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/timer_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/uart_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/usbd_13xx.h" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/inc/wwdt_13xx.h" />
-              </folder>
-              <folder Name="src">
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/chip_13xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/clock_13xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/gpio_13xx_1.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/sysctl_13xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/sysinit_13xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/uart_13xx.c" />
-                <file file_name="../../../../../hw/mcu/nxp/lpc13xx/lpc_chip_13xx/src/iocon_13xx.c" />
-              </folder>
+          <folder Name="lpc_chip_13xx">
+            <folder Name="inc">
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/adc_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/chip.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/clock_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/cmsis.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/cmsis_1347.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/core_cm3.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/core_cmFunc.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/core_cmInstr.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/error.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/flash_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/fmc_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/gpio_13xx_1.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/gpio_13xx_2.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/gpiogroup_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/i2c_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/i2cm_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/iocon_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/lpc_types.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/pinint_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/pmu_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/ring_buffer.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/ritimer_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/romapi_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/ssp_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/stopwatch.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/sys_config.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/sysctl_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/timer_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/uart_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/usbd_13xx.h" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/inc/wwdt_13xx.h" />
+            </folder>
+            <folder Name="src">
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/chip_13xx.c" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/clock_13xx.c" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/gpio_13xx_1.c" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/sysctl_13xx.c" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/sysinit_13xx.c" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/uart_13xx.c" />
+              <file file_name="../../../../../hw/mcu/nxp/lpc_chip_13xx/src/iocon_13xx.c" />
             </folder>
           </folder>
         </folder>
diff --git a/examples/device/cdc_msc_hid/src/msc_disk_ram.c b/examples/device/cdc_msc_hid/src/msc_disk_ram.c
index 2293ec0c9..477f8ed17 100644
--- a/examples/device/cdc_msc_hid/src/msc_disk_ram.c
+++ b/examples/device/cdc_msc_hid/src/msc_disk_ram.c
@@ -108,7 +108,7 @@ int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void* buff
 {
   (void) lun;
 
-  uint8_t* addr = msc_disk[lba] + offset;
+  uint8_t const* addr = msc_disk[lba] + offset;
   memcpy(buffer, addr, bufsize);
 
   return bufsize;