From 8bd6440547520ebdc8e06a6a21e6277ec7181034 Mon Sep 17 00:00:00 2001 From: hathach Date: Wed, 11 Dec 2013 11:31:09 +0700 Subject: [PATCH] fix error in dcd_lpc175x_6x (still has problem with control transfer) fix build error for host start to add keil support for device opt out pca9532.c when ea4357 is not the selected board --- .../embedded_artists/oem_base_board/pca9532.c | 5 + demos/device/device_os_none/.cproject | 92 +- .../device_os_none/device_os_none.uvproj | 1953 +++++++++++++++++ demos/device/device_os_none/tusb_config.h | 4 +- demos/host/host_os_none/host_os_none.uvopt | 404 ++-- demos/host/host_os_none/host_os_none.uvproj | 304 +-- tinyusb/class/hid.c | 348 --- tinyusb/device/dcd_lpc175x_6x.c | 6 +- 8 files changed, 2377 insertions(+), 739 deletions(-) create mode 100644 demos/device/device_os_none/device_os_none.uvproj delete mode 100644 tinyusb/class/hid.c diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/pca9532.c b/demos/bsp/boards/embedded_artists/oem_base_board/pca9532.c index b696483c5..0acf43fe8 100644 --- a/demos/bsp/boards/embedded_artists/oem_base_board/pca9532.c +++ b/demos/bsp/boards/embedded_artists/oem_base_board/pca9532.c @@ -24,6 +24,9 @@ /****************************************************************************** * Includes *****************************************************************************/ +#include "../../board.h" + +#if BOARD == BOARD_EA4357 #include "lpc43xx_i2c.h" #include "lpc43xx_cgu.h" @@ -342,3 +345,5 @@ void pca9532_setBlink1Leds(uint16_t ledMask) blink1Shadow |= ledMask; setLeds(); } + +#endif diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject index 44097999f..f5de56d0c 100644 --- a/demos/device/device_os_none/.cproject +++ b/demos/device/device_os_none/.cproject @@ -467,49 +467,73 @@ <?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="LPC1769" property_count="5" version="1"/> +<infoList vendor="NXP"><info chip="LPC1769" match_id="0x26113F37" name="LPC1769" package="lpc17_lqfp100.xml"><chip><name>LPC1769</name> +<family>LPC17xx</family> <vendor>NXP (formerly Philips)</vendor> <reset board="None" core="Real" sys="Real"/> -<clock changeable="TRUE" freq="12MHz" is_accurate="TRUE"/> +<clock changeable="TRUE" freq="20MHz" 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="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"/> +<memoryInstance derived_from="Flash" id="MFlash512" location="0x0" size="0x80000"/> +<memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/> +<memoryInstance derived_from="RAM" id="RamAHB32" location="0x2007c000" size="0x8000"/> +<prog_flash blocksz="0x1000" location="0" maxprgbuff="0x1000" progwithcode="TRUE" size="0x10000"/> +<prog_flash blocksz="0x8000" location="0x10000" maxprgbuff="0x1000" progwithcode="TRUE" size="0x70000"/> +<peripheralInstance derived_from="LPC17_NVIC" id="NVIC" location="0xE000E000"/> +<peripheralInstance derived_from="TIMER" enable="SYSCTL.PCONP.PCTIM0&amp;0x1" id="TIMER0" location="0x40004000"/> +<peripheralInstance derived_from="TIMER" enable="SYSCTL.PCONP.PCTIM1&amp;0x1" id="TIMER1" location="0x40008000"/> +<peripheralInstance derived_from="TIMER" enable="SYSCTL.PCONP.PCTIM2&amp;0x1" id="TIMER2" location="0x40090000"/> +<peripheralInstance derived_from="TIMER" enable="SYSCTL.PCONP.PCTIM3&amp;0x1" id="TIMER3" location="0x40094000"/> +<peripheralInstance derived_from="LPC17_RIT" enable="SYSCTL.PCONP.PCRIT&amp;0x1" id="RIT" location="0x400B0000"/> +<peripheralInstance derived_from="FGPIO" enable="SYSCTL.PCONP.PCGPIO&amp;0x1" id="GPIO0" location="0x2009C000"/> +<peripheralInstance derived_from="FGPIO" enable="SYSCTL.PCONP.PCGPIO&amp;0x1" id="GPIO1" location="0x2009C020"/> +<peripheralInstance derived_from="FGPIO" enable="SYSCTL.PCONP.PCGPIO&amp;0x1" id="GPIO2" location="0x2009C040"/> +<peripheralInstance derived_from="FGPIO" enable="SYSCTL.PCONP.PCGPIO&amp;0x1" id="GPIO3" location="0x2009C060"/> +<peripheralInstance derived_from="FGPIO" enable="SYSCTL.PCONP.PCGPIO&amp;0x1" id="GPIO4" location="0x2009C080"/> +<peripheralInstance derived_from="LPC17_I2S" enable="SYSCTL.PCONP&amp;0x08000000" id="I2S" location="0x400A8000"/> +<peripheralInstance derived_from="LPC17_SYSCTL" id="SYSCTL" location="0x400FC000"/> +<peripheralInstance derived_from="LPC17_DAC" enable="PCB.PINSEL1.P0_26&amp;0x2=2" id="DAC" location="0x4008C000"/> +<peripheralInstance derived_from="LPC17xx_UART" enable="SYSCTL.PCONP.PCUART0&amp;0x1" id="UART0" location="0x4000C000"/> +<peripheralInstance derived_from="LPC17xx_UART_MODEM" enable="SYSCTL.PCONP.PCUART1&amp;0x1" id="UART1" location="0x40010000"/> +<peripheralInstance derived_from="LPC17xx_UART" enable="SYSCTL.PCONP.PCUART2&amp;0x1" id="UART2" location="0x40098000"/> +<peripheralInstance derived_from="LPC17xx_UART" enable="SYSCTL.PCONP.PCUART3&amp;0x1" id="UART3" location="0x4009C000"/> +<peripheralInstance derived_from="SPI" enable="SYSCTL.PCONP.PCSPI&amp;0x1" id="SPI" location="0x40020000"/> +<peripheralInstance derived_from="LPC17_SSP" enable="SYSCTL.PCONP.PCSSP0&amp;0x1" id="SSP0" location="0x40088000"/> +<peripheralInstance derived_from="LPC17_SSP" enable="SYSCTL.PCONP.PCSSP1&amp;0x1" id="SSP1" location="0x40030000"/> +<peripheralInstance derived_from="LPC17_ADC" enable="SYSCTL.PCONP.PCAD&amp;0x1" id="ADC" location="0x40034000"/> +<peripheralInstance derived_from="LPC17_USBINTST" enable="USBCLKCTL.USBClkCtrl&amp;0x12" id="USBINTSTAT" location="0x400fc1c0"/> +<peripheralInstance derived_from="LPC17_USB_CLK_CTL" id="USBCLKCTL" location="0x5000cff4"/> +<peripheralInstance derived_from="LPC17_USBDEV" enable="USBCLKCTL.USBClkSt&amp;0x12=0x12" id="USBDEV" location="0x5000C200"/> +<peripheralInstance derived_from="LPC17_PWM" enable="SYSCTL.PCONP.PWM1&amp;0x1" id="PWM" location="0x40018000"/> +<peripheralInstance derived_from="LPC17_I2C" enable="SYSCTL.PCONP.PCI2C0&amp;0x1" id="I2C0" location="0x4001C000"/> +<peripheralInstance derived_from="LPC17_I2C" enable="SYSCTL.PCONP.PCI2C1&amp;0x1" id="I2C1" location="0x4005C000"/> +<peripheralInstance derived_from="LPC17_I2C" enable="SYSCTL.PCONP.PCI2C2&amp;0x1" id="I2C2" location="0x400A0000"/> +<peripheralInstance derived_from="LPC17_DMA" enable="SYSCTL.PCONP.PCGPDMA&amp;0x1" id="DMA" location="0x50004000"/> +<peripheralInstance derived_from="LPC17_ENET" enable="SYSCTL.PCONP.PCENET&amp;0x1" id="ENET" location="0x50000000"/> +<peripheralInstance derived_from="CM3_DCR" id="DCR" location="0xE000EDF0"/> +<peripheralInstance derived_from="LPC17_PCB" id="PCB" location="0x4002c000"/> +<peripheralInstance derived_from="LPC17_QEI" enable="SYSCTL.PCONP.PCQEI&amp;0x1" id="QEI" location="0x400bc000"/> +<peripheralInstance derived_from="LPC17_USBHOST" enable="USBCLKCTL.USBClkSt&amp;0x11=0x11" id="USBHOST" location="0x5000C000"/> +<peripheralInstance derived_from="LPC17_USBOTG" enable="USBCLKCTL.USBClkSt&amp;0x1c=0x1c" id="USBOTG" location="0x5000C000"/> +<peripheralInstance derived_from="LPC17_RTC" enable="SYSCTL.PCONP.PCRTC&amp;0x1" id="RTC" location="0x40024000"/> +<peripheralInstance derived_from="MPU" id="MPU" location="0xE000ED90"/> +<peripheralInstance derived_from="LPC1x_WDT" id="WDT" location="0x40000000"/> +<peripheralInstance derived_from="LPC17_FLASHCFG" id="FLASHACCEL" location="0x400FC000"/> +<peripheralInstance derived_from="GPIO_INT" id="GPIOINTMAP" location="0x40028080"/> +<peripheralInstance derived_from="LPC17_CANAFR" enable="SYSCTL.PCONP.PCCAN1&amp;0x1|SYSCTL.PCONP.PCCAN2&amp;0x1" id="CANAFR" location="0x4003C000"/> +<peripheralInstance derived_from="LPC17_CANCEN" enable="SYSCTL.PCONP.PCCAN1&amp;0x1|SYSCTL.PCONP.PCCAN2&amp;0x1" id="CANCEN" location="0x40040000"/> +<peripheralInstance derived_from="LPC17_CANWAKESLEEP" id="CANWAKESLEEP" location="0x400FC110"/> +<peripheralInstance derived_from="LPC17_CANCON" enable="SYSCTL.PCONP.PCCAN1&amp;0x1" id="CANCON1" location="0x40044000"/> +<peripheralInstance derived_from="LPC17_CANCON" enable="SYSCTL.PCONP.PCCAN2&amp;0x1" id="CANCON2" location="0x40048000"/> +<peripheralInstance derived_from="LPC17_MCPWM" enable="SYSCTL.PCONP.PCMCPWM&amp;0x1" id="MCPWM" location="0x400B8000"/> +<peripheralInstance derived_from="LPC17_FMC" id="FMC" location="0x40084000"/> </chip> <processor><name gcc_name="cortex-m3">Cortex-M3</name> <family>Cortex-M</family> </processor> -<link href="nxp_lpc13Uxx_peripheral.xme" show="embed" type="simple"/> +<link href="nxp_lpcxxxx_peripheral.xme" show="embed" type="simple"/> </info> </infoList> </TargetConfig> diff --git a/demos/device/device_os_none/device_os_none.uvproj b/demos/device/device_os_none/device_os_none.uvproj new file mode 100644 index 000000000..c8464207a --- /dev/null +++ b/demos/device/device_os_none/device_os_none.uvproj @@ -0,0 +1,1953 @@ + + + + 1.1 + +
### uVision Project, (C) Keil Software
+ + + + Board EA4357 + 0x4 + ARM-ADS + + + LPC4357 + NXP (founded by Philips) + IRAM(0x10000000-0x10007FFF) IRAM2(0x20000000-0x2000FFFF) IROM(0x1A000000-0x1A07FFFF) IROM2(0x1B000000-0x1B07FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") FPU2 + + "STARTUP\NXP\LPC43xx\startup_LPC43xx.s" ("NXP LPC43xx Startup Code") + UL2CM3(-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) + 6414 + LPC43xx.H + + + + + + + + + + SFD\NXP\LPC43xx\LPC43xx.SFR + 0 + + + + NXP\LPC43xx\ + NXP\LPC43xx\ + + 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 + + + 1 + 0 + $K\ARM\BIN\ELFDWT.EXE !L BASEADDRESS(0x1A000000) + + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + + + SARMCM3.DLL + -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 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-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 1 + 1 + 8 + 1 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x8000 + + + 1 + 0x1a000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x1a000000 + 0x80000 + + + 1 + 0x1b000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x8000 + + + 0 + 0x20000000 + 0x10000 + + + + + + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + --gnu --c99 --diag_suppress=66 + CORE_M4 MCU=MCU_LPC43XX BOARD=BOARD_EA4357 TUSB_CFG_OS=TUSB_OS_NONE + + ..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + NO_CRP + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + 0x1A000000 + 0x10000000 + + + + + + + + + + + + app + + + cdcd_app.c + 1 + .\cdcd_app.c + + + keyboardd_app.c + 1 + .\keyboardd_app.c + + + main.c + 1 + .\main.c + + + moused_app.c + 1 + .\moused_app.c + + + mscd_app.c + 1 + .\mscd_app.c + + + mscd_app_ramdisk.c + 1 + .\mscd_app_ramdisk.c + + + mscd_app_romdisk.c + 1 + .\mscd_app_romdisk.c + + + tusb_descriptors.c + 1 + .\tusb_descriptors.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 + + + errors.c + 1 + ..\..\..\tinyusb\common\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 + ..\..\bsp\boards\board.c + + + board_ea4357.c + 1 + ..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c + + + printf_retarget.c + 1 + ..\..\bsp\boards\printf_retarget.c + + + pca9532.c + 1 + ..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c + + + board_ngx4330.c + 1 + ..\..\bsp\boards\ngx\board_ngx4330.c + + + board_lpc4357usb.c + 1 + ..\..\bsp\boards\microbuilder\board_lpc4357usb.c + + + board_rf1ghznode.c + 1 + ..\..\bsp\boards\microbuilder\board_rf1ghznode.c + + + board_lpcxpresso1769.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c + + + board_lpcxpresso1347.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c + + + board_mcb4300.c + 1 + ..\..\bsp\boards\keil\board_mcb4300.c + + + + + bsp lpc13uxx + + + startup_LPC13Uxx.s + 2 + ..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s + + + system_LPC13Uxx.c + 1 + ..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c + + + gpio.c + 1 + ..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c + + + uart.c + 1 + ..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c + + + + + + + Board LPC4357USB + 0x4 + ARM-ADS + + + LPC4357 + NXP (founded by Philips) + IRAM(0x10000000-0x10007FFF) IRAM2(0x20000000-0x2000FFFF) IROM(0x1A000000-0x1A07FFFF) IROM2(0x1B000000-0x1B07FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") FPU2 + + "STARTUP\NXP\LPC43xx\startup_LPC43xx.s" ("NXP LPC43xx Startup Code") + UL2CM3(-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) + 6414 + LPC43xx.H + + + + + + + + + + SFD\NXP\LPC43xx\LPC43xx.SFR + 0 + + + + NXP\LPC43xx\ + NXP\LPC43xx\ + + 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 + + + 1 + 0 + $K\ARM\BIN\ELFDWT.EXE !L BASEADDRESS(0x1A000000) + + 0 + 0 + + 0 + + + + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 3 + + + + + SARMCM3.DLL + -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 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-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 1 + 1 + 8 + 1 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x8000 + + + 1 + 0x1a000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x1a000000 + 0x80000 + + + 1 + 0x1b000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x8000 + + + 0 + 0x20000000 + 0x10000 + + + + + + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + --gnu --c99 + CORE_M4 MCU=MCU_LPC43XX BOARD=BOARD_LPC4357USB TUSB_CFG_OS=TUSB_OS_NONE + + ..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + NO_CRP + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + 0x1A000000 + 0x10000000 + + + + + + + + + + + + app + + + cdcd_app.c + 1 + .\cdcd_app.c + + + keyboardd_app.c + 1 + .\keyboardd_app.c + + + main.c + 1 + .\main.c + + + moused_app.c + 1 + .\moused_app.c + + + mscd_app.c + 1 + .\mscd_app.c + + + mscd_app_ramdisk.c + 1 + .\mscd_app_ramdisk.c + + + mscd_app_romdisk.c + 1 + .\mscd_app_romdisk.c + + + tusb_descriptors.c + 1 + .\tusb_descriptors.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 + + + errors.c + 1 + ..\..\..\tinyusb\common\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 + ..\..\bsp\boards\board.c + + + board_ea4357.c + 1 + ..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c + + + printf_retarget.c + 1 + ..\..\bsp\boards\printf_retarget.c + + + pca9532.c + 1 + ..\..\bsp\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 + ..\..\bsp\boards\ngx\board_ngx4330.c + + + board_lpc4357usb.c + 1 + ..\..\bsp\boards\microbuilder\board_lpc4357usb.c + + + board_rf1ghznode.c + 1 + ..\..\bsp\boards\microbuilder\board_rf1ghznode.c + + + board_lpcxpresso1769.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c + + + board_lpcxpresso1347.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c + + + board_mcb4300.c + 1 + ..\..\bsp\boards\keil\board_mcb4300.c + + + + + bsp lpc13uxx + + + startup_LPC13Uxx.s + 2 + ..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s + + + system_LPC13Uxx.c + 1 + ..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c + + + gpio.c + 1 + ..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c + + + uart.c + 1 + ..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c + + + + + + + Board LPCXpresso1347 + 0x4 + ARM-ADS + + + LPC4357 + NXP (founded by Philips) + IRAM(0x10000000-0x10007FFF) IRAM2(0x20000000-0x2000FFFF) IROM(0x1A000000-0x1A07FFFF) IROM2(0x1B000000-0x1B07FFFF) CLOCK(12000000) CPUTYPE("Cortex-M4") FPU2 + + "STARTUP\NXP\LPC43xx\startup_LPC43xx.s" ("NXP LPC43xx Startup Code") + UL2CM3(-O975 -S0 -C0 -FO7 -FD10000000 -FC800 -FN2 -FF0LPC18xx43xx_512_BA -FS01A000000 -FL080000 -FF1LPC18xx43xx_512_BB -FS11B000000 -FL180000) + 6414 + LPC43xx.H + + + + + + + + + + SFD\NXP\LPC43xx\LPC43xx.SFR + 0 + + + + NXP\LPC43xx\ + NXP\LPC43xx\ + + 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 + -MPU + DCM.DLL + -pCM4 + SARMCM3.DLL + -MPU + TCM.DLL + -pCM4 + + + + 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-M4" + + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 2 + 1 + 1 + 8 + 1 + 0 + 0 + 3 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x8000 + + + 1 + 0x1a000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x0 + 0x0 + + + 1 + 0x1a000000 + 0x80000 + + + 1 + 0x1b000000 + 0x80000 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x0 + 0x0 + + + 0 + 0x10000000 + 0x8000 + + + 0 + 0x20000000 + 0x10000 + + + + + + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + --gnu --c99 --diag_suppress=66 + TUSB_CFG_MCU=MCU_LPC13UXX BOARD=BOARD_LPCXPRESSO1347 TUSB_CFG_OS=TUSB_OS_NONE + + ..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb + + + + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + NO_CRP + + + + + + 1 + 0 + 0 + 0 + 1 + 0 + 0x1A000000 + 0x10000000 + + + + + + + + + + + + app + + + cdcd_app.c + 1 + .\cdcd_app.c + + + keyboardd_app.c + 1 + .\keyboardd_app.c + + + main.c + 1 + .\main.c + + + moused_app.c + 1 + .\moused_app.c + + + mscd_app.c + 1 + .\mscd_app.c + + + mscd_app_ramdisk.c + 1 + .\mscd_app_ramdisk.c + + + mscd_app_romdisk.c + 1 + .\mscd_app_romdisk.c + + + tusb_descriptors.c + 1 + .\tusb_descriptors.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 + + + errors.c + 1 + ..\..\..\tinyusb\common\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 + ..\..\bsp\boards\board.c + + + board_ea4357.c + 1 + ..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c + + + printf_retarget.c + 1 + ..\..\bsp\boards\printf_retarget.c + + + pca9532.c + 1 + ..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c + + + board_ngx4330.c + 1 + ..\..\bsp\boards\ngx\board_ngx4330.c + + + board_lpc4357usb.c + 1 + ..\..\bsp\boards\microbuilder\board_lpc4357usb.c + + + board_rf1ghznode.c + 1 + ..\..\bsp\boards\microbuilder\board_rf1ghznode.c + + + board_lpcxpresso1769.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c + + + board_lpcxpresso1347.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c + + + board_mcb4300.c + 1 + ..\..\bsp\boards\keil\board_mcb4300.c + + + + + bsp lpc13uxx + + + startup_LPC13Uxx.s + 2 + ..\..\bsp\lpc13uxx\startup_keil\startup_LPC13Uxx.s + + + system_LPC13Uxx.c + 1 + ..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c + + + gpio.c + 1 + ..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c + + + uart.c + 1 + ..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c + + + + + + + + diff --git a/demos/device/device_os_none/tusb_config.h b/demos/device/device_os_none/tusb_config.h index 899ee37f1..4bf886b59 100644 --- a/demos/device/device_os_none/tusb_config.h +++ b/demos/device/device_os_none/tusb_config.h @@ -83,8 +83,8 @@ #define TUSB_CFG_DEVICE_FULLSPEED 1 // TODO refractor, remove //------------- CLASS -------------// -#define TUSB_CFG_DEVICE_HID_KEYBOARD 1 -#define TUSB_CFG_DEVICE_HID_MOUSE 1 +#define TUSB_CFG_DEVICE_HID_KEYBOARD 0 +#define TUSB_CFG_DEVICE_HID_MOUSE 0 #define TUSB_CFG_DEVICE_HID_GENERIC 0 #define TUSB_CFG_DEVICE_MSC 0 #define TUSB_CFG_DEVICE_CDC 1 diff --git a/demos/host/host_os_none/host_os_none.uvopt b/demos/host/host_os_none/host_os_none.uvopt index c71341024..c05a5fc11 100644 --- a/demos/host/host_os_none/host_os_none.uvopt +++ b/demos/host/host_os_none/host_os_none.uvopt @@ -567,8 +567,8 @@ - boards - 0 + tinyusb + 1 0 0 0 @@ -578,174 +578,6 @@ 1 0 0 - 31 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\board.c - board.c - 0 - 0 - - - 2 - 9 - 1 - 0 - 0 - 78 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\embedded_artists\board_ea4357.c - board_ea4357.c - 0 - 0 - - - 2 - 10 - 1 - 0 - 0 - 3 - 0 - 95 - 138 - 0 - ..\..\bsp\boards\printf_retarget.c - printf_retarget.c - 0 - 0 - - - 2 - 11 - 1 - 0 - 0 - 61 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c - pca9532.c - 0 - 0 - - - 2 - 12 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\ngx\board_ngx4330.c - board_ngx4330.c - 0 - 0 - - - 2 - 13 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\microbuilder\board_lpc4357usb.c - board_lpc4357usb.c - 0 - 0 - - - 2 - 14 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\microbuilder\board_rf1ghznode.c - board_rf1ghznode.c - 0 - 0 - - - 2 - 15 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c - board_lpcxpresso1769.c - 0 - 0 - - - 2 - 16 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c - board_lpcxpresso1347.c - 0 - 0 - - - 2 - 17 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - ..\..\bsp\boards\keil\board_mcb4300.c - board_mcb4300.c - 0 - 0 - - - - - tinyusb - 1 - 0 - 0 - 0 - - 3 - 18 - 1 - 1 - 0 64 0 0 @@ -757,8 +589,8 @@ 0 - 3 - 19 + 2 + 9 1 0 0 @@ -773,8 +605,8 @@ 0 - 3 - 20 + 2 + 10 1 0 0 @@ -789,8 +621,8 @@ 0 - 3 - 21 + 2 + 11 1 0 0 @@ -805,8 +637,8 @@ 0 - 3 - 22 + 2 + 12 1 0 0 @@ -821,8 +653,8 @@ 0 - 3 - 23 + 2 + 13 1 0 0 @@ -837,8 +669,8 @@ 0 - 3 - 24 + 2 + 14 1 0 0 @@ -853,8 +685,8 @@ 0 - 3 - 25 + 2 + 15 1 0 0 @@ -869,8 +701,8 @@ 0 - 3 - 26 + 2 + 16 1 0 0 @@ -885,8 +717,8 @@ 0 - 3 - 27 + 2 + 17 1 0 0 @@ -901,8 +733,8 @@ 0 - 3 - 28 + 2 + 18 1 0 0 @@ -917,14 +749,14 @@ 0 - 3 - 29 + 2 + 19 1 0 0 0 0 - 54 + 55 62 0 ..\..\..\tinyusb\common\fifo.c @@ -933,8 +765,8 @@ 0 - 3 - 30 + 2 + 20 1 0 0 @@ -949,8 +781,8 @@ 0 - 3 - 31 + 2 + 21 1 0 0 @@ -965,8 +797,8 @@ 0 - 3 - 32 + 2 + 22 1 0 0 @@ -981,8 +813,8 @@ 0 - 3 - 33 + 2 + 23 1 0 0 @@ -998,6 +830,174 @@ + + boards + 1 + 0 + 0 + 0 + + 3 + 24 + 1 + 0 + 0 + 31 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\board.c + board.c + 0 + 0 + + + 3 + 25 + 1 + 0 + 0 + 78 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c + board_ea4357.c + 0 + 0 + + + 3 + 26 + 1 + 0 + 0 + 3 + 0 + 95 + 138 + 0 + ..\..\bsp\boards\printf_retarget.c + printf_retarget.c + 0 + 0 + + + 3 + 27 + 1 + 0 + 0 + 61 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c + pca9532.c + 0 + 0 + + + 3 + 28 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\ngx\board_ngx4330.c + board_ngx4330.c + 0 + 0 + + + 3 + 29 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\microbuilder\board_lpc4357usb.c + board_lpc4357usb.c + 0 + 0 + + + 3 + 30 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\microbuilder\board_rf1ghznode.c + board_rf1ghznode.c + 0 + 0 + + + 3 + 31 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c + board_lpcxpresso1769.c + 0 + 0 + + + 3 + 32 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c + board_lpcxpresso1347.c + 0 + 0 + + + 3 + 33 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\..\bsp\boards\keil\board_mcb4300.c + board_mcb4300.c + 0 + 0 + + + cmsis 1 @@ -1156,7 +1156,7 @@ 0 0 0 - 1688 + 1701 1713 0 ..\..\..\vendor\fatfs\ff.c diff --git a/demos/host/host_os_none/host_os_none.uvproj b/demos/host/host_os_none/host_os_none.uvproj index 458c4244c..40e143fb8 100644 --- a/demos/host/host_os_none/host_os_none.uvproj +++ b/demos/host/host_os_none/host_os_none.uvproj @@ -348,7 +348,7 @@ 0 --gnu --c99 --diag_suppress=66 - CORE_M4 MCU=MCU_LPC43XX BOARD=BOARD_EA4357 TUSB_CFG_OS=TUSB_OS_NONE + CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_EA4357 TUSB_CFG_OS=TUSB_OS_NONE ..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs @@ -428,61 +428,6 @@ - - boards - - - board.c - 1 - ..\..\bsp\boards\board.c - - - board_ea4357.c - 1 - ..\..\bsp\boards\embedded_artists\board_ea4357.c - - - printf_retarget.c - 1 - ..\..\bsp\boards\printf_retarget.c - - - pca9532.c - 1 - ..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c - - - board_ngx4330.c - 1 - ..\..\bsp\boards\ngx\board_ngx4330.c - - - board_lpc4357usb.c - 1 - ..\..\bsp\boards\microbuilder\board_lpc4357usb.c - - - board_rf1ghznode.c - 1 - ..\..\bsp\boards\microbuilder\board_rf1ghznode.c - - - board_lpcxpresso1769.c - 1 - ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c - - - board_lpcxpresso1347.c - 1 - ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c - - - board_mcb4300.c - 1 - ..\..\bsp\boards\keil\board_mcb4300.c - - - tinyusb @@ -568,6 +513,61 @@ + + boards + + + board.c + 1 + ..\..\bsp\boards\board.c + + + board_ea4357.c + 1 + ..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c + + + printf_retarget.c + 1 + ..\..\bsp\boards\printf_retarget.c + + + pca9532.c + 1 + ..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c + + + board_ngx4330.c + 1 + ..\..\bsp\boards\ngx\board_ngx4330.c + + + board_lpc4357usb.c + 1 + ..\..\bsp\boards\microbuilder\board_lpc4357usb.c + + + board_rf1ghznode.c + 1 + ..\..\bsp\boards\microbuilder\board_rf1ghznode.c + + + board_lpcxpresso1769.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c + + + board_lpcxpresso1347.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c + + + board_mcb4300.c + 1 + ..\..\bsp\boards\keil\board_mcb4300.c + + + cmsis @@ -977,7 +977,7 @@ 0 --gnu --c99 - CORE_M4 MCU=MCU_LPC43XX BOARD=BOARD_LPC4357USB TUSB_CFG_OS=TUSB_OS_NONE + CORE_M4 TUSB_CFG_MCU=MCU_LPC43XX BOARD=BOARD_LPC4357USB TUSB_CFG_OS=TUSB_OS_NONE ..\src;..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc;..\..\bsp;..\..\..\tinyusb;..\..\..\vendor\fatfs @@ -1057,101 +1057,6 @@ - - boards - - - board.c - 1 - ..\..\bsp\boards\board.c - - - board_ea4357.c - 1 - ..\..\bsp\boards\embedded_artists\board_ea4357.c - - - printf_retarget.c - 1 - ..\..\bsp\boards\printf_retarget.c - - - pca9532.c - 1 - ..\..\bsp\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 - ..\..\bsp\boards\ngx\board_ngx4330.c - - - board_lpc4357usb.c - 1 - ..\..\bsp\boards\microbuilder\board_lpc4357usb.c - - - board_rf1ghznode.c - 1 - ..\..\bsp\boards\microbuilder\board_rf1ghznode.c - - - board_lpcxpresso1769.c - 1 - ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c - - - board_lpcxpresso1347.c - 1 - ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c - - - board_mcb4300.c - 1 - ..\..\bsp\boards\keil\board_mcb4300.c - - - tinyusb @@ -1237,6 +1142,101 @@ + + boards + + + board.c + 1 + ..\..\bsp\boards\board.c + + + board_ea4357.c + 1 + ..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c + + + printf_retarget.c + 1 + ..\..\bsp\boards\printf_retarget.c + + + pca9532.c + 1 + ..\..\bsp\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 + ..\..\bsp\boards\ngx\board_ngx4330.c + + + board_lpc4357usb.c + 1 + ..\..\bsp\boards\microbuilder\board_lpc4357usb.c + + + board_rf1ghznode.c + 1 + ..\..\bsp\boards\microbuilder\board_rf1ghznode.c + + + board_lpcxpresso1769.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c + + + board_lpcxpresso1347.c + 1 + ..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c + + + board_mcb4300.c + 1 + ..\..\bsp\boards\keil\board_mcb4300.c + + + cmsis diff --git a/tinyusb/class/hid.c b/tinyusb/class/hid.c deleted file mode 100644 index f1471f093..000000000 --- a/tinyusb/class/hid.c +++ /dev/null @@ -1,348 +0,0 @@ -/**************************************************************************/ -/*! - @file hid.c - @author hathach (tinyusb.org) - - @section LICENSE - - Software License Agreement (BSD License) - - Copyright (c) 2013, hathach (tinyusb.org) - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - This file is part of the tinyusb stack. -*/ -/**************************************************************************/ - -#include "hid.h" - -#if defined DEVICE_CLASS_HID && defined TUSB_CFG_DEVICE - -#ifdef TUSB_CFG_DEVICE_HID_KEYBOARD -hid_keyboard_report_t hid_keyboard_report; -static volatile bool bKeyChanged = false; -#endif - -#ifdef TUSB_CFG_DEVICE_HID_MOUSE -hid_mouse_report_t hid_mouse_report; -static volatile bool bMouseChanged = false; -#endif - -/**************************************************************************/ -/*! - @brief Handler for HID_GetReport in the USB ROM driver -*/ -/**************************************************************************/ -ErrorCode_t HID_GetReport( USBD_HANDLE_T hHid, USB_SETUP_PACKET* pSetup, uint8_t** pBuffer, uint16_t* plength) -{ - USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*) hHid; - - /* ReportID = SetupPacket.wValue.WB.L; */ - if (pSetup->wValue.WB.H == HID_REPORT_INPUT) - return (ERR_USBD_STALL); /* Not Supported */ - - switch (pHidCtrl->protocol) - { - #ifdef TUSB_CFG_DEVICE_HID_KEYBOARD - case HID_PROTOCOL_KEYBOARD: - *pBuffer = (uint8_t*) &hid_keyboard_report; - *plength = sizeof(hid_keyboard_report_t); - - if (!bKeyChanged) - { - memset(pBuffer, 0, *plength); - } - bKeyChanged = false; - break; - #endif - - #ifdef TUSB_CFG_DEVICE_HID_MOUSE - case HID_PROTOCOL_MOUSE: - *pBuffer = (uint8_t*) &hid_mouse_report; - *plength = sizeof(hid_mouse_report_t); - - if (!bMouseChanged) - { - memset(pBuffer, 0, *plength); - } - bMouseChanged = false; - break; - #endif - - default: - break; - } - - return (LPC_OK); -} - -/**************************************************************************/ -/*! - @brief Handler for HIS_SetReport in the USB ROM driver -*/ -/**************************************************************************/ -ErrorCode_t HID_SetReport( USBD_HANDLE_T hHid, USB_SETUP_PACKET* pSetup, uint8_t** pBuffer, uint16_t length) -{ - /* we will reuse standard EP0Buf */ - if (length == 0) - return LPC_OK; - - /* ReportID = SetupPacket.wValue.WB.L; */ - if (pSetup->wValue.WB.H != HID_REPORT_OUTPUT) - return (ERR_USBD_STALL); /* Not Supported */ - - return (LPC_OK); -} - -/**************************************************************************/ -/*! - @brief HID endpoint in handler for the USB ROM driver -*/ -/**************************************************************************/ -ErrorCode_t HID_EpIn_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event) -{ - if (USB_EVT_IN == event) - { - USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*)data; - switch(pHidCtrl->protocol) - { - #ifdef TUSB_CFG_DEVICE_HID_KEYBOARD - case HID_PROTOCOL_KEYBOARD: - if (!bKeyChanged) - { - memset(&hid_keyboard_report, 0, sizeof(hid_keyboard_report_t)); - } - ROM_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_keyboard_report, sizeof(hid_keyboard_report_t)); - bKeyChanged = false; - break; - #endif - - #ifdef TUSB_CFG_DEVICE_HID_MOUSE - case HID_PROTOCOL_MOUSE: - if (!bMouseChanged) - { - memset(&hid_mouse_report, 0, sizeof(hid_mouse_report_t)); - } - ROM_API->hw->WriteEP(hUsb, pHidCtrl->epin_adr, (uint8_t*) &hid_mouse_report, sizeof(hid_mouse_report_t)); - bMouseChanged = false; - break; - #endif - - default: - break; - } - } - - return LPC_OK; -} - -/**************************************************************************/ -/*! - @brief HID endpoint out handler for the USB ROM driver -*/ -/**************************************************************************/ -ErrorCode_t HID_EpOut_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event) -{ - if (USB_EVT_OUT == event) - { - // not used yet - // uint8_t outreport[8]; - // USB_HID_CTRL_T* pHidCtrl = (USB_HID_CTRL_T*)data; - // ROM_API->hw->ReadEP(hUsb, pHidCtrl->epout_adr, outreport); - } - return LPC_OK; -} - -/**************************************************************************/ -/*! - @brief Initialises USB HID using the ROM based drivers -*/ -/**************************************************************************/ -tusb_error_t tusb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *const pIntfDesc, uint8_t const * const pHIDReportDesc, uint32_t ReportDescLength, uint32_t* mem_base, uint32_t* mem_size) -{ - USB_HID_REPORT_T reports_data = - { - .desc = (uint8_t*) pHIDReportDesc, - .len = ReportDescLength, - .idle_time = 0, - }; - - USBD_HID_INIT_PARAM_T hid_param = - { - .mem_base = *mem_base, - .mem_size = *mem_size, - - .intf_desc = (uint8_t*)pIntfDesc, - .report_data = &reports_data, - .max_reports = 1, - - /* user defined functions */ - .HID_GetReport = HID_GetReport, - .HID_SetReport = HID_SetReport, - .HID_EpIn_Hdlr = HID_EpIn_Hdlr, - .HID_EpOut_Hdlr = HID_EpOut_Hdlr - }; - - ASSERT( (pIntfDesc != NULL) && (pIntfDesc->bInterfaceClass == USB_DEVICE_CLASS_HUMAN_INTERFACE), ERR_FAILED); - - ASSERT( LPC_OK == ROM_API->hid->init(hUsb, &hid_param), TUSB_ERROR_FAILED ); - - /* update memory variables */ - *mem_base += (*mem_size - hid_param.mem_size); - *mem_size = hid_param.mem_size; - - return TUSB_ERROR_NONE; -} - -/**************************************************************************/ -/*! - -*/ -/**************************************************************************/ -tusb_error_t tusb_hid_configured(USBD_HANDLE_T hUsb) -{ - #ifdef TUSB_CFG_DEVICE_HID_KEYBOARD - ROM_API->hw->WriteEP(hUsb , HID_KEYBOARD_EDPT_ADDR , (uint8_t* ) &hid_keyboard_report , sizeof(hid_keyboard_report_t) ); // initial packet for IN endpoint , will not work if omitted - #endif - - #ifdef TUSB_CFG_DEVICE_HID_MOUSE - ROM_API->hw->WriteEP(hUsb , HID_MOUSE_EDPT_ADDR , (uint8_t* ) &hid_mouse_report , sizeof(hid_mouse_report_t) ); // initial packet for IN endpoint, will not work if omitted - #endif - - return TUSB_ERROR_NONE; -} - -#ifdef TUSB_CFG_DEVICE_HID_KEYBOARD -/**************************************************************************/ -/*! - @brief Send the supplied key codes out via HID USB keyboard emulation - - @param[in] modifier - KB modifier code bits (see USB_HID_KB_KEYMODIFIER_CODE) - @param[in] keycodes - A buffer containing up to six keycodes - @param[in] numkey - The number of keys to send (max 6) - - @note Note that for HID KBs, letter codes are not case sensitive. To - create an upper-case letter, you need to include the correct - KB modifier code(s), for ex: (1 << HID_KEYMODIFIER_LEFTSHIFT) - - @section EXAMPLE - - @code - - // Send an unmodified 'a' character - if (usb_isConfigured()) - { - uint8_t keys[6] = {HID_USAGE_KEYBOARD_aA}; - tusb_hid_keyboard_sendKeys(0x00, keys, 1); - } - - // Send Windows + 'e' (shortcut for 'explorer.exe') - if (usb_isConfigured()) - { - uint8_t keys[6] = {HID_USAGE_KEYBOARD_aA + 'e' - 'a'}; - tusb_hid_keyboard_sendKeys((1<