From c20071c55c5ebc077cccb9380e9e2eaec45a7852 Mon Sep 17 00:00:00 2001 From: hathach Date: Mon, 22 Apr 2013 11:00:43 +0700 Subject: [PATCH] fix compiler error for USB1 to none in ehci.c rename and moving bsp ea4357 --- .../Lib_OemBaseBoard/inc/acc.h | 0 .../Lib_OemBaseBoard/inc/base_eeprom.h | 0 .../Lib_OemBaseBoard/inc/joystick.h | 0 .../Lib_OemBaseBoard/inc/lm75a.h | 0 .../Lib_OemBaseBoard/inc/memreg.h | 0 .../Lib_OemBaseBoard/inc/norflash.h | 0 .../Lib_OemBaseBoard/inc/pca9532.h | 0 .../Lib_OemBaseBoard/inc/uda1380.h | 0 .../Lib_OemBaseBoard/src/acc.c | 0 .../Lib_OemBaseBoard/src/base_eeprom.c | 0 .../Lib_OemBaseBoard/src/joystick.c | 0 .../Lib_OemBaseBoard/src/lm75a.c | 0 .../Lib_OemBaseBoard/src/memreg.c | 0 .../Lib_OemBaseBoard/src/norflash.c | 0 .../Lib_OemBaseBoard/src/pca9532.c | 0 .../Lib_OemBaseBoard/src/uda1380.c | 0 demos/host/host_os_none/.cproject | 684 +++++++++++++++++- demos/host/host_os_none/.project | 2 +- tinyusb/host/ehci/ehci.c | 2 +- 19 files changed, 682 insertions(+), 6 deletions(-) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/acc.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/base_eeprom.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/joystick.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/lm75a.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/memreg.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/norflash.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/pca9532.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/inc/uda1380.h (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/acc.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/base_eeprom.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/joystick.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/lm75a.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/memreg.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/norflash.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/pca9532.c (100%) rename demos/bsp/boards/{EA4357 => embedded_artists}/Lib_OemBaseBoard/src/uda1380.c (100%) diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/acc.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/acc.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/acc.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/acc.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/base_eeprom.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/base_eeprom.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/base_eeprom.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/base_eeprom.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/joystick.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/joystick.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/joystick.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/joystick.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/lm75a.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/lm75a.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/lm75a.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/lm75a.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/memreg.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/memreg.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/memreg.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/memreg.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/norflash.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/norflash.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/norflash.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/norflash.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/pca9532.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/pca9532.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/pca9532.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/pca9532.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/uda1380.h b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/uda1380.h similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/inc/uda1380.h rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/inc/uda1380.h diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/acc.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/acc.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/acc.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/acc.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/base_eeprom.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/base_eeprom.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/base_eeprom.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/base_eeprom.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/joystick.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/joystick.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/joystick.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/joystick.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/lm75a.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/lm75a.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/lm75a.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/lm75a.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/memreg.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/memreg.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/memreg.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/memreg.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/norflash.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/norflash.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/norflash.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/norflash.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/pca9532.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/pca9532.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/pca9532.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/pca9532.c diff --git a/demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/uda1380.c b/demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/uda1380.c similarity index 100% rename from demos/bsp/boards/EA4357/Lib_OemBaseBoard/src/uda1380.c rename to demos/bsp/boards/embedded_artists/Lib_OemBaseBoard/src/uda1380.c diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject index 71df506b6..e6c0603b2 100644 --- a/demos/host/host_os_none/.cproject +++ b/demos/host/host_os_none/.cproject @@ -85,7 +85,7 @@ - + @@ -93,7 +93,345 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -177,7 +515,7 @@ - + @@ -185,7 +523,345 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/host/host_os_none/.project b/demos/host/host_os_none/.project index d76954cab..e34f2b499 100644 --- a/demos/host/host_os_none/.project +++ b/demos/host/host_os_none/.project @@ -98,7 +98,7 @@ - 0 + 1366602895349 26 diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c index 42752c4e2..a91f62ef8 100644 --- a/tinyusb/host/ehci/ehci.c +++ b/tinyusb/host/ehci/ehci.c @@ -678,7 +678,7 @@ STATIC_ INLINE_ ehci_link_t* get_period_frame_list(uint8_t hostid) return period_frame_list0; #endif -#if (TUSB_CFG_CONTROLLER0_MODE & TUSB_MODE_HOST) +#if (TUSB_CFG_CONTROLLER1_MODE & TUSB_MODE_HOST) case 1: return period_frame_list1; #endif