Make bluetooth SDP code correctly unpack the search UUIDs and parameters.

[pub/USBasp.git] / Projects / XPLAINBridge / XPLAINBridge.h

diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h
index 6b8d2a5..0c3a56c 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -41,10 +41,12 @@
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r
 \r
                #include <avr/wdt.h>\r
                #include <avr/power.h>\r
 \r

-               #include "Descriptors.h"\r
+               #include "AVRISPDescriptors.h"\r
+               #include "USARTDescriptors.h"\r

 \r
                #include "Lib/RingBuff.h"\r
 \r
                #include "Lib/RingBuff.h"\r

-               #include "Lib/SoftUART.h"\r
+               #include "Lib/SoftUART.h"               \r
+               #include <Lib/V2Protocol.h>\r

 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r
 \r
                #include <LUFA/Version.h>\r
                #include <LUFA/Drivers/Board/LEDs.h>\r


@@ -53,23 +55,39 @@
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r
 \r
        /* Macros: */\r
                /** LED mask for the library LED driver, to indicate that the USB interface is not ready. */\r

-               #define LEDMASK_USB_NOTREADY      LEDS_LED1\r
+               #define LEDMASK_USB_NOTREADY     LEDS_LED1\r

 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */\r

-               #define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)\r
+               #define LEDMASK_USB_ENUMERATING  LEDS_LED1\r

 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r
 \r
                /** LED mask for the library LED driver, to indicate that the USB interface is ready. */\r

-               #define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)\r
+               #define LEDMASK_USB_READY        LEDS_NO_LEDS\r

 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r
 \r
                /** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */\r

-               #define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)\r
+               #define LEDMASK_USB_ERROR        LEDS_LED1\r
+               \r
+               /** LED mask for the library LED driver, to indicate that the USB interface is busy. */\r
+               #define LEDMASK_BUSY             LEDS_LED1\r
+\r
+               /** Firmware mode define for the USART Bridge mode. */\r
+               #define MODE_USART_BRIDGE        false\r
+\r
+               /** Firmware mode define for the AVRISP Programmer mode. */\r
+               #define MODE_PDI_PROGRAMMER      true           \r
+\r
+       /* External Variables: */\r
+               extern bool CurrentFirmwareMode;\r

                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r

+               void AVRISP_Task(void);\r
+               void USARTBridge_Task(void);\r

 \r
                void EVENT_USB_Device_ConfigurationChanged(void);\r
                void EVENT_USB_Device_UnhandledControlRequest(void);\r
 \r
                void EVENT_USB_Device_ConfigurationChanged(void);\r
                void EVENT_USB_Device_UnhandledControlRequest(void);\r

-               \r
-               void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);\r
+               void EVENT_USB_Device_Connect(void);\r
+               void EVENT_USB_Device_Disconnect(void);         \r
+\r
+               uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress);\r

 \r
 #endif\r
 \r
 #endif\r