diff --git a/doxygen/porting.md b/doxygen/porting.md index be917d6f..00aad6a0 100644 --- a/doxygen/porting.md +++ b/doxygen/porting.md @@ -79,7 +79,6 @@ After the USB device is setup, the USB device code works by processing events on All of the code for the low-level device API is in `src/portable///dcd_.c`. #### Device Setup -`dcd_connect`, `dcd_disconnect` and `dcd_set_config` are not currently used and can be left empty. ##### dcd_init Initializes the USB peripheral for device mode and enables it. @@ -89,6 +88,9 @@ Called when the device is given a new bus address. If your peripheral automatically changes address during enumeration (like the nrf52) you may leave this empty and also no queue an event for the corresponding SETUP packet. +##### dcd_set_config +Called when the device received SET_CONFIG request, you can leave this empty if your peripheral does not require any specific action. + #### Special events You must let TinyUSB know when certain events occur so that it can continue its work. There are a few methods you can call to queue events for TinyUSB to process. diff --git a/src/device/dcd.h b/src/device/dcd.h index db84df83..6b1356cb 100644 --- a/src/device/dcd.h +++ b/src/device/dcd.h @@ -90,14 +90,14 @@ typedef struct ATTR_ALIGNED(4) TU_VERIFY_STATIC(sizeof(dcd_event_t) <= 12, "size is not correct"); /*------------------------------------------------------------------*/ -/* Device API (Weak is optional) +/* Device API *------------------------------------------------------------------*/ -bool dcd_init (uint8_t rhport); -void dcd_set_address (uint8_t rhport, uint8_t dev_addr); -void dcd_set_config (uint8_t rhport, uint8_t config_num); +bool dcd_init (uint8_t rhport); +void dcd_int_enable (uint8_t rhport); +void dcd_int_disable(uint8_t rhport); -void dcd_connect (uint8_t rhport) ATTR_WEAK; -void dcd_disconnect (uint8_t rhport) ATTR_WEAK; +void dcd_set_address(uint8_t rhport, uint8_t dev_addr); +void dcd_set_config (uint8_t rhport, uint8_t config_num); /*------------------------------------------------------------------*/ /* Event Function diff --git a/src/portable/microchip/samd21/dcd_samd21.c b/src/portable/microchip/samd21/dcd_samd21.c index dda75cee..5436259d 100644 --- a/src/portable/microchip/samd21/dcd_samd21.c +++ b/src/portable/microchip/samd21/dcd_samd21.c @@ -82,15 +82,6 @@ bool dcd_init (uint8_t rhport) return true; } -void dcd_connect (uint8_t rhport) -{ - -} -void dcd_disconnect (uint8_t rhport) -{ - -} - void dcd_set_address (uint8_t rhport, uint8_t dev_addr) { (void) rhport; diff --git a/src/portable/microchip/samd51/dcd_samd51.c b/src/portable/microchip/samd51/dcd_samd51.c index d0ad17f9..0e8b23d8 100644 --- a/src/portable/microchip/samd51/dcd_samd51.c +++ b/src/portable/microchip/samd51/dcd_samd51.c @@ -82,15 +82,6 @@ bool dcd_init (uint8_t rhport) return true; } -void dcd_connect (uint8_t rhport) -{ - (void) rhport; -} -void dcd_disconnect (uint8_t rhport) -{ - (void) rhport; -} - void dcd_set_address (uint8_t rhport, uint8_t dev_addr) { (void) rhport; diff --git a/src/portable/nordic/nrf5x/dcd_nrf5x.c b/src/portable/nordic/nrf5x/dcd_nrf5x.c index e1e53a83..2118a4bd 100644 --- a/src/portable/nordic/nrf5x/dcd_nrf5x.c +++ b/src/portable/nordic/nrf5x/dcd_nrf5x.c @@ -195,15 +195,6 @@ bool dcd_init (uint8_t rhport) return true; } -void dcd_connect (uint8_t rhport) -{ - (void) rhport; -} -void dcd_disconnect (uint8_t rhport) -{ - (void) rhport; -} - void dcd_set_address (uint8_t rhport, uint8_t dev_addr) { (void) rhport; diff --git a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c index 9c5991ce..26674d9e 100644 --- a/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c +++ b/src/portable/nxp/lpc11_13_15/dcd_lpc11_13_15.c @@ -157,12 +157,6 @@ bool tusb_hal_init(void) return true; } -void dcd_connect(uint8_t rhport) -{ - (void) rhport; - LPC_USB->DEVCMDSTAT |= CMDSTAT_DEVICE_CONNECT_MASK; -} - void dcd_set_config(uint8_t rhport, uint8_t config_num) { diff --git a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c index 8504cbf5..8763d1e1 100644 --- a/src/portable/nxp/lpc17_40/dcd_lpc17_40.c +++ b/src/portable/nxp/lpc17_40/dcd_lpc17_40.c @@ -202,12 +202,6 @@ bool dcd_init(uint8_t rhport) return TUSB_ERROR_NONE; } -void dcd_connect(uint8_t rhport) -{ - (void) rhport; - sie_write(SIE_CMDCODE_DEVICE_STATUS, 1, 1); -} - void dcd_set_address(uint8_t rhport, uint8_t dev_addr) { (void) rhport; diff --git a/src/portable/nxp/lpc18_43/dcd_lpc18_43.c b/src/portable/nxp/lpc18_43/dcd_lpc18_43.c index 8f5e3b45..9423b64a 100644 --- a/src/portable/nxp/lpc18_43/dcd_lpc18_43.c +++ b/src/portable/nxp/lpc18_43/dcd_lpc18_43.c @@ -92,11 +92,6 @@ static dcd_data_t* const dcd_data_ptr[2] = //--------------------------------------------------------------------+ // CONTROLLER API //--------------------------------------------------------------------+ -void dcd_connect(uint8_t rhport) -{ - LPC_USB[rhport]->USBCMD_D |= BIT_(0); -} - void dcd_set_address(uint8_t rhport, uint8_t dev_addr) { LPC_USB[rhport]->DEVICEADDR = (dev_addr << 25) | BIT_(24);