From 9ddcff92a721933bb0cd57b2a46a47daeaeec78d Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 18 Jun 2018 14:09:04 +0700
Subject: [PATCH] update

---
 lib/tinyusb                              |  2 +-
 src/make_common.mk                       |  2 +-
 src/segger/nrf52840_bootloader.emProject | 76 ++++++++++++------------
 3 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 5692b84..424735d 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 5692b84ddf3326a3cde48b09f7123cd5ec0e93cc
+Subproject commit 424735d44041fc478b572f973d997829b402153d
diff --git a/src/make_common.mk b/src/make_common.mk
index 1871dbc..1c545ec 100644
--- a/src/make_common.mk
+++ b/src/make_common.mk
@@ -18,7 +18,7 @@ SDK_PATH         = ../../lib/sdk/components
 SDK11_PATH       = ../../lib/sdk11/components
 
 SRC_PATH         = ..
-TUSB_PATH		     = ../../lib/tinyusb/tinyusb
+TUSB_PATH		     = ../../lib/tinyusb/src
 
 SD_NAME          = s140
 SD_VERSION       = 6.0.0
diff --git a/src/segger/nrf52840_bootloader.emProject b/src/segger/nrf52840_bootloader.emProject
index 34e2412..c9d4e67 100644
--- a/src/segger/nrf52840_bootloader.emProject
+++ b/src/segger/nrf52840_bootloader.emProject
@@ -25,7 +25,7 @@
       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;SdkDir=../../lib/sdk/components;Sdk11Dir=../../lib/sdk11/components;SdDir=../../lib/softdevice/6.0.0;TusbDir=../../lib/tinyusb/tinyusb"
+      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;SdkDir=../../lib/sdk/components;Sdk11Dir=../../lib/sdk11/components;SdDir=../../lib/softdevice/6.0.0;TusbDir=../../lib/tinyusb/src"
       project_directory=""
       project_type="Executable"
       target_reset_script="Reset();"
@@ -163,65 +163,63 @@
       </folder>
       <folder Name="tinyusb">
         <folder Name="tinyusb">
-          <file file_name="../../lib/tinyusb/tinyusb/tusb.c" />
-          <file file_name="../../lib/tinyusb/tinyusb/tusb.h" />
-          <file file_name="../../lib/tinyusb/tinyusb/tusb_hal.h" />
-          <file file_name="../../lib/tinyusb/tinyusb/tusb_option.h" />
+          <file file_name="../../lib/tinyusb/src/tusb.c" />
+          <file file_name="../../lib/tinyusb/src/tusb.h" />
+          <file file_name="../../lib/tinyusb/src/tusb_hal.h" />
+          <file file_name="../../lib/tinyusb/src/tusb_option.h" />
           <folder Name="class">
-            <file file_name="../../lib/tinyusb/tinyusb/class/custom_class.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/class/custom_class_host.c" />
             <folder Name="cdc">
-              <file file_name="../../lib/tinyusb/tinyusb/class/cdc/cdc.h" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/cdc/cdc_device.c" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/cdc/cdc_device.h" />
+              <file file_name="../../lib/tinyusb/src/class/cdc/cdc.h" />
+              <file file_name="../../lib/tinyusb/src/class/cdc/cdc_device.c" />
+              <file file_name="../../lib/tinyusb/src/class/cdc/cdc_device.h" />
             </folder>
             <folder Name="hid">
-              <file file_name="../../lib/tinyusb/tinyusb/class/hid/hid.h" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/hid/hid_device.c" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/hid/hid_device.h" />
+              <file file_name="../../lib/tinyusb/src/class/hid/hid.h" />
+              <file file_name="../../lib/tinyusb/src/class/hid/hid_device.c" />
+              <file file_name="../../lib/tinyusb/src/class/hid/hid_device.h" />
             </folder>
             <folder Name="msc">
-              <file file_name="../../lib/tinyusb/tinyusb/class/msc/msc.h" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/msc/msc_device.c" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/msc/msc_device.h" />
+              <file file_name="../../lib/tinyusb/src/class/msc/msc.h" />
+              <file file_name="../../lib/tinyusb/src/class/msc/msc_device.c" />
+              <file file_name="../../lib/tinyusb/src/class/msc/msc_device.h" />
             </folder>
             <folder Name="custom">
-              <file file_name="../../lib/tinyusb/tinyusb/class/custom/custom_device.c" />
-              <file file_name="../../lib/tinyusb/tinyusb/class/custom/custom_device.h" />
+              <file file_name="../../lib/tinyusb/src/class/custom/custom_device.c" />
+              <file file_name="../../lib/tinyusb/src/class/custom/custom_device.h" />
             </folder>
           </folder>
           <folder Name="common">
-            <file file_name="../../lib/tinyusb/tinyusb/common/binary.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/timeout_timer.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_common.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_compiler.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_error.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_fifo.c" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_fifo.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_types.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/common/tusb_verify.h" />
+            <file file_name="../../lib/tinyusb/src/common/binary.h" />
+            <file file_name="../../lib/tinyusb/src/common/timeout_timer.h" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_common.h" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_compiler.h" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_error.h" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_fifo.c" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_fifo.h" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_types.h" />
+            <file file_name="../../lib/tinyusb/src/common/tusb_verify.h" />
             <folder Name="compiler">
-              <file file_name="../../lib/tinyusb/tinyusb/common/compiler/tusb_compiler_gcc.h" />
-              <file file_name="../../lib/tinyusb/tinyusb/common/compiler/tusb_compiler_iar.h" />
+              <file file_name="../../lib/tinyusb/src/common/compiler/tusb_compiler_gcc.h" />
+              <file file_name="../../lib/tinyusb/src/common/compiler/tusb_compiler_iar.h" />
             </folder>
           </folder>
           <folder Name="device">
-            <file file_name="../../lib/tinyusb/tinyusb/device/dcd.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/device/usbd.c" />
-            <file file_name="../../lib/tinyusb/tinyusb/device/usbd.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/device/usbd_pvt.h" />
+            <file file_name="../../lib/tinyusb/src/device/dcd.h" />
+            <file file_name="../../lib/tinyusb/src/device/usbd.c" />
+            <file file_name="../../lib/tinyusb/src/device/usbd.h" />
+            <file file_name="../../lib/tinyusb/src/device/usbd_pvt.h" />
           </folder>
           <folder Name="osal">
-            <file file_name="../../lib/tinyusb/tinyusb/osal/osal.c" />
-            <file file_name="../../lib/tinyusb/tinyusb/osal/osal.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/osal/osal_freeRTOS.h" />
-            <file file_name="../../lib/tinyusb/tinyusb/osal/osal_none.h" />
+            <file file_name="../../lib/tinyusb/src/osal/osal.c" />
+            <file file_name="../../lib/tinyusb/src/osal/osal.h" />
+            <file file_name="../../lib/tinyusb/src/osal/osal_freeRTOS.h" />
+            <file file_name="../../lib/tinyusb/src/osal/osal_none.h" />
           </folder>
           <folder Name="portable">
             <folder Name="nordic">
               <folder Name="nrf5x">
-                <file file_name="../../lib/tinyusb/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c" />
-                <file file_name="../../lib/tinyusb/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c" />
+                <file file_name="../../lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c" />
+                <file file_name="../../lib/tinyusb/src/portable/nordic/nrf5x/hal_nrf5x.c" />
               </folder>
             </folder>
           </folder>