refactor examples

17 files changed, 38 insertions, 42 deletions

diff --git a/examples/device/nrf52840/segger/flash_placement.xml b/examples/device/device_composite/ses/ses_nrf5x/flash_placement.xml
index 951d23710..951d23710 100644
--- a/examples/device/nrf52840/segger/flash_placement.xml
+++ b/examples/device/device_composite/ses/ses_nrf5x/flash_placement.xml
diff --git a/examples/device/nrf52840/segger/nRF52840_xxAA_MemoryMap.xml b/examples/device/device_composite/ses/ses_nrf5x/nRF52840_xxAA_MemoryMap.xml
index cc4056c0d..cc4056c0d 100644
--- a/examples/device/nrf52840/segger/nRF52840_xxAA_MemoryMap.xml
+++ b/examples/device/device_composite/ses/ses_nrf5x/nRF52840_xxAA_MemoryMap.xml
diff --git a/examples/device/nrf52840/segger/nRF_Target.js b/examples/device/device_composite/ses/ses_nrf5x/nRF_Target.js
index 20560af43..20560af43 100644
--- a/examples/device/nrf52840/segger/nRF_Target.js
+++ b/examples/device/device_composite/ses/ses_nrf5x/nRF_Target.js
diff --git a/examples/device/nrf52840/segger/nrf52840.emProject b/examples/device/device_composite/ses/ses_nrf5x/nrf52840.emProject
index 5851c33d6..9e93bbd65 100644
--- a/examples/device/nrf52840/segger/nrf52840.emProject
+++ b/examples/device/device_composite/ses/ses_nrf5x/nrf52840.emProject
@@ -20,13 +20,13 @@
       arm_target_interface_type="SWD"
       build_treat_warnings_as_errors="Yes"
       c_preprocessor_definitions="NRF52840_XXAA;__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;BOARD_PCA10056"
-      c_user_include_directories="../src;$(tusbDir)/hw/cmsis/Include;$(tusbDir)/hw;$(tusbDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include"
+      c_user_include_directories="../../src;$(tusbDir)/hw/cmsis/Include;$(tusbDir)/hw;$(tusbDir)/src;$(nrfxDir)/..;$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include"
       debug_register_definition_file="$(ProjectDir)/nrf52840_Registers.xml"
       debug_target_connection="J-Link"
       gcc_entry_point="Reset_Handler"
       linker_memory_map_file="$(ProjectDir)/nRF52840_xxAA_MemoryMap.xml"
       linker_section_placement_file="$(ProjectDir)/flash_placement.xml"
-      macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;tusbDir=../../../..;nrfxDir=../../../../hw/mcu/nordic/nrfx"
+      macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;tusbDir=../../../../..;nrfxDir=../../../../../hw/mcu/nordic/nrfx"
       project_directory=""
       project_type="Executable"
       target_reset_script="Reset();"
@@ -44,70 +44,66 @@
       Name="tinyusb"
       exclude=""
       filter="*.c;*.h"
-      path="../../../../src"
+      path="../../../../../src"
       recurse="Yes" />
     <folder Name="src">
-      <file file_name="../src/main.c" />
-      <file file_name="../src/tusb_config.h" />
-      <file file_name="../src/tusb_descriptors.c" />
-      <file file_name="../src/tusb_descriptors.h" />
-      <file file_name="../src/msc_app.c" />
-      <file file_name="../src/msc_app.h" />
-      <file file_name="../src/msc_flash_ram.c" />
-      <file file_name="../src/msc_flash_qspi.c" />
+      <file file_name="../../src/main.c" />
+      <file file_name="../../src/tusb_config.h" />
+      <file file_name="../../src/tusb_descriptors.c" />
+      <file file_name="../../src/tusb_descriptors.h" />
+      <file file_name="../../src/msc_app.c" />
+      <file file_name="../../src/msc_app.h" />
+      <file file_name="../../src/msc_flash_ram.c" />
+      <file file_name="../../src/msc_flash_qspi.c" />
       <folder Name="segger_rtt">
-        <file file_name="../src/segger_rtt/SEGGER_RTT.c" />
-        <file file_name="../src/segger_rtt/SEGGER_RTT_Conf.h" />
-        <file file_name="../src/segger_rtt/SEGGER_RTT.h" />
-        <file file_name="../src/segger_rtt/SEGGER_RTT_SES.c" />
+        <file file_name="../../src/segger_rtt/SEGGER_RTT.c" />
+        <file file_name="../../src/segger_rtt/SEGGER_RTT_Conf.h" />
+        <file file_name="../../src/segger_rtt/SEGGER_RTT.h" />
+        <file file_name="../../src/segger_rtt/SEGGER_RTT_SES.c" />
       </folder>
     </folder>
     <folder Name="hw">
       <folder Name="bsp">
         <folder Name="pca10056">
-          <file file_name="../../../../hw/bsp/pca10056/board_pca10056.c" />
-          <file file_name="../../../../hw/bsp/pca10056/board_pca10056.h" />
+          <file file_name="../../../../../hw/bsp/pca10056/board_pca10056.c" />
+          <file file_name="../../../../../hw/bsp/pca10056/board_pca10056.h" />
         </folder>
-        <file file_name="../../../../hw/bsp/ansi_escape.h" />
-        <file file_name="../../../../hw/bsp/board.h" />
+        <file file_name="../../../../../hw/bsp/ansi_escape.h" />
+        <file file_name="../../../../../hw/bsp/board.h" />
       </folder>
       <folder Name="mcu">
         <folder Name="nordic">
           <folder Name="nrfx">
             <folder Name="drivers">
               <folder Name="include">
-                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_power_clock.h" />
-                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_power.h" />
-                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_qspi.h" />
+                <file file_name="../../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_power_clock.h" />
+                <file file_name="../../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_power.h" />
+                <file file_name="../../../../../hw/mcu/nordic/nrfx/drivers/include/nrfx_qspi.h" />
               </folder>
               <folder Name="src">
-                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_power.c" />
-                <file file_name="../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_qspi.c" />
+                <file file_name="../../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_power.c" />
+                <file file_name="../../../../../hw/mcu/nordic/nrfx/drivers/src/nrfx_qspi.c" />
               </folder>
             </folder>
             <folder Name="hal">
-              <file file_name="../../../../hw/mcu/nordic/nrfx/hal/nrf_power.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/hal/nrf_qspi.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/hal/nrf_usbd.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/hal/nrf_power.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/hal/nrf_qspi.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/hal/nrf_usbd.h" />
             </folder>
             <folder Name="mdk">
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf51_to_nrf52840.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_bitfields.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_peripherals.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/nrf52_to_nrf52840.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/ses_startup_nrf52840.s" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/ses_startup_nrf_common.s" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/system_nrf52840.c" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/mdk/system_nrf52840.h" />
-            </folder>
-            <folder Name="soc">
-              <file file_name="../../../../hw/mcu/nordic/nrfx/soc/nrfx_irqs.h" />
-              <file file_name="../../../../hw/mcu/nordic/nrfx/soc/nrfx_irqs_nrf52840.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/nrf51_to_nrf52840.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_bitfields.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/nrf52840.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/nrf52840_peripherals.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/nrf52_to_nrf52840.h" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/ses_startup_nrf52840.s" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/ses_startup_nrf_common.s" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/system_nrf52840.c" />
+              <file file_name="../../../../../hw/mcu/nordic/nrfx/mdk/system_nrf52840.h" />
             </folder>
           </folder>
-          <file file_name="../../../../hw/mcu/nordic/nrfx_config.h" />
-          <file file_name="../../../../hw/mcu/nordic/nrfx_glue.h" />
+          <file file_name="../../../../../hw/mcu/nordic/nrfx_config.h" />
+          <file file_name="../../../../../hw/mcu/nordic/nrfx_glue.h" />
         </folder>
       </folder>
     </folder>
diff --git a/examples/device/nrf52840/segger/nrf52840_Registers.xml b/examples/device/device_composite/ses/ses_nrf5x/nrf52840_Registers.xml
index 39f861f95..39f861f95 100644
--- a/examples/device/nrf52840/segger/nrf52840_Registers.xml
+++ b/examples/device/device_composite/ses/ses_nrf5x/nrf52840_Registers.xml
diff --git a/examples/device/nrf52840/segger/thumb_crt0.s b/examples/device/device_composite/ses/ses_nrf5x/thumb_crt0.s
index 71820cb51..71820cb51 100644
--- a/examples/device/nrf52840/segger/thumb_crt0.s
+++ b/examples/device/device_composite/ses/ses_nrf5x/thumb_crt0.s
diff --git a/examples/device/nrf52840/src/main.c b/examples/device/device_composite/src/main.c
index 11b73ebf9..11b73ebf9 100644
--- a/examples/device/nrf52840/src/main.c
+++ b/examples/device/device_composite/src/main.c
diff --git a/examples/device/nrf52840/src/msc_app.c b/examples/device/device_composite/src/msc_app.c
index 52cf58f78..52cf58f78 100644
--- a/examples/device/nrf52840/src/msc_app.c
+++ b/examples/device/device_composite/src/msc_app.c
diff --git a/examples/device/nrf52840/src/msc_app.h b/examples/device/device_composite/src/msc_app.h
index 38d0f4c99..38d0f4c99 100644
--- a/examples/device/nrf52840/src/msc_app.h
+++ b/examples/device/device_composite/src/msc_app.h
diff --git a/examples/device/nrf52840/src/msc_flash_qspi.c b/examples/device/device_composite/src/msc_flash_qspi.c
index 53bdc5a71..53bdc5a71 100644
--- a/examples/device/nrf52840/src/msc_flash_qspi.c
+++ b/examples/device/device_composite/src/msc_flash_qspi.c
diff --git a/examples/device/nrf52840/src/msc_flash_ram.c b/examples/device/device_composite/src/msc_flash_ram.c
index 269a72fa4..269a72fa4 100644
--- a/examples/device/nrf52840/src/msc_flash_ram.c
+++ b/examples/device/device_composite/src/msc_flash_ram.c
diff --git a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT.c b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.c
index aee5bd21e..aee5bd21e 100644
--- a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT.c
+++ b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.c
diff --git a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT.h b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.h
index d3cac44dd..d3cac44dd 100644
--- a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT.h
+++ b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.h
diff --git a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT_Conf.h b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_Conf.h
index aef3b4053..aef3b4053 100644
--- a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT_Conf.h
+++ b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_Conf.h
diff --git a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT_SES.c b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_SES.c
index e6634147c..e6634147c 100644
--- a/examples/device/nrf52840/src/segger_rtt/SEGGER_RTT_SES.c
+++ b/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_SES.c
diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/device_composite/src/tusb_config.h
index 680036859..680036859 100644
--- a/examples/device/nrf52840/src/tusb_config.h
+++ b/examples/device/device_composite/src/tusb_config.h
diff --git a/examples/device/nrf52840/src/tusb_descriptors.c b/examples/device/device_composite/src/tusb_descriptors.c
index 2b219c87a..2b219c87a 100644
--- a/examples/device/nrf52840/src/tusb_descriptors.c
+++ b/examples/device/device_composite/src/tusb_descriptors.c