Flash bridge descriptor updates

apollo_fpga/gateware/advertiser.py

@@ -1,5 +1,5 @@
 #
-# This file is part of LUNA.
+# This file is part of Apollo.
 #
 # Copyright (c) 2023 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
@@ -64,6 +64,10 @@ class ApolloAdvertiserRequestHandler(USBRequestHandler):
 
     Implements default vendor requests related to ApolloAdvertiser.
     """
+
+    """ The bInterfaceProtocol version supported by this request handler. """
+    PROTOCOL_VERSION = 0x00
+
     REQUEST_APOLLO_ADV_STOP = 0xF0
 
     def __init__(self, if_number, stop_pin):

apollo_fpga/gateware/flash_bridge.py

@@ -1,5 +1,5 @@
 #
-# This file is part of LUNA.
+# This file is part of Apollo.
 #
 # Copyright (c) 2023 Great Scott Gadgets <[email protected]>
 # SPDX-License-Identifier: BSD-3-Clause
@@ -18,6 +18,8 @@
 from usb_protocol.types               import USBRequestType, USBRequestRecipient
 from usb_protocol.emitters            import DeviceDescriptorCollection
 
+from .advertiser                      import ApolloAdvertiser, ApolloAdvertiserRequestHandler
+
 VENDOR_ID  = 0x1209
 PRODUCT_ID = 0x000F
 
@@ -255,9 +257,8 @@ def create_descriptors(self, sharing):
             d.idVendor           = VENDOR_ID
             d.idProduct          = PRODUCT_ID
 
-            d.iManufacturer      = "LUNA"
-            d.iProduct           = "Configuration Flash bridge"
-            d.iSerialNumber      = "no serial"
+            d.iManufacturer      = "Apollo Project"
+            d.iProduct           = "Configuration Flash Bridge"
 
             d.bNumConfigurations = 1
 
@@ -268,6 +269,7 @@ def create_descriptors(self, sharing):
                 i.bInterfaceNumber = 0
                 i.bInterfaceClass = 0xFF
                 i.bInterfaceSubclass = 0x01
+                i.bInterfaceProtocol = 0x00
 
                 with i.EndpointDescriptor() as e:
                     e.bEndpointAddress = BULK_ENDPOINT_NUMBER
@@ -283,6 +285,7 @@ def create_descriptors(self, sharing):
                     i.bInterfaceNumber = 1
                     i.bInterfaceClass = 0xFF
                     i.bInterfaceSubclass = 0x00
+                    i.bInterfaceProtocol = ApolloAdvertiserRequestHandler.PROTOCOL_VERSION
 
         return descriptors
 
@@ -298,7 +301,7 @@ def elaborate(self, platform):
         m.submodules.usb = usb = USBDevice(bus=ulpi)
 
         # Check how the port is shared with Apollo.
-        sharing = platform.apollo_port_sharing(phy_name)
+        sharing = platform.port_sharing(phy_name)
 
         # Add our standard control endpoint to the device.
         descriptors = self.create_descriptors(sharing)