Fixed incorrect PIPE_EPNUM_MASK mask causing pipe failures on devices with endpoint...

[pub/USBasp.git] / Demos / Host / Incomplete / BluetoothHost / BluetoothHost.c

diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
index 1aaa814..3222b77 100644 (file)
--- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
+++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c
@@ -50,7 +50,6 @@ int main(void)
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 \r

-       /* Startup message */\r

        puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
               "Bluetooth Host Demo running.\r\n" ESC_INVERSE_OFF));\r
                   \r
        puts_P(PSTR(ESC_RESET ESC_BG_WHITE ESC_INVERSE_ON ESC_ERASE_DISPLAY\r
               "Bluetooth Host Demo running.\r\n" ESC_INVERSE_OFF));\r
                   \r


@@ -111,6 +110,7 @@ void EVENT_USB_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode)
 {\r
        puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r
 {\r
        puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));\r
        printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);\r

+       printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);\r

        printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
        printf_P(PSTR(" -- In State %d\r\n"), USB_HostState);\r
        \r
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r


@@ -139,14 +139,11 @@ void Bluetooth_Management_Task(void)
                                LEDs_SetAllLEDs(LEDS_LED1);\r
 \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDS_LED1);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                        puts_P(PSTR("Bluetooth Dongle Detected.\r\n"));\r
                                break;\r
                        }\r
 \r
                        puts_P(PSTR("Bluetooth Dongle Detected.\r\n"));\r

-                               \r
-                       /* Select the control pipe for the request transfer */\r
-                       Pipe_SelectPipe(PIPE_CONTROLPIPE);\r

 \r
                        /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
                        if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r
 \r
                        /* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */\r
                        if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)\r


@@ -158,7 +155,7 @@ void Bluetooth_Management_Task(void)
                                LEDs_SetAllLEDs(LEDS_LED1);\r
 \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDS_LED1);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
                                \r
                                break;\r
                        }\r
                                \r


@@ -181,7 +178,7 @@ void Bluetooth_Management_Task(void)
                                LEDs_SetAllLEDs(LEDS_LED1);\r
 \r
                                /* Wait until USB device disconnected */\r
                                LEDs_SetAllLEDs(LEDS_LED1);\r
 \r
                                /* Wait until USB device disconnected */\r

-                               while (USB_IsConnected);\r
+                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r

                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r


@@ -189,9 +186,5 @@ void Bluetooth_Management_Task(void)
 \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r
 \r
                        USB_HostState = HOST_STATE_Ready;\r
                        break;\r

-               case HOST_STATE_Ready:\r
-                       /* Do nothing, Bluetooth stack will take care of enumeration */\r
-                       \r
-                       break;\r

        }\r
 }\r
        }\r
 }\r