usb: Add control proxy interface.

Author: zyp

orbtrace/soc.py

@@ -458,8 +458,19 @@ def add_trace(self):
                 e.bEndpointAddress = 0x80 | ep_num
                 e.wMaxPacketSize   = 512
 
+        # Control proxy interface.
+        proxy_if_num = self.usb_alloc.interface()
+
+        with self.usb_conf_desc.InterfaceDescriptor() as i:
+            i.bInterfaceNumber   = proxy_if_num
+            i.bInterfaceClass    = 0xff
+            i.bInterfaceSubclass = 0x58
+            i.bInterfaceProtocol = 0x00
+
+            i.iInterface = 'Control Proxy'
+
         # Control handler.
-        handler = TraceUSBHandler(if_num)
+        handler = TraceUSBHandler(if_num, proxy_if_num)
 
         self.add_usb_control_handler(handler)
 

orbtrace/trace/usb_handler.py

@@ -3,10 +3,11 @@
 from luna.gateware.usb.usb2.request import USBRequestHandler
 
 class TraceUSBHandler(USBRequestHandler):
-    def __init__(self, if_num):
+    def __init__(self, if_num, proxy_if_num):
         super().__init__()
 
         self.if_num = if_num
+        self.proxy_if_num = proxy_if_num
 
         self.input_format = Signal(8)
 
@@ -41,7 +42,7 @@ def transition(self, m):
         with m.If(self.request_done):
             m.next = 'IDLE'
 
-        targeting_if = (setup.recipient == USBRequestRecipient.INTERFACE) & (setup.index[:8] == self.if_num)
+        targeting_if = (setup.recipient == USBRequestRecipient.INTERFACE) & ((setup.index[:8] == self.if_num) | (setup.index[:8] == self.proxy_if_num))
 
         with m.If(setup.received & targeting_if):
             m.next = 'DISPATCH'

orbtrace_util.py

@@ -33,12 +33,16 @@ def parse_power(value):
 parser_actions.add_argument('--vtref', type = parse_power, help = 'Set VTREF')
 parser_actions.add_argument('--vtpwr', type = parse_power, help = 'Set VTPWR')
 
+parser_options = parser.add_argument_group('Options')
+parser_options.add_argument('--proxy', action = 'store_true', help = 'Use proxy interface')
+
 args = parser.parse_args()
 
 class Orbtrace:
     def __init__(self, device):
         self.trace_if = None
         self.power_if = None
+        self.proxy_if = None
 
         self.read_config(device)
 
@@ -58,11 +62,15 @@ def read_config(self, device):
 
             if setting.getSubClass() == ord('P'):
                 self.power_if = setting.getNumber()
+
+            if setting.getSubClass() == ord('X'):
+                self.proxy_if = setting.getNumber()
 
-    def trace_set_input_format(self, format):
-        assert self.trace_if is not None
+    def trace_set_input_format(self, format, use_proxy = False):
+        if_num = self.proxy_if if use_proxy else self.trace_if
+        assert if_num is not None
 
-        self.handle.controlWrite(0x41, 0x01, input_formats[format], self.trace_if, b'')
+        self.handle.controlWrite(0x41, 0x01, input_formats[format], if_num, b'')
 
     def power_set_enable(self, channel, enable):
         assert self.power_if is not None
@@ -105,7 +113,7 @@ def power_set_voltage(self, channel, voltage):
     orbtrace = Orbtrace(devices[0])
 
     if args.input_format:
-        orbtrace.trace_set_input_format(args.input_format)
+        orbtrace.trace_set_input_format(args.input_format, args.proxy)
 
     if args.vtref:
         if args.vtref in ['off', 'on']: