usbd: Update to match the latest micropython USBD API.

- No more standalone control_xfer() function, the
  callback can return a buffer directly.

- Combined get_ep_stall() and set_ep_stall() to one
  function.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>

Author: projectgus

micropython/usbd/device.py

@@ -56,9 +56,7 @@ class _USBDevice:
     def __init__(self):
         self._eps = {}  # Mapping from endpoint address to interface object
         self._ep_cbs = {}  # Mapping from endpoint address to Optional[xfer callback]
-        self._itfs = (
-            []
-        )  # List of USBInterfaces (NOTE: each of these may contain >1 USB Interface descriptor)
+        self._itfs = []  # List of USBInterfaces (NOTE: each of these may contain >1 USB Interface descriptor)
         self._desc = Descriptor()
         self.include_static = True  # Include static devices when enumerating?
 
@@ -404,15 +402,13 @@ def _control_xfer_cb(self, stage, request):
             print(f"Unexpected control request type {request[0]:#x}")
             return False
 
-        # Accept the following possible replies from handle_NNN_control_xfer():
+        # Expecting any of the following possible replies from
+        # handle_NNN_control_xfer():
         #
         # True - Continue transfer, no data
         # False - STALL transfer
         # Object with buffer interface - submit this data for the control transfer
-        if isinstance(result, bool):
-            return result
-
-        return self._usbd.control_xfer(request, result)
+        return result
 
 
 class USBInterface:
@@ -609,21 +605,16 @@ def submit_xfer(self, ep_addr, data, done_cb=None):
             raise RuntimeError("Not open")
         _inst._submit_xfer(ep_addr, data, done_cb)
 
-    def set_ep_stall(self, ep_addr, stall):
-        # Set or clear endpoint STALL state, according to the bool "stall" parameter.
+    def stall(self, ep_addr, *args):
+        # Set or get the endpoint STALL state.
         #
-        # Generally endpoint STALL is handled automatically by TinyUSB, but
-        # there are some device classes that need to explicitly stall or unstall
-        # an endpoint under certain conditions.
-        if not self._open or ep_addr not in _inst._eps:
-            raise RuntimeError
-        _inst._usbd.set_ep_stall(ep_addr, stall)
-
-    def get_ep_stall(self, ep_addr):
-        # Get the current endpoint STALL state.
+        # To get endpoint stall stage, call with a single argument.
+        # To set endpoint stall state, call with an additional boolean
+        # argument to set or clear.
         #
-        # Endpoint can be stalled/unstalled by host, TinyUSB stack, or calls to
-        # set_ep_stall().
-        if not self._open or ep_addr not in get_usbdevice()._eps:
+        # Generally endpoint STALL is handled automatically, but there are some
+        # device classes that need to explicitly stall or unstall an endpoint
+        # under certain conditions.
+        if not self._open or ep_addr not in _inst._eps:
             raise RuntimeError
-        return _inst._usbd.get_ep_stall(ep_addr)
+        _inst._usbd.stall(ep_addr, *args)