diff options
| author | hathach <[email protected]> | 2018-03-11 19:37:21 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-11 19:37:21 +0700 |
| commit | 08ea1c35cbc42fcf47c815a7ed1f9e35e9b74bf4 (patch) | |
| tree | f127ba312e92828119057d0793902eddb9b87563 /tinyusb/class | |
| parent | a55fcece4cc58461da401c720ce652c8a8c810aa (diff) | |
create new name for multiple port API, to simplify API
Diffstat (limited to 'tinyusb/class')
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.c | 14 | ||||
| -rw-r--r-- | tinyusb/class/cdc/cdc_device.h | 46 |
2 files changed, 46 insertions, 14 deletions
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c index 056b9147c..557c1ed0d 100644 --- a/tinyusb/class/cdc/cdc_device.c +++ b/tinyusb/class/cdc/cdc_device.c @@ -76,33 +76,33 @@ STATIC_VAR cdcd_data_t cdcd_data[CONTROLLER_DEVICE_NUMBER]; //--------------------------------------------------------------------+
// APPLICATION API
//--------------------------------------------------------------------+
-bool tud_cdc_connected(uint8_t port)
+bool tud_n_cdc_connected(uint8_t port)
{
return cdcd_data[port].connected;
}
-uint32_t tud_cdc_available(uint8_t port)
+uint32_t tud_n_cdc_available(uint8_t port)
{
return fifo_count(&_rx_ff);
}
-int tud_cdc_read_char(uint8_t port)
+int tud_n_cdc_read_char(uint8_t port)
{
uint8_t ch;
return fifo_read(&_rx_ff, &ch) ? ch : (-1);
}
-uint32_t tud_cdc_read(uint8_t port, void* buffer, uint32_t bufsize)
+uint32_t tud_n_cdc_read(uint8_t port, void* buffer, uint32_t bufsize)
{
return fifo_read_n(&_rx_ff, buffer, bufsize);
}
-uint32_t tud_cdc_write_char(uint8_t port, char ch)
+uint32_t tud_n_cdc_write_char(uint8_t port, char ch)
{
return fifo_write(&_tx_ff, &ch);
}
-uint32_t tud_cdc_write(uint8_t port, void const* buffer, uint32_t bufsize)
+uint32_t tud_n_cdc_write(uint8_t port, void const* buffer, uint32_t bufsize)
{
return fifo_write_n(&_tx_ff, buffer, bufsize);
}
@@ -280,7 +280,7 @@ tusb_error_t cdcd_xfer_cb(uint8_t port, uint8_t edpt_addr, tusb_event_t event, u void cdcd_sof(uint8_t port)
{
- if ( !tud_cdc_connected(port) ) return;
+ if ( !tud_n_cdc_connected(port) ) return;
uint8_t edpt = cdcd_data[port].edpt_addr[CDC_PIPE_DATA_IN];
diff --git a/tinyusb/class/cdc/cdc_device.h b/tinyusb/class/cdc/cdc_device.h index db1ef04bb..13862a53a 100644 --- a/tinyusb/class/cdc/cdc_device.h +++ b/tinyusb/class/cdc/cdc_device.h @@ -53,17 +53,49 @@ * @{ */
//--------------------------------------------------------------------+
-// APPLICATION API
+// APPLICATION API (Multiple Ports)
//--------------------------------------------------------------------+
-bool tud_cdc_connected(uint8_t port);
-uint32_t tud_cdc_available(uint8_t port);
+bool tud_n_cdc_connected(uint8_t port);
+uint32_t tud_n_cdc_available(uint8_t port);
-int tud_cdc_read_char(uint8_t port);
-uint32_t tud_cdc_read(uint8_t port, void* buffer, uint32_t bufsize);
+int tud_n_cdc_read_char(uint8_t port);
+uint32_t tud_n_cdc_read(uint8_t port, void* buffer, uint32_t bufsize);
-uint32_t tud_cdc_write_char(uint8_t port, char ch);
-uint32_t tud_cdc_write(uint8_t port, void const* buffer, uint32_t bufsize);
+uint32_t tud_n_cdc_write_char(uint8_t port, char ch);
+uint32_t tud_n_cdc_write(uint8_t port, void const* buffer, uint32_t bufsize);
+//--------------------------------------------------------------------+
+// APPLICATION API (Single Port)
+//--------------------------------------------------------------------+
+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 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);
+}
+
+static inline uint32_t tud_cdc_write(void const* buffer, uint32_t bufsize)
+{
+ return tud_n_cdc_write(0, buffer, bufsize);
+}
//--------------------------------------------------------------------+
// APPLICATION CALLBACK API
|