diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject
index 3d7aa8e66..c6c2ef84e 100644
--- a/demos/device/device_os_none/.cproject
+++ b/demos/device/device_os_none/.cproject
@@ -30,7 +30,7 @@
-
+
-
+
@@ -63,7 +63,7 @@
-
+
@@ -121,7 +121,7 @@
-
+
-
+
@@ -155,7 +155,7 @@
-
+
@@ -212,7 +212,7 @@
-
+
-
+
@@ -248,7 +248,7 @@
-
+
@@ -307,7 +307,7 @@
-
+
-
+
@@ -340,7 +340,7 @@
-
+
@@ -398,7 +398,7 @@
-
+
-
+
@@ -434,7 +434,7 @@
-
+
@@ -493,7 +493,7 @@
-
+
-
+
@@ -529,7 +529,7 @@
-
+
@@ -568,49 +568,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
-<Properties property_0="" property_3="NXP" property_4="LPC1347" property_count="5" version="1"/>
-<infoList vendor="NXP"><info chip="LPC1347" match_id="0x08020543" name="LPC1347" stub="crt_emu_lpc11_13_nxp"><chip><name>LPC1347</name>
-<family>LPC13xx (12bit ADC)</family>
+<Properties property_0="" property_3="NXP" property_4="LPC11U37/401" property_count="5" version="1"/>
+<infoList vendor="NXP"><info chip="LPC11U37/401" match_id="0x00017C40" name="LPC11U37/401" stub="crt_emu_lpc11_13_nxp"><chip><name>LPC11U37/401</name>
+<family>LPC11Uxx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
<clock changeable="TRUE" freq="12MHz" is_accurate="TRUE"/>
<memory can_program="true" id="Flash" is_ro="true" type="Flash"/>
<memory id="RAM" type="RAM"/>
<memory id="Periph" is_volatile="true" type="Peripheral"/>
-<memoryInstance derived_from="Flash" id="MFlash64" location="0x0" size="0x10000"/>
+<memoryInstance derived_from="Flash" id="MFlash128" location="0x0" size="0x20000"/>
<memoryInstance derived_from="RAM" id="RamLoc8" location="0x10000000" size="0x2000"/>
<memoryInstance derived_from="RAM" id="RamUsb2" location="0x20004000" size="0x800"/>
-<memoryInstance derived_from="RAM" id="RamPeriph2" location="0x20000000" size="0x800"/>
-<prog_flash blocksz="0x1000" location="0x0" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/>
-<peripheralInstance derived_from="V7M_MPU" id="MPU" location="0xe000ed90"/>
-<peripheralInstance derived_from="V7M_NVIC" id="NVIC" location="0xe000e000"/>
-<peripheralInstance derived_from="V7M_DCR" id="DCR" location="0xe000edf0"/>
-<peripheralInstance derived_from="V7M_ITM" id="ITM" location="0xe0000000"/>
-<peripheralInstance derived_from="I2C" id="I2C" location="0x40000000"/>
-<peripheralInstance derived_from="WWDT" id="WWDT" location="0x40004000"/>
-<peripheralInstance derived_from="USART" id="USART" location="0x40008000"/>
-<peripheralInstance derived_from="CT16B0" id="CT16B0" location="0x4000c000"/>
-<peripheralInstance derived_from="CT16B1" id="CT16B1" location="0x40010000"/>
-<peripheralInstance derived_from="CT32B0" id="CT32B0" location="0x40014000"/>
-<peripheralInstance derived_from="CT32B1" id="CT32B1" location="0x40018000"/>
-<peripheralInstance derived_from="ADC" id="ADC" location="0x4001c000"/>
-<peripheralInstance derived_from="PMU" id="PMU" location="0x40038000"/>
-<peripheralInstance derived_from="FLASHCTRL" id="FLASHCTRL" location="0x4003c000"/>
-<peripheralInstance derived_from="SSP0" id="SSP0" location="0x40040000"/>
-<peripheralInstance derived_from="IOCON" id="IOCON" location="0x40044000"/>
-<peripheralInstance derived_from="SYSCON" id="SYSCON" location="0x40048000"/>
-<peripheralInstance derived_from="GPIO-PIN-INT" id="GPIO-PIN-INT" location="0x4004c000"/>
-<peripheralInstance derived_from="SSP1" id="SSP1" location="0x40058000"/>
-<peripheralInstance derived_from="GPIO-GROUP-INT0" id="GPIO-GROUP-INT0" location="0x4005c000"/>
-<peripheralInstance derived_from="GPIO-GROUP-INT1" id="GPIO-GROUP-INT1" location="0x40060000"/>
-<peripheralInstance derived_from="RITIMER" id="RITIMER" location="0x40064000"/>
-<peripheralInstance derived_from="USB" id="USB" location="0x40080000"/>
-<peripheralInstance derived_from="GPIO-PORT" id="GPIO-PORT" location="0x50000000"/>
+<prog_flash blocksz="0x1000" location="0x0" maxprgbuff="0x400" progwithcode="TRUE" size="0x20000"/>
+<peripheralInstance derived_from="CM0_NVIC" id="NVIC" location="0xe000e000"/>
+<peripheralInstance derived_from="LPC11U_GPIO" id="GPIO" location="0x50000000"/>
+<peripheralInstance derived_from="LPC11U_USBDEV" id="USB" location="0x40080000"/>
+<peripheralInstance derived_from="CM0_DCR" id="DCR" location="0xe000edf0"/>
+<peripheralInstance derived_from="LPC11U_GPIO_GROUP_INT" id="GPIOGROUP0INT" location="0x40060000"/>
+<peripheralInstance derived_from="LPC11U_GPIO_GROUP_INT" id="GPIOGROUP1INT" location="0x4005c000"/>
+<peripheralInstance derived_from="LPC11U_GPIO_INT" id="GPIOINT" location="0x4004c000"/>
+<peripheralInstance derived_from="LPC11_13_SSP" id="SSP1" location="0x40058000"/>
+<peripheralInstance derived_from="LPC11U_FMC" id="FMC" location="0x4003c000"/>
+<peripheralInstance derived_from="LPC11U_SYSCTL" id="SYSCTL" location="0x40048000"/>
+<peripheralInstance derived_from="LPC11U_IOCON" id="IOCON" location="0x40044000"/>
+<peripheralInstance derived_from="LPC11_13_SSP" id="SSP0" location="0x40040000"/>
+<peripheralInstance derived_from="LPC11_13_PMU" id="PMU" location="0x40038000"/>
+<peripheralInstance derived_from="LPC11_13_ADC" id="ADC" location="0x4001c000"/>
+<peripheralInstance derived_from="LPC11_13_TIMER32" id="TIMER1" location="0x40018000"/>
+<peripheralInstance derived_from="LPC11_13_TIMER32" id="TIMER0" location="0x40014000"/>
+<peripheralInstance derived_from="LPC11_13_TIMER16" id="TMR161" location="0x40010000"/>
+<peripheralInstance derived_from="LPC11_13_TIMER16" id="TMR160" location="0x4000c000"/>
+<peripheralInstance derived_from="LPC1xxx_UART_MODEM" id="UART0" location="0x40008000"/>
+<peripheralInstance derived_from="LPC11_13_WDT" id="WDT" location="0x40004000"/>
+<peripheralInstance derived_from="LPC11_13_I2C" id="I2C0" location="0x40000000"/>
</chip>
-<processor><name gcc_name="cortex-m3">Cortex-M3</name>
+<processor><name gcc_name="cortex-m0">Cortex-M0</name>
<family>Cortex-M</family>
</processor>
-<link href="nxp_lpc13Uxx_peripheral.xme" show="embed" type="simple"/>
+<link href="nxp_lpc11_13_peripheral.xme" show="embed" type="simple"/>
</info>
</infoList>
</TargetConfig>
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt
index c72b1b5fd..34e32cd88 100644
--- a/demos/host/host_freertos/host_freertos.uvopt
+++ b/demos/host/host_freertos/host_freertos.uvopt
@@ -706,7 +706,7 @@
0
9
0
- 6
+ 7
11
0
..\src\main.c
@@ -1048,10 +1048,10 @@
1
0
0
- 0
+ 31
0
- 0
- 0
+ 219
+ 229
0
..\..\..\tinyusb\class\hid_host.c
hid_host.c
@@ -1168,10 +1168,10 @@
1
0
0
- 19
+ 5
0
- 42
- 51
+ 43
+ 54
0
..\..\..\vendor\freertos\freertoslpc\FreeRTOSCommonHooks.c
FreeRTOSCommonHooks.c
diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject
index 51457a040..7a8906709 100644
--- a/demos/host/host_os_none/.cproject
+++ b/demos/host/host_os_none/.cproject
@@ -9369,8 +9369,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
-<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="1"/>
-<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" resetscript="LPC18LPC43InternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
+<Properties property_0="" property_3="NXP" property_4="LPC4330" property_count="5" version="1"/>
+<infoList vendor="NXP"><info chip="LPC4330" match_id="0x0" name="LPC4330" resetscript="LPC18LPC43ExternalFLASHBootResetscript.scp" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4330</name>
<family>LPC43xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -9378,17 +9378,11 @@
<memory can_program="true" id="Flash" is_ro="true" type="Flash"/>
<memory id="RAM" type="RAM"/>
<memory id="Periph" is_volatile="true" type="Peripheral"/>
-<memoryInstance derived_from="Flash" id="MFlashA512" location="0x1a000000" size="0x80000"/>
-<memoryInstance derived_from="Flash" id="MFlashB512" location="0x1b000000" size="0x80000"/>
-<memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/>
-<memoryInstance derived_from="RAM" id="RamLoc40" location="0x10080000" size="0xa000"/>
+<memoryInstance derived_from="RAM" id="RamLoc128" location="0x10000000" size="0x20000"/>
+<memoryInstance derived_from="RAM" id="RamLoc72" location="0x10080000" size="0x12000"/>
<memoryInstance derived_from="RAM" id="RamAHB32" location="0x20000000" size="0x8000"/>
<memoryInstance derived_from="RAM" id="RamAHB16" location="0x20008000" size="0x4000"/>
<memoryInstance derived_from="RAM" id="RamAHB_ETB16" location="0x2000c000" size="0x4000"/>
-<prog_flash blocksz="0x2000" location="0x1a000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/>
-<prog_flash blocksz="0x10000" location="0x1a010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/>
-<prog_flash blocksz="0x2000" location="0x1b000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/>
-<prog_flash blocksz="0x10000" location="0x1b010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/>
<peripheralInstance derived_from="V7M_MPU" id="MPU" location="0xe000ed90"/>
<peripheralInstance derived_from="V7M_NVIC" id="NVIC" location="0xe000e000"/>
<peripheralInstance derived_from="V7M_DCR" id="DCR" location="0xe000edf0"/>
@@ -9400,7 +9394,6 @@
<peripheralInstance derived_from="EMC" id="EMC" location="0x40005000"/>
<peripheralInstance derived_from="USB0" id="USB0" location="0x40006000"/>
<peripheralInstance derived_from="USB1" id="USB1" location="0x40007000"/>
-<peripheralInstance derived_from="LCD" id="LCD" location="0x40008000"/>
<peripheralInstance derived_from="EEPROM" id="EEPROM" location="0x4000e000"/>
<peripheralInstance derived_from="ETHERNET" id="ETHERNET" location="0x40010000"/>
<peripheralInstance derived_from="ATIMER" id="ATIMER" location="0x40040000"/>
diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt
index fb45378ed..4790d5e0a 100644
--- a/demos/host/host_os_none/host_os_none.uvopt
+++ b/demos/host/host_os_none/host_os_none.uvopt
@@ -153,24 +153,7 @@
-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000)
-
-
- 0
- 0
- 402
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c
-
-
-
-
+
0
@@ -387,24 +370,7 @@
-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000)
-
-
- 0
- 0
- 402
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c
-
-
-
-
+
0
@@ -499,7 +465,7 @@
1
0
- 0
+ 1
8
@@ -594,24 +560,7 @@
-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000)
-
-
- 0
- 0
- 402
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c
-
-
-
-
+
0
@@ -713,7 +662,7 @@
1
0
- 1
+ 0
8
@@ -808,24 +757,7 @@
-O975 -S0 -C0)
-
-
- 0
- 0
- 402
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- C:\Users\hathach\Dropbox\tinyusb\workspace\tinyusb\demos\host\src\cli.c
-
-
-
-
+
0
@@ -916,10 +848,10 @@
1
0
0
- 1
+ 17
0
- 107
- 114
+ 121
+ 128
0
..\src\main.c
main.c
@@ -932,10 +864,10 @@
1
0
0
- 61
+ 7
0
- 120
- 121
+ 74
+ 85
0
..\src\cdc_serial_app.c
cdc_serial_app.c
@@ -996,10 +928,10 @@
1
0
0
- 0
+ 12
0
- 140
- 149
+ 141
+ 160
0
..\src\msc_app.c
msc_app.c
@@ -1012,10 +944,10 @@
1
0
0
- 40
+ 13
0
- 229
- 238
+ 444
+ 449
0
..\src\cli.c
cli.c
@@ -1026,7 +958,7 @@
tinyusb
- 0
+ 1
0
0
0
@@ -1116,10 +1048,10 @@
1
0
0
- 0
+ 16
0
- 0
- 0
+ 715
+ 722
0
..\..\..\tinyusb\host\ehci\ehci.c
ehci.c
@@ -1132,10 +1064,10 @@
1
0
0
- 0
+ 2
0
- 0
- 0
+ 28
+ 36
0
..\..\..\tinyusb\hal\hal_lpc11uxx.c
hal_lpc11uxx.c
@@ -1150,8 +1082,8 @@
0
0
0
- 0
- 0
+ 28
+ 34
0
..\..\..\tinyusb\hal\hal_lpc13uxx.c
hal_lpc13uxx.c
@@ -1164,10 +1096,10 @@
1
0
0
- 26
+ 31
0
- 0
- 0
+ 34
+ 42
0
..\..\..\tinyusb\hal\hal_lpc43xx.c
hal_lpc43xx.c
@@ -1180,10 +1112,10 @@
1
0
0
- 0
+ 17
0
- 0
- 0
+ 31
+ 45
0
..\..\..\tinyusb\hal\hal_lpc175x_6x.c
hal_lpc175x_6x.c
@@ -1228,10 +1160,10 @@
1
0
0
- 78
+ 6
0
- 0
- 0
+ 250
+ 271
0
..\..\..\tinyusb\class\cdc_host.c
cdc_host.c
@@ -1278,8 +1210,8 @@
0
0
0
- 0
- 0
+ 359
+ 380
0
..\..\..\tinyusb\class\msc_host.c
msc_host.c
@@ -1372,10 +1304,10 @@
1
0
0
- 0
+ 63
0
- 1
- 1
+ 583
+ 605
0
..\..\..\tinyusb\host\ohci\ohci.c
ohci.c
@@ -1462,7 +1394,7 @@
0
43
0
- 6
+ 8
15
0
..\..\..\vendor\fatfs\diskio.c
@@ -1478,8 +1410,8 @@
0
0
0
- 1
- 1
+ 0
+ 0
0
..\..\..\vendor\fatfs\ff.c
ff.c
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index fb50a6e03..450695b15 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -207,6 +207,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
0, NULL ),
error
);
+ (void) error; // skip it set idle is failed
#if 0
//------------- Get Report Descriptor TODO HID parser -------------//
@@ -218,7 +219,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_descriptor_interface_t con
p_desc_hid->wReportLength, report_descriptor ),
error
);
- // if error in getting report descriptor --> treating like there is none
+ (void) error; // if error in getting report descriptor --> treating like there is none
}
#endif
diff --git a/tinyusb/hal/hal_lpc175x_6x.c b/tinyusb/hal/hal_lpc175x_6x.c
index c3753a8fa..bb840a40d 100644
--- a/tinyusb/hal/hal_lpc175x_6x.c
+++ b/tinyusb/hal/hal_lpc175x_6x.c
@@ -36,16 +36,11 @@
*/
/**************************************************************************/
-#include "tusb_option.h"
-
-#if TUSB_CFG_MCU == MCU_LPC175X_6X
-
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
#include "common/common.h"
#include "hal.h"
+#if TUSB_CFG_MCU == MCU_LPC175X_6X
+
//--------------------------------------------------------------------+
// IMPLEMENTATION
//--------------------------------------------------------------------+
diff --git a/tinyusb/host/ohci/ohci.c b/tinyusb/host/ohci/ohci.c
index 197f3fb02..63b30e0ac 100644
--- a/tinyusb/host/ohci/ohci.c
+++ b/tinyusb/host/ohci/ohci.c
@@ -609,7 +609,7 @@ static void done_queue_isr(uint8_t hostid)
{
// TODO check if td_head is iso td
//------------- Non ISO transfer -------------//
- ohci_gtd_t * const p_qtd = (ohci_gtd_t * const) td_head;
+ ohci_gtd_t * const p_qtd = (ohci_gtd_t *) td_head;
tusb_event_t const event = (p_qtd->condition_code == OHCI_CCODE_NO_ERROR) ? TUSB_EVENT_XFER_COMPLETE :
(p_qtd->condition_code == OHCI_CCODE_STALL) ? TUSB_EVENT_XFER_STALLED : TUSB_EVENT_XFER_ERROR;