usbd: Request correct buffer permissions when submitting transfers.

projectgus · projectgus · commit a2957c231359 · 2022-10-04T16:43:53.000+11:00
diff --git a/shared/tinyusb/usbd.c b/shared/tinyusb/usbd.c
@@ -89,18 +89,20 @@ STATIC mp_obj_t usbd_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 }
 
 STATIC mp_obj_t usbd_submit_xfer(mp_obj_t self, mp_obj_t ep, mp_obj_t buffer) {
-    bool result;
+    int epnum = mp_obj_get_int(ep);
     mp_obj_usbd_t *usbd = (mp_obj_usbd_t *)MP_OBJ_TO_PTR(self);
     mp_buffer_info_t buf_info = { 0 };
-    if (!usbd_edpt_claim(USBD_RHPORT, mp_obj_get_int(ep))) {
+    bool result;
+
+    if (!usbd_edpt_claim(USBD_RHPORT, epnum)) {
         assert(0); // TODO: raise a runtime error here or something
     }
 
     // TODO: arg checking
 
-    mp_get_buffer_raise(buffer, &buf_info, MP_BUFFER_READ);
+    mp_get_buffer_raise(buffer, &buf_info, epnum & TUSB_DIR_IN_MASK ? MP_BUFFER_READ : MP_BUFFER_RW);
 
-    result = usbd_edpt_xfer(USBD_RHPORT, mp_obj_get_int(ep), buf_info.buf, buf_info.len);
+    result = usbd_edpt_xfer(USBD_RHPORT, epnum, buf_info.buf, buf_info.len);
 
     if (result) {
         // Store the buffer object until the transfer completes
@@ -137,7 +139,8 @@ STATIC mp_obj_t usbd_control_xfer(mp_obj_t self, mp_obj_t request_obj, mp_obj_t
 
     // TODO: What happens if we raise exceptions in TinyUSB callbacks?
     if (buffer != mp_const_none) {
-        mp_get_buffer_raise(buffer, &buf_info, MP_BUFFER_READ);
+        mp_get_buffer_raise(buffer, &buf_info,
+            request.bmRequestType_bit.direction == TUSB_DIR_IN ? MP_BUFFER_READ : MP_BUFFER_RW);
     } else {
         buf_info.buf = NULL;
         buf_info.len = 0;
