@@ -346,7 +346,6 @@ void serial_putc(serial_t *obj, int c)
346
346
347
347
int serial_readable (serial_t * obj )
348
348
{
349
- //return UART_IS_RX_READY(((UART_T *) NU_MODBASE(obj->serial.uart)));
350
349
return ! UART_GET_RX_EMPTY (((UART_T * ) NU_MODBASE (obj -> serial .uart )));
351
350
}
352
351
@@ -427,9 +426,6 @@ int serial_tx_asynch(serial_t *obj, const void *tx, size_t tx_length, uint8_t tx
427
426
// UART IRQ is necessary for both interrupt way and DMA way
428
427
serial_tx_enable_event (obj , event , 1 );
429
428
serial_tx_buffer_set (obj , tx , tx_length , tx_width );
430
- //UART_HAL_DisableTransmitter(obj->serial.address);
431
- //UART_HAL_FlushTxFifo(obj->serial.address);
432
- //UART_HAL_EnableTransmitter(obj->serial.address);
433
429
434
430
int n_word = 0 ;
435
431
if (obj -> serial .dma_usage_tx == DMA_USAGE_NEVER ) {
@@ -457,12 +453,6 @@ int serial_tx_asynch(serial_t *obj, const void *tx, size_t tx_length, uint8_t tx
457
453
PDMA_SAR_INC , // Source address incremental
458
454
(uint32_t ) NU_MODBASE (obj -> serial .uart ), // Destination address
459
455
PDMA_DAR_FIX ); // Destination address fixed
460
- #if 0 // NOTE:
461
- // NANO130: No burst type setting
462
- PDMA_SetBurstType (obj -> serial .dma_chn_id_tx ,
463
- PDMA_REQ_SINGLE , // Single mode
464
- 0 ); // Burst size
465
- #endif
466
456
PDMA_EnableInt (obj -> serial .dma_chn_id_tx ,
467
457
PDMA_IER_TD_IE_Msk ); // Interrupt type
468
458
// Register DMA event handler
@@ -494,9 +484,6 @@ void serial_rx_asynch(serial_t *obj, void *rx, size_t rx_length, uint8_t rx_widt
494
484
serial_rx_enable_event (obj , event , 1 );
495
485
serial_rx_buffer_set (obj , rx , rx_length , rx_width );
496
486
serial_rx_set_char_match (obj , char_match );
497
- //UART_HAL_DisableReceiver(obj->serial.address);
498
- //UART_HAL_FlushRxFifo(obj->serial.address);
499
- //UART_HAL_EnableReceiver(obj->serial.address);
500
487
501
488
if (obj -> serial .dma_usage_rx == DMA_USAGE_NEVER ) {
502
489
// Interrupt way
@@ -522,12 +509,6 @@ void serial_rx_asynch(serial_t *obj, void *rx, size_t rx_length, uint8_t rx_widt
522
509
// NUC472: End of destination address
523
510
// M451: Start of destination address
524
511
PDMA_DAR_INC ); // Destination address incremental
525
- #if 0 // NOTE:
526
- // NANO130: No burst type setting
527
- PDMA_SetBurstType (obj -> serial .dma_chn_id_rx ,
528
- PDMA_REQ_SINGLE , // Single mode
529
- 0 ); // Burst size
530
- #endif
531
512
PDMA_EnableInt (obj -> serial .dma_chn_id_rx ,
532
513
PDMA_IER_TD_IE_Msk ); // Interrupt type
533
514
// Register DMA event handler
@@ -547,7 +528,6 @@ void serial_tx_abort_asynch(serial_t *obj)
547
528
if (obj -> serial .dma_chn_id_tx != DMA_ERROR_OUT_OF_CHANNELS ) {
548
529
PDMA_DisableInt (obj -> serial .dma_chn_id_tx , PDMA_IER_TD_IE_Msk );
549
530
// NOTE: On NUC472, next PDMA transfer will fail with PDMA_STOP() called.
550
- //PDMA_STOP(obj->serial.dma_chn_id_tx);
551
531
dma_enable (obj -> serial .dma_chn_id_tx , 0 );
552
532
}
553
533
((UART_T * ) NU_MODBASE (obj -> serial .uart ))-> CTL &= ~UART_CTL_DMA_TX_EN_Msk ;
@@ -564,7 +544,6 @@ void serial_rx_abort_asynch(serial_t *obj)
564
544
if (obj -> serial .dma_chn_id_rx != DMA_ERROR_OUT_OF_CHANNELS ) {
565
545
PDMA_DisableInt (obj -> serial .dma_chn_id_rx , PDMA_IER_TD_IE_Msk );
566
546
// NOTE: On NUC472, next PDMA transfer will fail with PDMA_STOP() called.
567
- //PDMA_STOP(obj->serial.dma_chn_id_rx);
568
547
dma_enable (obj -> serial .dma_chn_id_rx , 0 );
569
548
}
570
549
((UART_T * ) NU_MODBASE (obj -> serial .uart ))-> CTL &= ~UART_CTL_DMA_RX_EN_Msk ;
@@ -666,19 +645,13 @@ static void serial_tx_enable_event(serial_t *obj, int event, uint8_t enable)
666
645
obj -> serial .event &= ~SERIAL_EVENT_TX_MASK ;
667
646
obj -> serial .event |= (event & SERIAL_EVENT_TX_MASK );
668
647
669
- //if (event & SERIAL_EVENT_TX_COMPLETE) {
670
- //}
671
648
}
672
649
673
650
static void serial_rx_enable_event (serial_t * obj , int event , uint8_t enable )
674
651
{
675
652
obj -> serial .event &= ~SERIAL_EVENT_RX_MASK ;
676
653
obj -> serial .event |= (event & SERIAL_EVENT_RX_MASK );
677
654
678
- //if (event & SERIAL_EVENT_RX_COMPLETE) {
679
- //}
680
- //if (event & SERIAL_EVENT_RX_OVERRUN_ERROR) {
681
- //}
682
655
if (event & SERIAL_EVENT_RX_FRAMING_ERROR ) {
683
656
UART_ENABLE_INT (((UART_T * ) NU_MODBASE (obj -> serial .uart )), UART_IER_RLS_IE_Msk );
684
657
}
@@ -688,20 +661,16 @@ static void serial_rx_enable_event(serial_t *obj, int event, uint8_t enable)
688
661
if (event & SERIAL_EVENT_RX_OVERFLOW ) {
689
662
UART_ENABLE_INT (((UART_T * ) NU_MODBASE (obj -> serial .uart )), UART_IER_BUF_ERR_IE_Msk );
690
663
}
691
- //if (event & SERIAL_EVENT_RX_CHARACTER_MATCH) {
692
- //}
693
664
}
694
665
695
666
static int serial_is_tx_complete (serial_t * obj )
696
667
{
697
668
// NOTE: Exclude tx fifo empty check due to no such interrupt on DMA way
698
- //return (obj->tx_buff.pos == obj->tx_buff.length) && UART_GET_TX_EMPTY(((UART_T *) NU_MODBASE(obj->serial.uart)));
699
669
return (obj -> tx_buff .pos == obj -> tx_buff .length );
700
670
}
701
671
702
672
static int serial_is_rx_complete (serial_t * obj )
703
673
{
704
- //return (obj->rx_buff.pos == obj->rx_buff.length) && UART_GET_RX_EMPTY(((UART_T *) NU_MODBASE(obj->serial.uart)));
705
674
return (obj -> rx_buff .pos == obj -> rx_buff .length );
706
675
}
707
676
@@ -765,7 +734,7 @@ static uint32_t serial_rx_event_check(serial_t *obj)
765
734
if ((obj -> char_match != SERIAL_RESERVED_CHAR_MATCH ) && obj -> char_found ) {
766
735
event |= SERIAL_EVENT_RX_CHARACTER_MATCH ;
767
736
// NOTE: Timing to reset char_found?
768
- //obj->char_found = 0;
737
+ // by obj->char_found = 0;
769
738
}
770
739
771
740
return event ;
@@ -866,10 +835,6 @@ static int serial_read_async(serial_t *obj)
866
835
MBED_ASSERT (modinit -> modname == (int ) obj -> serial .uart );
867
836
868
837
uint32_t rx_fifo_busy = (((UART_T * ) NU_MODBASE (obj -> serial .uart ))-> FSR & UART_FSR_RX_POINTER_F_Msk ) >> UART_FSR_RX_POINTER_F_Pos ;
869
- //uint32_t rx_fifo_free = ((struct nu_uart_var *) modinit->var)->fifo_size_rx - rx_fifo_busy;
870
- //if (rx_fifo_free == 0) {
871
- // return 0;
872
- //}
873
838
874
839
uint32_t bytes_per_word = obj -> rx_buff .width / 8 ;
875
840
0 commit comments