Implement ConfigureDevice() before Init()

Also added clearAllVariables() - see: https://github.com/felis/USB_Host_Shield_2.0/pull/63

BTD.cpp

@@ -34,45 +34,37 @@ qNextPollTime(0), // Reset NextPollTime
 pollInterval(0),
 bPollEnable(false) // Don't start polling before dongle is connected
 {
-        uint8_t i;
+        for (uint8_t i = 0; i < BTD_NUMSERVICES; i++)
-        for (i = 0; i < BTD_MAX_ENDPOINTS; i++) {
-                epInfo[i].epAddr = 0;
-                epInfo[i].maxPktSize = (i) ? 0 : 8;
-                epInfo[i].epAttribs = 0;
-                epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
-        }
-        for (i = 0; i < BTD_NUMSERVICES; i++)
                 btService[i] = NULL;
 
-        if (pUsb) // register in USB subsystem
+        clearAllVariables(); // Set all variables, endpoint structs etc. to default values
-                pUsb->RegisterDeviceClass(this); //set devConfig[] entry
+
+        if (pUsb) // Register in USB subsystem
+                pUsb->RegisterDeviceClass(this); // Set devConfig[] entry
 }
 
-uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
+uint8_t BTD::ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed) {
-        uint8_t buf[sizeof (USB_DEVICE_DESCRIPTOR)];
+        const uint8_t constBufSize = sizeof (USB_DEVICE_DESCRIPTOR);
+        uint8_t buf[constBufSize];
         uint8_t rcode;
         UsbDevice *p = NULL;
         EpInfo *oldep_ptr = NULL;
-        uint8_t num_of_conf; // number of configurations
-        uint16_t PID;
-        uint16_t VID;
 
-        // get memory address of USB device address pool
+        clearAllVariables(); // Set all variables, endpoint structs etc. to default values
-        AddressPool &addrPool = pUsb->GetAddressPool();
+
+        AddressPool &addrPool = pUsb->GetAddressPool(); // Get memory address of USB device address pool
 #ifdef EXTRADEBUG
-        Notify(PSTR("\r\nBTD Init"), 0x80);
+        Notify(PSTR("\r\nBTD ConfigureDevice"), 0x80);
 #endif
-        // check if address has already been assigned to an instance
+
-        if (bAddress) {
+        if (bAddress) { // Check if address has already been assigned to an instance
 #ifdef DEBUG_USB_HOST
                 Notify(PSTR("\r\nAddress in use"), 0x80);
 #endif
                 return USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE;
         }
 
-        // Get pointer to pseudo device with address 0 assigned
+        p = addrPool.GetUsbDevicePtr(0); // Get pointer to pseudo device with address 0 assigned
-        p = addrPool.GetUsbDevicePtr(0);
-
         if (!p) {
 #ifdef DEBUG_USB_HOST
                 Notify(PSTR("\r\nAddress not found"), 0x80);
@@ -87,66 +79,97 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
                 return USB_ERROR_EPINFO_IS_NULL;
         }
 
-        // Save old pointer to EP_RECORD of address 0
+        oldep_ptr = p->epinfo; // Save old pointer to EP_RECORD of address 0
-        oldep_ptr = p->epinfo;
+        p->epinfo = epInfo; // Temporary assign new pointer to epInfo to p->epinfo in order to avoid toggle inconsistence
-
-        // Temporary assign new pointer to epInfo to p->epinfo in order to avoid toggle inconsistence
-        p->epinfo = epInfo;
-
         p->lowspeed = lowspeed;
+        rcode = pUsb->getDevDescr(0, 0, constBufSize, (uint8_t*)buf); // Get device descriptor - addr, ep, nbytes, data
 
-        // Get device descriptor
+        p->epinfo = oldep_ptr; // Restore p->epinfo
-        rcode = pUsb->getDevDescr(0, 0, sizeof (USB_DEVICE_DESCRIPTOR), (uint8_t*)buf); // Get device descriptor - addr, ep, nbytes, data
-
-        // Restore p->epinfo
-        p->epinfo = oldep_ptr;
 
         if (rcode)
                 goto FailGetDevDescr;
 
-        // Allocate new address according to device class
+        bAddress = addrPool.AllocAddress(parent, false, port); // Allocate new address according to device class
-        bAddress = addrPool.AllocAddress(parent, false, port);
 
-        if (!bAddress)
+        if (!bAddress) {
+#ifdef DEBUG_USB_HOST
+                Notify(PSTR("\r\nOut of address space"), 0x80);
+#endif
                 return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL;
+        }
 
-        // Extract Max Packet Size from device descriptor
+        epInfo[0].maxPktSize = (uint8_t)((USB_DEVICE_DESCRIPTOR*)buf)->bMaxPacketSize0; // Extract Max Packet Size from device descriptor
-        epInfo[0].maxPktSize = (uint8_t)((USB_DEVICE_DESCRIPTOR*)buf)->bMaxPacketSize0;
+        epInfo[1].epAddr = ((USB_DEVICE_DESCRIPTOR*)buf)->bNumConfigurations; // Steal and abuse from epInfo structure to save memory
 
-        // Assign new address to the device
+        return USB_ERROR_CONFIG_REQUIRES_ADDITIONAL_RESET;
-        rcode = pUsb->setAddr(0, 0, bAddress);
+
+FailGetDevDescr:
+#ifdef DEBUG_USB_HOST
+        NotifyFailGetDevDescr(rcode);
+#endif
+        rcode = USB_ERROR_FailGetDevDescr;
+        Release();
+        return rcode;
+};
+
+uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
+        uint8_t buf[sizeof (USB_DEVICE_DESCRIPTOR)];
+        uint8_t rcode;
+        uint8_t num_of_conf = epInfo[1].epAddr; // Number of configurations
+        epInfo[1].epAddr = 0;
+        uint16_t PID;
+        uint16_t VID;
+
+        AddressPool &addrPool = pUsb->GetAddressPool();
+#ifdef EXTRADEBUG
+        Notify(PSTR("\r\nBTD Init"), 0x80);
+#endif
+        UsbDevice *p = addrPool.GetUsbDevicePtr(bAddress); // Get pointer to assigned address record
+
+        if (!p) {
+#ifdef DEBUG_USB_HOST
+                Notify(PSTR("\r\nAddress not found"), 0x80);
+#endif
+                return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
+        }
+
+        delay(300); // Assign new address to the device
+
+        rcode = pUsb->setAddr(0, 0, bAddress); // Assign new address to the device
         if (rcode) {
 #ifdef DEBUG_USB_HOST
                 Notify(PSTR("\r\nsetAddr: "), 0x80);
                 D_PrintHex<uint8_t > (rcode, 0x80);
 #endif
+                p->lowspeed = false;
                 goto Fail;
         }
 #ifdef EXTRADEBUG
         Notify(PSTR("\r\nAddr: "), 0x80);
         D_PrintHex<uint8_t > (bAddress, 0x80);
 #endif
-        delay(300); // Spec says you should wait at least 200ms
 
         p->lowspeed = false;
 
-        //get pointer to assigned address record
+        p = addrPool.GetUsbDevicePtr(bAddress); // Get pointer to assigned address record
-        p = addrPool.GetUsbDevicePtr(bAddress);
+        if (!p) {
-        if (!p)
+#ifdef DEBUG_USB_HOST
+                Notify(PSTR("\r\nAddress not found"), 0x80);
+#endif
                 return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL;
+        }
 
         p->lowspeed = lowspeed;
 
-        // Assign epInfo to epinfo pointer - only EP0 is known
+        rcode = pUsb->setEpInfoEntry(bAddress, 1, epInfo); // Assign epInfo to epinfo pointer - only EP0 is known
-        rcode = pUsb->setEpInfoEntry(bAddress, 1, epInfo);
         if (rcode)
                 goto FailSetDevTblEntry;
+
         VID = ((USB_DEVICE_DESCRIPTOR*)buf)->idVendor;
         PID = ((USB_DEVICE_DESCRIPTOR*)buf)->idProduct;
 
         if (VID == PS3_VID && (PID == PS3_PID || PID == PS3NAVIGATION_PID || PID == PS3MOVE_PID)) {
-                /* We only need the Control endpoint, so we don't have to initialize the other endpoints of device */
+                rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, 1); // We only need the Control endpoint, so we don't have to initialize the other endpoints of device
-                rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, 1);
                 if (rcode)
                         goto FailSetConfDescr;
 
@@ -184,8 +207,6 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
                 Release(); // Release device
                 return USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED; // Return
         } else {
-                num_of_conf = ((USB_DEVICE_DESCRIPTOR*)buf)->bNumConfigurations;
-
                 // Check if attached device is a Bluetooth dongle and fill endpoint data structure
                 // First interface in the configuration must have Bluetooth assigned Class/Subclass/Protocol
                 // And 3 endpoints - interrupt-IN, bulk-IN, bulk-OUT, not necessarily in this order
@@ -211,8 +232,6 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
                 if (rcode)
                         goto FailSetDevTblEntry;
 
-                delay(200); // Give time for address change
-
                 // Set Configuration Value
                 rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, bConfNum);
                 if (rcode)
@@ -270,6 +289,28 @@ Fail:
         return rcode;
 }
 
+void BTD::clearAllVariables() {
+        uint8_t i;
+        for (i = 0; i < BTD_MAX_ENDPOINTS; i++) {
+                epInfo[i].epAddr = 0;
+                epInfo[i].maxPktSize = (i) ? 0 : 8;
+                epInfo[i].epAttribs = 0;
+                epInfo[i].bmNakPower = (i) ? USB_NAK_NOWAIT : USB_NAK_MAX_POWER;
+        }
+        for (i = 0; i < BTD_NUMSERVICES; i++) {
+                if (btService[i])
+                        btService[i]->Reset(); // Reset all Bluetooth services
+        }
+
+        connectToWii = false;
+        pairWithWii = false;
+        bAddress = 0; // Clear device address
+        bNumEP = 1; // Must have to be reset to 1
+        qNextPollTime = 0; // Reset next poll time
+        pollInterval = 0;
+        bPollEnable = false; // Don't start polling before dongle is connected
+}
+
 /* Extracts interrupt-IN, bulk-IN, bulk-OUT endpoint information from config descriptor */
 void BTD::EndpointXtract(uint8_t conf, uint8_t iface, uint8_t alt, uint8_t proto, const USB_ENDPOINT_DESCRIPTOR *pep) {
         //ErrorMessage<uint8_t>(PSTR("Conf.Val"),conf);
@@ -323,15 +364,8 @@ void BTD::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr) {
 
 /* Performs a cleanup after failed Init() attempt */
 uint8_t BTD::Release() {
-        for (uint8_t i = 0; i < BTD_NUMSERVICES; i++) {
+        clearAllVariables(); // Set all variables, endpoint structs etc. to default values
-                if (btService[i])
-                        btService[i]->Reset(); // Reset all Bluetooth services
-        }
-
         pUsb->GetAddressPool().FreeAddress(bAddress);
-        bAddress = 0;
-        bPollEnable = false;
-        bNumEP = 1; // must have to be reset to 1
         return 0;
 }
 
@@ -780,6 +814,10 @@ void BTD::HCI_task() {
                                 for (uint8_t i = 0; i < BULK_MAXPKTSIZE; i++)
                                         l2capinbuf[i] = 0;
 
+                                connectToWii = false;
+                                incomingWii = false;
+                                pairWithWii = false;
+
                                 hci_state = HCI_SCANNING_STATE;
                         }
                         break;

BTD.h

@@ -162,6 +162,14 @@ public:
         BTD(USB *p);
 
         /** @name USBDeviceConfig implementation */
+        /**
+         * Address assignment and basic initilization is done here.
+         * @param  parent   Hub number.
+         * @param  port     Port number on the hub.
+         * @param  lowspeed Speed of the device.
+         * @return          0 on success.
+         */
+        virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed);
         /**
          * Initialize the Bluetooth dongle.
          * @param  parent   Hub number.
@@ -455,6 +463,7 @@ protected:
         void PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR* ep_ptr);
 
 private:
+        void clearAllVariables(); // Set all variables, endpoint structs etc. to default values
         BluetoothService* btService[BTD_NUMSERVICES];
 
         bool bPollEnable;