diff options
| author | hathach <[email protected]> | 2019-05-15 12:57:31 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2019-05-15 12:57:31 +0700 |
| commit | 8ccecde18e9cf10397ce483fa14564f859686bde (patch) | |
| tree | 45c92cefce4d9ab63cc6cfb32064b8a41525bc65 | |
| parent | 2582dfb3af270c4f0ed08336cb5fc88956c64076 (diff) | |
lpc1769 work with makefile
| -rw-r--r-- | hw/bsp/lpcxpresso1769/board.mk | 3 | ||||
| -rw-r--r-- | hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c | 7 | ||||
| -rw-r--r-- | src/device/usbd.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hw/bsp/lpcxpresso1769/board.mk b/hw/bsp/lpcxpresso1769/board.mk index 5ff1b2b9e..1885ae909 100644 --- a/hw/bsp/lpcxpresso1769/board.mk +++ b/hw/bsp/lpcxpresso1769/board.mk @@ -11,6 +11,9 @@ CFLAGS += \ # All source paths should be relative to the top level. LD_FILE = hw/bsp/lpcxpresso1769/lpc1769.ld +# TODO remove later +SRC_C += src/portable/$(VENDOR)/$(CHIP_FAMILY)/hal_$(CHIP_FAMILY).c + SRC_C += \ hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/chip_17xx_40xx.c \ hw/mcu/nxp/lpcopen/lpc_chip_175x_6x/src/clock_17xx_40xx.c \ diff --git a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c b/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c index 46cd22908..02b903971 100644 --- a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c +++ b/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c @@ -71,11 +71,9 @@ static const PINMUX_GRP_T pin_usb_mux[] = // Invoked by startup code void SystemInit(void) { + Chip_IOCON_Init(LPC_IOCON); Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T)); Chip_SetupXtalClocking(); - - /* Setup FLASH access to 4 clocks (100MHz clock) */ -// Chip_SYSCTL_SetFLASHAccess(FLASHTIM_100MHZ_CPU); } void board_init(void) @@ -123,6 +121,7 @@ void board_init(void) #endif //------------- USB -------------// + Chip_IOCON_SetPinMuxing(LPC_IOCON, pin_usb_mux, sizeof(pin_usb_mux) / sizeof(PINMUX_GRP_T)); Chip_USB_Init(); enum { @@ -140,8 +139,6 @@ void board_init(void) // set portfunc to host !!! LPC_USB->StCtrl = 0x3; // should be 1 #endif - - Chip_IOCON_SetPinMuxing(LPC_IOCON, pin_usb_mux, sizeof(pin_usb_mux) / sizeof(PINMUX_GRP_T)); } //--------------------------------------------------------------------+ diff --git a/src/device/usbd.c b/src/device/usbd.c index 95b3f37d4..56d895388 100644 --- a/src/device/usbd.c +++ b/src/device/usbd.c @@ -382,7 +382,7 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const break;
case TUSB_REQ_GET_DESCRIPTOR:
- TU_ASSERT( process_get_descriptor(rhport, p_request) );
+ TU_VERIFY( process_get_descriptor(rhport, p_request) );
break;
case TUSB_REQ_SET_FEATURE:
|