Add start of a SDP service table, which will be linked to the Bluetooth SDP code.

[pub/USBasp.git] / Demos / Host / ClassDriver / KeyboardHostWithParser / KeyboardHostWithParser.c

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index c435157..14b6501 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -115,9 +115,8 @@ int main(void)
                                        break;\r
                                }\r
                                \r
                                        break;\r
                                }\r
                                \r

-                               LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
-\r

                                printf("Keyboard Enumerated.\r\n");\r
                                printf("Keyboard Enumerated.\r\n");\r

+                               LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r
                                USB_HostState = HOST_STATE_Configured;\r
                                break;\r
                        case HOST_STATE_Configured:\r


@@ -130,18 +129,16 @@ int main(void)
                                        {\r
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
 \r
                                        {\r
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];\r
 \r

-                                               /* Check if the current report item is a keyboard scancode */\r
+                                               /* Update the report item value if it is contained within the current report */\r
+                                               if (!(USB_GetHIDReportItemInfo(KeyboardReport, ReportItem)))\r
+                                                 continue;\r
+\r
+                                               /* Determine what report item is being tested, process updated value as needed */\r

                                                if ((ReportItem->Attributes.Usage.Page      == USAGE_PAGE_KEYBOARD) &&\r
                                                        (ReportItem->Attributes.BitSize         == 8)                   &&\r
                                                        (ReportItem->Attributes.Logical.Maximum > 1)                    &&\r
                                                        (ReportItem->ItemType                   == REPORT_ITEM_TYPE_In))\r
                                                {\r
                                                if ((ReportItem->Attributes.Usage.Page      == USAGE_PAGE_KEYBOARD) &&\r
                                                        (ReportItem->Attributes.BitSize         == 8)                   &&\r
                                                        (ReportItem->Attributes.Logical.Maximum > 1)                    &&\r
                                                        (ReportItem->ItemType                   == REPORT_ITEM_TYPE_In))\r
                                                {\r

-                                                       /* Retrieve the keyboard scancode from the report data retrieved from the device if it is\r
-                                                        * contained within the current report, if not, skip to the next item in the parser list\r
-                                                        */\r
-                                                       if (!(USB_GetHIDReportItemInfo(KeyboardReport, ReportItem)))\r
-                                                         continue;\r
-\r

                                                        /* Key code is an unsigned char in length, cast to the appropriate type */\r
                                                        uint8_t KeyCode = (uint8_t)ReportItem->Value;\r
 \r
                                                        /* Key code is an unsigned char in length, cast to the appropriate type */\r
                                                        uint8_t KeyCode = (uint8_t)ReportItem->Value;\r
 \r