diff options
Diffstat (limited to 'tinyusb')
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.c | 48 | ||||
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.h | 8 | ||||
| -rw-r--r-- | tinyusb/common/tusb_fifo.c | 4 |
3 files changed, 24 insertions, 36 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index f08f208ae..afb1c1864 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -90,9 +90,9 @@ uint32_t tud_n_cdc_available(uint8_t rhport) return fifo_count(&_rx_ff);
}
-int tud_n_cdc_read_char(uint8_t rhport)
+int8_t tud_n_cdc_read_char(uint8_t rhport)
{
- uint8_t ch;
+ int8_t ch;
return fifo_read(&_rx_ff, &ch) ? ch : (-1);
}
@@ -230,29 +230,19 @@ tusb_error_t cdcd_control_request_st(uint8_t rhport, tusb_control_request_t cons }
else if (CDC_REQUEST_SET_CONTROL_LINE_STATE == p_request->bRequest )
{
- enum {
- ACTIVE_DTE_PRESENT = 0x0003,
- ACTIVE_DTE_NOT_PRESENT = 0x0002
- };
-
+ // CDC PSTN v1.2 section 6.3.12
+ // Bit 0: Indicates if DTE is present or not. This signal corresponds to V.24 signal 108/2 and RS-232 signal DTR
+ // Bit 1: Carrier control for half-duplex modems. This signal corresponds to V.24 signal 105 and RS-232 signal RTS
cdcd_data_t * p_cdc = &cdcd_data[rhport];
- if (p_request->wValue == ACTIVE_DTE_PRESENT)
- {
- // terminal connected
- p_cdc->connected = true;
- }
- else if (p_request->wValue == ACTIVE_DTE_NOT_PRESENT)
- {
- // terminal disconnected
- p_cdc->connected = false;
- }else
- {
- // De-active --> disconnected
- p_cdc->connected = false;
- }
+ // Terminal connected/disconected depending on carrier control
+ p_cdc->connected = BIT_TEST_(p_request->wValue, 1);
- dcd_control_status(rhport, p_request->bmRequestType_bit.direction);
+ // TODO haven't known what to do with DTE present
+ // BIT_TEST_(p_request->wValue, 0);
+
+
+ dcd_control_status(rhport, p_request->bmRequestType_bit.direction); // ACK control request
}
else
{
@@ -282,18 +272,14 @@ tusb_error_t cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, tusb_event_t event, u bool tud_n_cdc_flush (uint8_t rhport)
{
- VERIFY( tud_n_cdc_connected(rhport) );
+ uint8_t edpt = cdcd_data[rhport].ep_in;
+ VERIFY( !dcd_edpt_busy(rhport, edpt) ); // skip if previous transfer not complete
- uint8_t edpt = cdcd_data[rhport].ep_in;
+ uint16_t count = fifo_read_n(&_tx_ff, _tmp_tx_buf, sizeof(_tmp_tx_buf));
- VERIFY( !dcd_edpt_busy(rhport, edpt) );
+ VERIFY( tud_n_cdc_connected(rhport) ); // fifo is empty if not connected
- uint16_t count = fifo_read_n(&_tx_ff, _tmp_tx_buf, sizeof(_tmp_tx_buf));
-
- if ( count )
- {
- TU_ASSERT( dcd_edpt_xfer(rhport, edpt, _tmp_tx_buf, count) );
- }
+ if ( count ) TU_ASSERT( dcd_edpt_xfer(rhport, edpt, _tmp_tx_buf, count) );
return true;
}
diff --git a/tinyusb/class/cdc/cdc_device.h b/tinyusb/class/cdc/cdc_device.h index 2fcf1abec..f56b3d169 100644 --- a/tinyusb/class/cdc/cdc_device.h +++ b/tinyusb/class/cdc/cdc_device.h @@ -53,12 +53,13 @@ * @{ */
//--------------------------------------------------------------------+
-// APPLICATION API (Multiple Ports)
+// APPLICATION API (Multiple Root Ports)
+// Should be used only with MCU that support more than 1 ports
//--------------------------------------------------------------------+
bool tud_n_cdc_connected (uint8_t rhport);
uint32_t tud_n_cdc_available (uint8_t rhport);
-int tud_n_cdc_read_char (uint8_t rhport);
+int8_t tud_n_cdc_read_char (uint8_t rhport);
uint32_t tud_n_cdc_read (uint8_t rhport, void* buffer, uint32_t bufsize);
uint32_t tud_n_cdc_write_char (uint8_t rhport, char ch);
@@ -67,11 +68,12 @@ bool tud_n_cdc_flush (uint8_t rhport); //--------------------------------------------------------------------+
// APPLICATION API (Single Port)
+// Should be used with MCU supporting only 1 USB port for code simplicity
//--------------------------------------------------------------------+
static inline bool tud_cdc_connected (void) { return tud_n_cdc_connected(0); }
static inline uint32_t tud_cdc_available (void) { return tud_n_cdc_available(0); }
-static inline int tud_cdc_read_char (void) { return tud_n_cdc_read_char(0); }
+static inline int8_t tud_cdc_read_char (void) { return tud_n_cdc_read_char(0); }
static inline uint32_t tud_cdc_read (void* buffer, uint32_t bufsize) { return tud_n_cdc_read(0, buffer, bufsize); }
static inline uint32_t tud_cdc_write_char (char ch) { return tud_n_cdc_write_char(0, ch); }
diff --git a/tinyusb/common/tusb_fifo.c b/tinyusb/common/tusb_fifo.c index 0ba7c39d2..b4bb70b87 100644 --- a/tinyusb/common/tusb_fifo.c +++ b/tinyusb/common/tusb_fifo.c @@ -131,8 +131,8 @@ bool fifo_read(fifo_t* f, void * p_buffer) /******************************************************************************/
uint16_t fifo_read_n (fifo_t* f, void * p_buffer, uint16_t count)
{
- if( !fifo_initalized(f) ) return false;
- if( fifo_empty(f) ) return false;
+ if( !fifo_initalized(f) ) return 0;
+ if( fifo_empty(f) ) return 0;
/* Limit up to fifo's count */
count = min16_of(count, f->count);
|