diff options
| author | hathach <[email protected]> | 2013-05-28 15:24:27 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-05-28 15:24:27 +0700 |
| commit | 1e5bd82af28c6005fa0ecf008e44322a6ee46461 (patch) | |
| tree | e9618a6a79880a0c681a6c213d8560c286e3475f /tinyusb/hal | |
| parent | 7ae986de95ccb049611340164246e17ee0023c87 (diff) | |
rename NGX to ngx
add a bunch of stub header for dcd (175x_6x, 13xx, 18xx_43xx)
add dcd_nxp_romdriver for handling usb rom driver
add BIT_TEST_ in binary.h
remove mw_usbd_hid.h include due to lexical conflict
Diffstat (limited to 'tinyusb/hal')
| -rw-r--r-- | tinyusb/hal/hal_lpc11uxx.h | 5 | ||||
| -rw-r--r-- | tinyusb/hal/hal_lpc13uxx.h | 4 | ||||
| -rw-r--r-- | tinyusb/hal/hal_lpc43xx.c | 8 | ||||
| -rw-r--r-- | tinyusb/hal/hal_lpc43xx.h | 3 |
4 files changed, 5 insertions, 15 deletions
diff --git a/tinyusb/hal/hal_lpc11uxx.h b/tinyusb/hal/hal_lpc11uxx.h index 4b77461fc..4374586d2 100644 --- a/tinyusb/hal/hal_lpc11uxx.h +++ b/tinyusb/hal/hal_lpc11uxx.h @@ -54,12 +54,9 @@ #include "LPC11Uxx.h" -#define DEVICE_ROMDRIVER -#define DEVICE_ROM_REG_BASE LPC_USB_BASE +#define DEVICE_ROM_REG_BASE LPC_USB_BASE #define DEVICE_ROM_DRIVER_ADDR 0x1FFF1FF8 - - #ifdef __cplusplus extern "C" { #endif diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h index da4481341..259f9de11 100644 --- a/tinyusb/hal/hal_lpc13uxx.h +++ b/tinyusb/hal/hal_lpc13uxx.h @@ -54,10 +54,6 @@ #include "LPC13Uxx.h" -#define DEVICE_ROMDRIVER -#define DEVICE_ROM_REG_BASE LPC_USB_BASE -#define DEVICE_ROM_DRIVER_ADDR 0x1FFF1FF8 - #ifdef __cplusplus extern "C" { #endif diff --git a/tinyusb/hal/hal_lpc43xx.c b/tinyusb/hal/hal_lpc43xx.c index 2863aba0a..e700041b1 100644 --- a/tinyusb/hal/hal_lpc43xx.c +++ b/tinyusb/hal/hal_lpc43xx.c @@ -69,8 +69,8 @@ tusb_error_t hal_init(void) hcd_controller_reset(0); // TODO where to place prototype LPC_USB0->USBMODE_H = LPC43XX_USBMODE_HOST | (LPC43XX_USBMODE_VBUS_HIGH << 5); #else // TODO OTG - dcd_controller_reset(0); - LPC_USB0->USBMODE_D = LPC43XX_USBMODE_DEVICE; +// dcd_controller_reset(0); +// LPC_USB0->USBMODE_D = LPC43XX_USBMODE_DEVICE; dcd_controller_connect(0); #endif @@ -91,8 +91,8 @@ tusb_error_t hal_init(void) hcd_controller_reset(1); // TODO where to place prototype LPC_USB1->USBMODE_H = LPC43XX_USBMODE_HOST | (LPC43XX_USBMODE_VBUS_HIGH << 5); #else // TODO OTG - dcd_controller_reset(1); - LPC_USB0->USBMODE_D = LPC43XX_USBMODE_DEVICE; +// dcd_controller_reset(1); +// LPC_USB0->USBMODE_D = LPC43XX_USBMODE_DEVICE; dcd_controller_connect(1); #endif diff --git a/tinyusb/hal/hal_lpc43xx.h b/tinyusb/hal/hal_lpc43xx.h index 1f56e8284..77a0332de 100644 --- a/tinyusb/hal/hal_lpc43xx.h +++ b/tinyusb/hal/hal_lpc43xx.h @@ -58,9 +58,6 @@ extern "C" { #endif -#define DEVICE_ROMDRIVER -#define DEVICE_ROM_REG_BASE LPC_USB0_BASE // TODO USB1 -#define DEVICE_ROM_DRIVER_ADDR 0x1040011C static inline void hal_interrupt_enable(uint8_t controller_id) { |