Skip to content

Commit e83e083

Browse files
hathachhathach
committed
change dcd_init() return from void to bool
1 parent 1f18be9 commit e83e083

File tree

36 files changed

+103
-49
lines changed

36 files changed

+103
-49
lines changed

‎src/device/dcd.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ void dcd_dcache_clean_invalidate(void const* addr, uint32_t data_size) TU_ATTR_W
108108
//--------------------------------------------------------------------+
109109

110110
// Initialize controller to device mode
111-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init);
111+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init);
112112

113113
// Deinitialize controller, unset device mode.
114114
bool dcd_deinit(uint8_t rhport);

‎src/device/usbd.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
454454
}
455455
TU_ASSERT(rh_init);
456456

457-
TU_LOG_USBD("USBD init on controller %u, speed = %s\r\n", rh_init->rhport,
457+
TU_LOG_USBD("USBD init on controller %u, speed = %s\r\n", rhport,
458458
rh_init->speed == TUSB_SPEED_HIGH ? "High" : "Full");
459459
TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(usbd_device_t));
460460
TU_LOG_INT(CFG_TUD_LOG_LEVEL, sizeof(dcd_event_t));
@@ -490,15 +490,16 @@ bool tud_rhport_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
490490
_usbd_rhport = rhport;
491491

492492
// Init device controller driver
493-
dcd_init(rhport, rh_init);
493+
TU_ASSERT(dcd_init(rhport, rh_init));
494494
dcd_int_enable(rhport);
495495

496496
return true;
497497
}
498498

499499
bool tud_deinit(uint8_t rhport) {
500-
// skip if not initialized
501-
if (!tud_inited()) return true;
500+
if (!tud_inited()) {
501+
return true; // skip if not initialized
502+
}
502503

503504
TU_LOG_USBD("USBD deinit on controller %u\r\n", rhport);
504505

‎src/portable/bridgetek/ft9xx/dcd_ft9xx.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ static uint16_t _ft9xx_dusb_out(uint8_t ep_number, uint8_t *buffer, uint16_t len
517517
*------------------------------------------------------------------*/
518518

519519
// Initialize controller to device mode
520-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
520+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
521521
(void) rh_init;
522522
TU_LOG2("FT9xx initialisation\r\n");
523523

@@ -526,6 +526,7 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
526526
interrupt_attach(interrupt_usb_device, (int8_t)interrupt_usb_device, _ft9xx_usbd_ISR);
527527

528528
dcd_connect(rhport);
529+
return true;
529530
}
530531

531532
// Enable device interrupt

‎src/portable/chipidea/ci_fs/dcd_ci_fs.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static void process_bus_resume(uint8_t rhport)
267267
/*------------------------------------------------------------------*/
268268
/* Device API
269269
*------------------------------------------------------------------*/
270-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
270+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
271271
(void) rhport;
272272
(void) rh_init;
273273

@@ -296,6 +296,7 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
296296

297297
dcd_connect(rhport);
298298
// NVIC_ClearPendingIRQ(CIFS_IRQN);
299+
return true;
299300
}
300301

301302
void dcd_set_address(uint8_t rhport, uint8_t dev_addr)

‎src/portable/chipidea/ci_hs/dcd_ci_hs.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ static void bus_reset(uint8_t rhport)
234234
dcd_dcache_clean_invalidate(&_dcd_data, sizeof(dcd_data_t));
235235
}
236236

237-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
237+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
238238
(void) rh_init;
239239
tu_memclr(&_dcd_data, sizeof(dcd_data_t));
240240

241241
ci_hs_regs_t* dcd_reg = CI_HS_REG(rhport);
242242

243-
TU_ASSERT(ci_ep_count(dcd_reg) <= TUP_DCD_ENDPOINT_MAX, );
243+
TU_ASSERT(ci_ep_count(dcd_reg) <= TUP_DCD_ENDPOINT_MAX);
244244

245245
// Reset controller
246246
dcd_reg->USBCMD |= USBCMD_RESET;
@@ -268,6 +268,8 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
268268
usbcmd |= USBCMD_RUN_STOP; // run
269269

270270
dcd_reg->USBCMD = usbcmd;
271+
272+
return true;
271273
}
272274

273275
void dcd_int_enable(uint8_t rhport)

‎src/portable/dialog/da146xx/dcd_da146xx.c‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,15 +804,16 @@ static void handle_ep0_nak(void)
804804
/*------------------------------------------------------------------*/
805805
/* Controller API
806806
*------------------------------------------------------------------*/
807-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
807+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
808808
(void) rhport;
809809
(void) rh_init;
810810

811811
_dcd.init_called = true;
812-
if (_dcd.vbus_present)
813-
{
812+
if (_dcd.vbus_present) {
814813
dcd_connect(rhport);
815814
}
815+
816+
return true;
816817
}
817818

818819
void dcd_int_enable(uint8_t rhport)

‎src/portable/espressif/esp32sx/dcd_esp32sx.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static void enum_done_processing(void)
172172
/*------------------------------------------------------------------*/
173173
/* Controller API
174174
*------------------------------------------------------------------*/
175-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
175+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
176176
(void) rh_init;
177177
ESP_LOGV(TAG, "DCD init - Start");
178178

@@ -211,6 +211,7 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
211211
USB_DISCONNINTMSK_M; // host most only
212212

213213
dcd_connect(rhport);
214+
return true;
214215
}
215216

216217
void dcd_set_address(uint8_t rhport, uint8_t dev_addr)

‎src/portable/mentor/musb/dcd_musb.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ void print_musb_info(musb_regs_t* musb_regs) {
582582
}
583583
#endif
584584

585-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
585+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
586586
(void) rh_init;
587587
musb_regs_t* musb_regs = MUSB_REGS(rhport);
588588

@@ -594,6 +594,7 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
594594
musb_dcd_int_clear(rhport);
595595
musb_dcd_phy_init(rhport);
596596
dcd_connect(rhport);
597+
return true;
597598
}
598599

599600
void dcd_int_enable(uint8_t rhport) {

‎src/portable/microchip/pic/dcd_pic.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ static void process_bus_resume(uint8_t rhport)
470470
/*------------------------------------------------------------------*/
471471
/* Device API
472472
*------------------------------------------------------------------*/
473-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
473+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
474474
(void) rh_init;
475475
intr_disable(rhport);
476476
intr_clear(rhport);
@@ -502,6 +502,7 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
502502
U1IE = _U1IE_URSTIE_MASK;
503503

504504
dcd_connect(rhport);
505+
return true;
505506
}
506507

507508
void dcd_int_enable(uint8_t rhport)

‎src/portable/microchip/pic32mz/dcd_pic32mz.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static ep0_stage_t ep0_get_stage(void)
120120
/*------------------------------------------------------------------*/
121121
/* Controller API
122122
*------------------------------------------------------------------*/
123-
void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
123+
bool dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
124124
(void) rh_init;
125125
// Disable endpoint interrupts for now
126126
USB_REGS->INTRRXEbits.w = 0;
@@ -129,6 +129,7 @@ void dcd_init(uint8_t rhport, const tusb_rhport_init_t* rh_init) {
129129
USB_REGS->INTRUSBEbits.w = 7;
130130

131131
dcd_connect(rhport);
132+
return true;
132133
}
133134

134135
void dcd_int_enable(uint8_t rhport)

0 commit comments

Comments
 (0)