shared/tinyusb: Add USBD_CDC class to access usb serial port.

Signed-off-by: Andrew Leech <[email protected]>

Author: pi-anl

shared/tinyusb/mp_usbd.h

@@ -34,6 +34,7 @@
 #include "py/obj.h"
 #include "py/objarray.h"
 #include "py/runtime.h"
+#include "mp_usbd_cdc.h"
 
 #ifndef NO_QSTR
 #include "tusb.h"

shared/tinyusb/mp_usbd_cdc.c

@@ -38,6 +38,12 @@ static uint8_t cdc_itf_pending; // keep track of cdc interfaces which need atten
 static int8_t cdc_connected_flush_delay = 0;
 static void usbd_cdc_rx_event_callback(void);
 
+// Constants for USBD_CDC.irq trigger.
+#define USBD_CDC_IRQ_RX (1)
+
+#ifndef UNUSED
+#define UNUSED(X) (void)X      /* To avoid gcc/g++ warnings */
+#endif
 
 uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags) {
     uintptr_t ret = 0;
@@ -70,7 +76,7 @@ uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags) {
     return ret;
 }
 
-mp_uint_t mp_usbd_cdc_rx_strn(const char *buf, mp_uint_t len) {
+mp_uint_t mp_usbd_cdc_rx_strn(char *buf, mp_uint_t len) {
     return tud_cdc_read(buf, len);
 }
 
@@ -229,6 +235,7 @@ const machine_usbd_cdc_obj_t machine_usbd_cdc_obj = {{&machine_usbd_cdc_type}};/
 
 
 static bool machine_usbd_cdc_irq_scheduled;// [MICROPY_HW_USB_CDC_NUM];
+static void machine_usbd_cdc_attach_to_repl(const machine_usbd_cdc_obj_t *self, bool attached);
 
 void machine_usbd_cdc_init0(void) {
     // for (size_t i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
@@ -241,17 +248,17 @@ void machine_usbd_cdc_init0(void) {
     // Activate USB_CDC(0) on dupterm slot 1 for the REPL
     // todo auto detect appropriate slot
     MP_STATE_VM(dupterm_objs[1]) = MP_OBJ_FROM_PTR(&machine_usbd_cdc_obj);
-    usb_vcp_attach_to_repl(&machine_usbd_cdc_obj, true);
+    machine_usbd_cdc_attach_to_repl(&machine_usbd_cdc_obj, true);
     #endif
 
 }
 
 static mp_obj_t machine_usbd_cdc_irq_run(mp_obj_t self_in) {
-    machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    // machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     // uint8_t idx = self->cdc_idx;
     mp_obj_t callback = MP_STATE_PORT(machine_usbd_cdc_irq);
     machine_usbd_cdc_irq_scheduled = false;
-    if (callback != mp_const_none && usbd_cdc_rx_num(self)) {
+    if (callback != mp_const_none && tud_cdc_available()) {
         mp_call_function_1(callback, self_in);
     }
     return mp_const_none;
@@ -268,11 +275,12 @@ void usbd_cdc_rx_event_callback(void) {
 }
 
 static void machine_usbd_cdc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    int id = ((machine_usbd_cdc_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf->cdc_idx;
-    mp_printf(print, "USBD_CDC(%u)", id);
+    // int id = ((machine_usbd_cdc_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf->cdc_idx;
+    mp_printf(print, "USBD_CDC()");
 }
 
-void machine_usbd_cdc_attach_to_repl(const machine_usbd_cdc_obj_t *self, bool attached) {
+static void machine_usbd_cdc_attach_to_repl(const machine_usbd_cdc_obj_t *self, bool attached) {
+    UNUSED(self);
     // self->attached_to_repl = attached;
     if (attached) {
         // Default behavior is non-blocking when attached to repl
@@ -322,7 +330,7 @@ static mp_obj_t machine_usbd_cdc_init(size_t n_args, const mp_obj_t *pos_args, m
 
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    // machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // flow control
@@ -430,7 +438,7 @@ static mp_obj_t machine_usbd_cdc_irq(size_t n_args, const mp_obj_t *pos_args, mp
         { MP_QSTR_trigger, MP_ARG_INT, {.u_int = USBD_CDC_IRQ_RX} },
         { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
     };
-    machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    // machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
@@ -481,17 +489,17 @@ static const mp_rom_map_elem_t machine_usbd_cdc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&mp_stream___exit___obj) },
 
     // class constants
-    { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_RTS) },
-    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_CTS) },
+    // { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_RTS) },
+    // { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_CTS) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(USBD_CDC_IRQ_RX) },
 };
 
 static MP_DEFINE_CONST_DICT(machine_usbd_cdc_locals_dict, machine_usbd_cdc_locals_dict_table);
 
 static mp_uint_t machine_usbd_cdc_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     UNUSED(self_in);
-    machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    int ret = mp_usbd_cdc_rx_strn((byte *)buf, size);
+    // machine_usbd_cdc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    int ret = mp_usbd_cdc_rx_strn((char *)buf, size);
     if (ret == 0) {
         // return EAGAIN error to indicate non-blocking
         *errcode = MP_EAGAIN;
@@ -520,7 +528,7 @@ static mp_uint_t machine_usbd_cdc_ioctl(mp_obj_t self_in, mp_uint_t request, uin
     } else if (request == MP_STREAM_CLOSE) {
         ret = 0;
     } else if (request == MP_STREAM_REPL_ATTACHED) {
-        machine_usbd_cdc_attach_to_repl(arg);
+        machine_usbd_cdc_attach_to_repl(self, arg);
         ret = 0;
     } else {
         *errcode = MP_EINVAL;

shared/tinyusb/mp_usbd_cdc.h

@@ -46,6 +46,6 @@ extern const mp_obj_type_t machine_usbd_cdc_type;
 uintptr_t mp_usbd_cdc_poll_interfaces(uintptr_t poll_flags);
 // void tud_cdc_rx_cb(uint8_t itf);
 mp_uint_t mp_usbd_cdc_tx_strn(const char *str, mp_uint_t len);
-mp_uint_t mp_usbd_cdc_rx_strn(const char *buf, mp_uint_t len);
+mp_uint_t mp_usbd_cdc_rx_strn(char *buf, mp_uint_t len);
 
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_CDC_H