@@ -443,19 +443,18 @@ bool tuh_cdc_set_control_line_state(uint8_t idx, uint16_t line_state, tuh_xfer_c
443
443
return driver -> set_control_line_state (p_cdc , line_state , complete_cb , user_data );
444
444
}else {
445
445
// blocking
446
- xfer_result_t result ;
446
+ xfer_result_t result = XFER_RESULT_INVALID ;
447
447
bool ret = driver -> set_control_line_state (p_cdc , line_state , complete_cb , (uintptr_t ) & result );
448
448
449
449
if (user_data ) {
450
450
// user_data is not NULL, return result via user_data
451
451
* ((xfer_result_t * ) user_data ) = result ;
452
452
}
453
453
454
- if (result == XFER_RESULT_SUCCESS ) {
455
- p_cdc -> line_state = (uint8_t ) line_state ;
456
- }
454
+ TU_VERIFY (ret && result == XFER_RESULT_SUCCESS );
457
455
458
- return ret ;
456
+ p_cdc -> line_state = (uint8_t ) line_state ;
457
+ return true;
459
458
}
460
459
}
461
460
@@ -468,19 +467,18 @@ bool tuh_cdc_set_baudrate(uint8_t idx, uint32_t baudrate, tuh_xfer_cb_t complete
468
467
return driver -> set_baudrate (p_cdc , baudrate , complete_cb , user_data );
469
468
}else {
470
469
// blocking
471
- xfer_result_t result ;
470
+ xfer_result_t result = XFER_RESULT_INVALID ;
472
471
bool ret = driver -> set_baudrate (p_cdc , baudrate , complete_cb , (uintptr_t ) & result );
473
472
474
473
if (user_data ) {
475
474
// user_data is not NULL, return result via user_data
476
475
* ((xfer_result_t * ) user_data ) = result ;
477
476
}
478
477
479
- if (result == XFER_RESULT_SUCCESS ) {
480
- p_cdc -> line_coding .bit_rate = baudrate ;
481
- }
478
+ TU_VERIFY (ret && result == XFER_RESULT_SUCCESS );
482
479
483
- return ret ;
480
+ p_cdc -> line_coding .bit_rate = baudrate ;
481
+ return true;
484
482
}
485
483
}
486
484
@@ -495,19 +493,18 @@ bool tuh_cdc_set_line_coding(uint8_t idx, cdc_line_coding_t const* line_coding,
495
493
return acm_set_line_coding (p_cdc , line_coding , complete_cb , user_data );
496
494
}else {
497
495
// blocking
498
- xfer_result_t result ;
496
+ xfer_result_t result = XFER_RESULT_INVALID ;
499
497
bool ret = acm_set_line_coding (p_cdc , line_coding , complete_cb , (uintptr_t ) & result );
500
498
501
499
if (user_data ) {
502
500
// user_data is not NULL, return result via user_data
503
501
* ((xfer_result_t * ) user_data ) = result ;
504
502
}
505
503
506
- if (result == XFER_RESULT_SUCCESS ) {
507
- p_cdc -> line_coding = * line_coding ;
508
- }
504
+ TU_VERIFY (ret && result == XFER_RESULT_SUCCESS );
509
505
510
- return ret ;
506
+ p_cdc -> line_coding = * line_coding ;
507
+ return true;
511
508
}
512
509
}
513
510
0 commit comments