From 680784e9c125c866f866bd9103b97d41cba10702 Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 25 Mar 2014 21:43:48 +0700 Subject: [PATCH] update keil & iar device project to add lpcxpresso11u14 support --- boards/readme.markdown | 15 + .../device/device_os_none/device_os_none.ewp | 932 ++++++++++++++++- .../device_os_none/device_os_none.uvopt | 227 +++- .../device_os_none/device_os_none.uvproj | 982 ++++++++++++++++++ demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp | 10 +- .../host/host_cmsis_rtx/host_cmsis_rtx.uvopt | 52 +- .../host/host_cmsis_rtx/host_cmsis_rtx.uvproj | 72 +- readme.md | 10 - tinyusb/common/assertion.h | 5 +- 9 files changed, 2199 insertions(+), 106 deletions(-) create mode 100644 boards/readme.markdown diff --git a/boards/readme.markdown b/boards/readme.markdown new file mode 100644 index 00000000..1737f3aa --- /dev/null +++ b/boards/readme.markdown @@ -0,0 +1,15 @@ +# Boards # + +## Supported Boards ## + +this code base already had supported a handful of boards. However due to my limited arsenal, **only bold ones are (probably) guaranteed to run out of the box**. Other are merely implemented based on their schematics and need help from you to make it work. + +### NXP MCU ### + +- [LPCXpresso 11u14](http://www.embeddedartists.com/products/lpcxpresso/lpc11U14_xpr.php) with base board (for some peripherals to work) +- **[Microbuilder RF1GHZNODE](http://www.microbuilder.eu/Blog/13-03-14/LPC1xxx_1GHZ_Wireless_Board_Preview.aspx)** equipped with LPC11u37 +- **[LPCXpresso 1347](http://www.embeddedartists.com/products/lpcxpresso/lpc1347_xpr.php)** with base board (for some peripherals to work) +- **[LPCXpresso 1769](http://www.embeddedartists.com/products/lpcxpresso/lpc1347_xpr.php)** with base board (for some peripherals to work) +- **[Embedded Artists LPC4357 OEM & Base board](http://www.embeddedartists.com/products/kits/lpc4357_kit.php)** +- **[NGX LPC4330 Explorer](http://shop.ngxtechnologies.com/product_info.php?products_id=104)** +- [Keil MCB4357 Evaluation Board](http://www.keil.com/mcb4300) diff --git a/demos/device/device_os_none/device_os_none.ewp b/demos/device/device_os_none/device_os_none.ewp index f183f0c9..e4ec1041 100644 --- a/demos/device/device_os_none/device_os_none.ewp +++ b/demos/device/device_os_none/device_os_none.ewp @@ -4612,6 +4612,928 @@ + + Board LPCXpresso11u14 + + ARM + + 1 + + General + 3 + + 21 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ICCARM + 2 + + 28 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AARM + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OBJCOPY + 0 + + 1 + 1 + 1 + + + + + + + + + CUSTOM + 3 + + + + + + + BICOMP + 0 + + + + BUILDACTION + 1 + + + + + + + ILINK + 0 + + 15 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IARCHIVE + 0 + + 0 + 1 + 1 + + + + + + + BILINK + 0 + + + app @@ -4652,6 +5574,9 @@ $PROJ_DIR$\..\..\..\boards\microbuilder\board_lpc4357usb.c + + $PROJ_DIR$\..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + $PROJ_DIR$\..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c @@ -4696,6 +5621,7 @@ Board LPCXpresso1769 Board NGX4330 Board rf1ghznode + Board LPCXpresso11u14 $PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c @@ -4717,6 +5643,7 @@ Board NGX4330 Board rf1ghznode Board LPCXpresso1347 + Board LPCXpresso11u14 $PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c @@ -4743,6 +5670,7 @@ Board LPCXpresso1769 Board rf1ghznode Board LPCXpresso1347 + Board LPCXpresso11u14 $PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c @@ -4796,10 +5724,10 @@ common - $PROJ_DIR$\..\..\..\tinyusb\common\tusb_errors.c + $PROJ_DIR$\..\..\..\tinyusb\common\fifo.c - $PROJ_DIR$\..\..\..\tinyusb\common\fifo.c + $PROJ_DIR$\..\..\..\tinyusb\common\tusb_errors.c diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt index d8b9eabe..da97e9bf 100644 --- a/demos/device/device_os_none/device_os_none.uvopt +++ b/demos/device/device_os_none/device_os_none.uvopt @@ -73,7 +73,7 @@ 1 0 - 1 + 0 8 @@ -918,6 +918,169 @@ + + Board LPCXpresso11u14 + 0x4 + ARM-ADS + + 12000000 + + 1 + 1 + 1 + 0 + + + 1 + 65535 + 0 + 0 + 0 + + + 79 + 66 + 8 + .\UV4Build\ + + + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + + + 1 + 0 + 1 + + 8 + + + 0 + Data Sheet + DATASHTS\NXP\LPC11Uxx\LPC11U1x_DS.pdf + + + 1 + User Manual + DATASHTS\NXP\LPC11Uxx\LPC11U1x_UM.pdf + + + 2 + Technical Reference Manual + datashts\arm\cortex_m0\r0p0\DDI0432C_CORTEX_M0_R0P0_TRM.PDF + + + 3 + Generic User Guide + datashts\arm\cortex_m0\r0p0\DUI0497A_CORTEX_M0_R0P0_GENERIC_UG.PDF + + + + SARMCM3.DLL + + DARMP1.DLL + -pLPC11U14 + SARMCM3.DLL + + TARMP1.DLL + -pLPC11U14 + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 7 + + + + + + + + + + + Segger\JL2CM3.dll + + + + 0 + JL2CM3 + -U268003250 -O78 -S8 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD10000000 -FC800 -FN1 -FF0LPC1xxx_64 -FS00 -FL010000 + + + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 3 + 0 + + + 0 + + + + + + app 1 @@ -1448,7 +1611,7 @@ boards - 0 + 1 0 0 0 @@ -1612,6 +1775,22 @@ 0 0 + + 3 + 43 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + board_lpcxpresso11u14.c + 0 + 0 + @@ -1622,7 +1801,7 @@ 0 4 - 43 + 44 1 0 0 @@ -1638,7 +1817,7 @@ 4 - 44 + 45 1 0 0 @@ -1654,7 +1833,7 @@ 4 - 45 + 46 1 0 0 @@ -1670,7 +1849,7 @@ 4 - 46 + 47 2 0 0 @@ -1694,7 +1873,7 @@ 0 5 - 47 + 48 2 0 0 @@ -1710,7 +1889,7 @@ 5 - 48 + 49 1 0 0 @@ -1726,7 +1905,7 @@ 5 - 49 + 50 1 0 0 @@ -1742,7 +1921,7 @@ 5 - 50 + 51 1 0 0 @@ -1766,7 +1945,7 @@ 0 6 - 51 + 52 1 0 0 @@ -1782,7 +1961,7 @@ 6 - 52 + 53 1 0 0 @@ -1798,7 +1977,7 @@ 6 - 53 + 54 1 0 0 @@ -1814,7 +1993,7 @@ 6 - 54 + 55 1 0 0 @@ -1830,7 +2009,7 @@ 6 - 55 + 56 1 0 0 @@ -1846,7 +2025,7 @@ 6 - 56 + 57 2 0 0 @@ -1870,7 +2049,7 @@ 0 7 - 57 + 58 1 0 0 @@ -1886,7 +2065,7 @@ 7 - 58 + 59 1 0 0 @@ -1902,7 +2081,7 @@ 7 - 59 + 60 1 0 0 @@ -1918,7 +2097,7 @@ 7 - 60 + 61 1 0 0 @@ -1934,7 +2113,7 @@ 7 - 61 + 62 1 0 0 @@ -1950,7 +2129,7 @@ 7 - 62 + 63 1 0 0 @@ -1966,7 +2145,7 @@ 7 - 63 + 64 1 0 0 @@ -1982,7 +2161,7 @@ 7 - 64 + 65 2 0 0 diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj index 8b44f61a..c17c3a69 100644 --- a/demos/device/device_os_none/device_os_none.uvproj +++ b/demos/device/device_os_none/device_os_none.uvproj @@ -611,6 +611,11 @@ 1 ..\..\..\boards\keil\board_mcb4300.c + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + @@ -1558,6 +1563,11 @@ 1 ..\..\..\boards\keil\board_mcb4300.c + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + @@ -2465,6 +2475,11 @@ 1 ..\..\..\boards\keil\board_mcb4300.c + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + @@ -3372,6 +3387,11 @@ 1 ..\..\..\boards\keil\board_mcb4300.c + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + @@ -4319,6 +4339,11 @@ 1 ..\..\..\boards\keil\board_mcb4300.c + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + @@ -5226,6 +5251,11 @@ 1 ..\..\..\boards\keil\board_mcb4300.c + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + @@ -5528,6 +5558,958 @@ + + Board LPCXpresso11u14 + 0x4 + ARM-ADS + + + LPC11U14/201 + NXP (founded by Philips) + IRAM(0x10000000-0x10000FFF) IROM(0-0x7FFF) CLOCK(12000000) CPUTYPE("Cortex-M0") + + "STARTUP\NXP\LPC11Uxx\startup_LPC11Uxx.s" ("NXP LPC11Uxx Startup Code") + UL2CM3(-O4303 -S0 -C0 -FO7 -FD10000000 -FC800 -FN1 -FF0LPC1xxx_32 -FS00 -FL08000) + 5738 + LPC11Uxx.h + + + + + + + + + + SFD\NXP\LPC11Uxx\LPC11Uxx.SFR + 0 + + + + NXP\LPC11Uxx\ + NXP\LPC11Uxx\ + + 0 + 0 + 0 + 0 + 1 + + .\UV4Build\ + device_os_none + 1 + 0 + 0 + 1 + 1 + .\UV4Build\ + 1 + 0 + 0 + + 0 + 0 + + + 0 + 0 + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + + + SARMCM3.DLL + + DARMP1.DLL + -pLPC11U14 + SARMCM3.DLL + + TARMP1.DLL + -pLPC11U14 + + + + 1 + 0 + 0 + 0 + 16 + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + + + 1 + 1 + 0 + 1 + 1 + 1 + 0 + 1 + 1 + + 0 + 7 + + + + + + + + + + + + + + Segger\JL2CM3.dll + + + + + 1 + 0 + 0 + 1 + 1 + 4099 + + Segger\JL2CM3.dll + + + + + + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 1 + 1 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 0 + 0 + "Cortex-M0" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 8 + 1 + 0 + 0 + 3 + 5 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 1 + 0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x1000 + + + 1 + 0x0 + 0x8000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x8000 + + + 1 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x1000 + + + 0 + 0x0 + 0x0 + + + + + + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + --gnu --c99 + TUSB_CFG_MCU=MCU_LPC11UXX BOARD=BOARD_LPCXPRESSO11U14 TUSB_CFG_OS=TUSB_OS_NONE + + ..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\inc;..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib;..\src;..\..\..\boards;..\..\..\tinyusb + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + NO_CRP + + + + + + 0 + 0 + 0 + 0 + 1 + 0 + 0x1A000000 + 0x10000000 + ..\..\..\mcu\lpc11uxx\keil\lpc11uxx.sct + + + + + + + + + + + app + + + main.c + 1 + ..\src\main.c + + + tusb_descriptors.c + 1 + ..\src\tusb_descriptors.c + + + cdc_device_app.c + 1 + ..\src\cdc_device_app.c + + + keyboard_device_app.c + 1 + ..\src\keyboard_device_app.c + + + mouse_device_app.c + 1 + ..\src\mouse_device_app.c + + + msc_device_app.c + 1 + ..\src\msc_device_app.c + + + msc_device_ramdisk.c + 1 + ..\src\msc_device_ramdisk.c + + + msc_device_romdisk.c + 1 + ..\src\msc_device_romdisk.c + + + + + tinyusb + + + tusb.c + 1 + ..\..\..\tinyusb\tusb.c + + + osal_none.c + 1 + ..\..\..\tinyusb\osal\osal_none.c + + + hcd.c + 1 + ..\..\..\tinyusb\host\hcd.c + + + hub.c + 1 + ..\..\..\tinyusb\host\hub.c + + + usbh.c + 1 + ..\..\..\tinyusb\host\usbh.c + + + ehci.c + 1 + ..\..\..\tinyusb\host\ehci\ehci.c + + + hal_lpc11uxx.c + 1 + ..\..\..\tinyusb\hal\hal_lpc11uxx.c + + + hal_lpc13uxx.c + 1 + ..\..\..\tinyusb\hal\hal_lpc13uxx.c + + + hal_lpc43xx.c + 1 + ..\..\..\tinyusb\hal\hal_lpc43xx.c + + + hal_lpc175x_6x.c + 1 + ..\..\..\tinyusb\hal\hal_lpc175x_6x.c + + + tusb_errors.c + 1 + ..\..\..\tinyusb\common\tusb_errors.c + + + fifo.c + 1 + ..\..\..\tinyusb\common\fifo.c + + + cdc_host.c + 1 + ..\..\..\tinyusb\class\cdc_host.c + + + cdc_rndis_host.c + 1 + ..\..\..\tinyusb\class\cdc_rndis_host.c + + + hid_host.c + 1 + ..\..\..\tinyusb\class\hid_host.c + + + msc_host.c + 1 + ..\..\..\tinyusb\class\msc_host.c + + + dcd.c + 1 + ..\..\..\tinyusb\device\dcd.c + + + dcd_lpc_11uxx_13uxx.c + 1 + ..\..\..\tinyusb\device\dcd_lpc_11uxx_13uxx.c + + + dcd_lpc43xx.c + 1 + ..\..\..\tinyusb\device\dcd_lpc43xx.c + + + dcd_lpc175x_6x.c + 1 + ..\..\..\tinyusb\device\dcd_lpc175x_6x.c + + + usbd.c + 1 + ..\..\..\tinyusb\device\usbd.c + + + cdc_device.c + 1 + ..\..\..\tinyusb\class\cdc_device.c + + + hid_device.c + 1 + ..\..\..\tinyusb\class\hid_device.c + + + msc_device.c + 1 + ..\..\..\tinyusb\class\msc_device.c + + + + + boards + + + board.c + 1 + ..\..\..\boards\board.c + + + board_ea4357.c + 1 + ..\..\..\boards\embedded_artists\ea4357\board_ea4357.c + + + printf_retarget.c + 1 + ..\..\..\boards\printf_retarget.c + + + pca9532.c + 1 + ..\..\..\boards\embedded_artists\oem_base_board\pca9532.c + + + 2 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + + + + + + + + + + + + board_ngx4330.c + 1 + ..\..\..\boards\ngx\board_ngx4330.c + + + board_lpc4357usb.c + 1 + ..\..\..\boards\microbuilder\board_lpc4357usb.c + + + board_rf1ghznode.c + 1 + ..\..\..\boards\microbuilder\board_rf1ghznode.c + + + board_lpcxpresso1769.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c + + + board_lpcxpresso1347.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c + + + board_mcb4300.c + 1 + ..\..\..\boards\keil\board_mcb4300.c + + + board_lpcxpresso11u14.c + 1 + ..\..\..\boards\lpcxpresso\board_lpcxpresso11u14.c + + + + + lpc11uxx + + + system_LPC11Uxx.c + 1 + ..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c + + + lpc11uxx_gpio.c + 1 + ..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c + + + lpc11uxx_uart.c + 1 + ..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c + + + startup_LPC11Uxx.s + 2 + ..\..\..\mcu\lpc11uxx\keil\startup_LPC11Uxx.s + + + + + lpc13uxx + + + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + + + + + + + + + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + startup_LPC13Uxx.s + 2 + ..\..\..\mcu\lpc13uxx\keil\startup_LPC13Uxx.s + + + system_LPC13Uxx.c + 1 + ..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c + + + gpio.c + 1 + ..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c + + + uart.c + 1 + ..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c + + + + + lpc175x_6x + + + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + + + + + + + + + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + system_LPC17xx.c + 1 + ..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c + + + lpc17xx_clkpwr.c + 1 + ..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c + + + lpc17xx_gpio.c + 1 + ..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c + + + lpc17xx_pinsel.c + 1 + ..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c + + + lpc17xx_uart.c + 1 + ..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c + + + startup_LPC17xx.s + 2 + ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s + + + + + lpc43xx + + + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 11 + + + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + + + + + + + + + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + + + + lpc43xx_cgu.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c + + + lpc43xx_gpio.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c + + + lpc43xx_i2c.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c + + + lpc43xx_nvic.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_nvic.c + + + lpc43xx_scu.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c + + + lpc43xx_uart.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c + + + system_LPC43xx.c + 1 + ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c + + + startup_LPC43xx.s + 2 + ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s + + + + + diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp index 0b5d6269..c2aa460b 100644 --- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp +++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp @@ -2778,22 +2778,22 @@ app - $PROJ_DIR$\..\src\cdc_serial_host_app.c + $PROJ_DIR$\..\src\cdc_serial_app.c - $PROJ_DIR$\..\src\msc_cli.c + $PROJ_DIR$\..\src\cli.c - $PROJ_DIR$\..\src\keyboard_host_app.c + $PROJ_DIR$\..\src\keyboard_app.c $PROJ_DIR$\..\src\main.c - $PROJ_DIR$\..\src\mouse_host_app.c + $PROJ_DIR$\..\src\mouse_app.c - $PROJ_DIR$\..\src\msc_host_app.c + $PROJ_DIR$\..\src\msc_app.c diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt index fbe4b6f3..1f5510cb 100644 --- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt +++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt @@ -622,7 +622,7 @@ app - 1 + 0 0 0 0 @@ -634,7 +634,7 @@ 0 64 0 - 58 + 57 64 0 ..\src\main.c @@ -648,13 +648,13 @@ 1 0 0 - 0 + 1 0 0 0 0 - ..\src\cdc_serial_host_app.c - cdc_serial_host_app.c + ..\src\cdc_serial_app.c + cdc_serial_app.c 0 0 @@ -664,13 +664,13 @@ 1 0 0 - 0 + 48 0 - 0 - 0 + 103 + 107 0 - ..\src\keyboard_host_app.c - keyboard_host_app.c + ..\src\keyboard_app.c + keyboard_app.c 0 0 @@ -680,13 +680,13 @@ 1 0 0 - 0 + 47 0 0 0 0 - ..\src\mouse_host_app.c - mouse_host_app.c + ..\src\mouse_app.c + mouse_app.c 0 0 @@ -701,8 +701,8 @@ 0 0 0 - ..\src\rndis_host_app.c - rndis_host_app.c + ..\src\rndis_app.c + rndis_app.c 0 0 @@ -714,11 +714,11 @@ 0 0 0 - 0 - 0 + 143 + 145 0 - ..\src\msc_host_app.c - msc_host_app.c + ..\src\msc_app.c + msc_app.c 0 0 @@ -733,8 +733,8 @@ 0 0 0 - ..\src\msc_cli.c - msc_cli.c + ..\src\cli.c + cli.c 0 0 @@ -986,7 +986,7 @@ 0 17 0 - 371 + 370 373 0 ..\..\..\tinyusb\host\usbh.c @@ -1346,7 +1346,7 @@ 0 0 0 - 215 + 214 218 0 ..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c @@ -1522,7 +1522,7 @@ 0 68 0 - 118 + 117 120 0 ..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c @@ -1554,7 +1554,7 @@ 0 25 0 - 164 + 163 166 0 ..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s @@ -1658,7 +1658,7 @@ 0 22 0 - 126 + 125 128 0 ..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj index 2723553a..2c2d96cf 100644 --- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj +++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvproj @@ -397,34 +397,34 @@ ..\src\main.c - cdc_serial_host_app.c + cdc_serial_app.c 1 - ..\src\cdc_serial_host_app.c + ..\src\cdc_serial_app.c - keyboard_host_app.c + keyboard_app.c 1 - ..\src\keyboard_host_app.c + ..\src\keyboard_app.c - mouse_host_app.c + mouse_app.c 1 - ..\src\mouse_host_app.c + ..\src\mouse_app.c - rndis_host_app.c + rndis_app.c 1 - ..\src\rndis_host_app.c + ..\src\rndis_app.c - msc_host_app.c + msc_app.c 1 - ..\src\msc_host_app.c + ..\src\msc_app.c - msc_cli.c + cli.c 1 - ..\src\msc_cli.c + ..\src\cli.c @@ -1200,34 +1200,34 @@ ..\src\main.c - cdc_serial_host_app.c + cdc_serial_app.c 1 - ..\src\cdc_serial_host_app.c + ..\src\cdc_serial_app.c - keyboard_host_app.c + keyboard_app.c 1 - ..\src\keyboard_host_app.c + ..\src\keyboard_app.c - mouse_host_app.c + mouse_app.c 1 - ..\src\mouse_host_app.c + ..\src\mouse_app.c - rndis_host_app.c + rndis_app.c 1 - ..\src\rndis_host_app.c + ..\src\rndis_app.c - msc_host_app.c + msc_app.c 1 - ..\src\msc_host_app.c + ..\src\msc_app.c - msc_cli.c + cli.c 1 - ..\src\msc_cli.c + ..\src\cli.c @@ -1969,34 +1969,34 @@ ..\src\main.c - cdc_serial_host_app.c + cdc_serial_app.c 1 - ..\src\cdc_serial_host_app.c + ..\src\cdc_serial_app.c - keyboard_host_app.c + keyboard_app.c 1 - ..\src\keyboard_host_app.c + ..\src\keyboard_app.c - mouse_host_app.c + mouse_app.c 1 - ..\src\mouse_host_app.c + ..\src\mouse_app.c - rndis_host_app.c + rndis_app.c 1 - ..\src\rndis_host_app.c + ..\src\rndis_app.c - msc_host_app.c + msc_app.c 1 - ..\src\msc_host_app.c + ..\src\msc_app.c - msc_cli.c + cli.c 1 - ..\src\msc_cli.c + ..\src\cli.c diff --git a/readme.md b/readme.md index 1a057d2c..c4253e09 100644 --- a/readme.md +++ b/readme.md @@ -56,16 +56,6 @@ The following toolchain is supported - *Keil MDK* - *IAR Workbench* -## Supported Boards ## - -this code base can run out of the box with the following boards - -### NXP LPC43xx ### - -- [Embedded Artists LPC4357 OEM & Base board](http://www.embeddedartists.com/products/kits/lpc4357_kit.php) -- [NGX Technologies LPC4330 Explorer](http://shop.ngxtechnologies.com/product_info.php?products_id=104) -- [Keil MCB4357 Evaluation Board](http://www.keil.com/mcb4300) - ## Known Issues ## - LPC11uxx & LPC13uxx cannot able to STALL Control OUT endpoint !!! --> unsupported with data out request may cause host stuck with control transfer forever. (reproduce: enable keyboard + mouse, return error in set report of hid_device) diff --git a/tinyusb/common/assertion.h b/tinyusb/common/assertion.h index 329bc11d..fa061a98 100644 --- a/tinyusb/common/assertion.h +++ b/tinyusb/common/assertion.h @@ -81,15 +81,14 @@ extern "C" //--------------------------------------------------------------------+ #ifndef _TEST_ #define ASSERT_MESSAGE(format, ...)\ - _PRINTF("Assert at %s: %s: %d: " format "\n", __BASE_FILE__, __PRETTY_FUNCTION__, __LINE__, __VA_ARGS__) + _PRINTF("Assert at %s: %s: %d: " format "\n", __BASE_FILE__, __func__ , __LINE__, __VA_ARGS__) #else #define ASSERT_MESSAGE(format, ...)\ _PRINTF("%d:note: Assert " format "\n", __LINE__, __VA_ARGS__) #endif #ifndef _TEST_ASSERT_ - #define ASSERT_ERROR_HANDLER(x, para) \ - return x + #define ASSERT_ERROR_HANDLER(x, para) return x #else #define ASSERT_ERROR_HANDLER(x, para) Throw(x) #endif