/*\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
- 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, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
.Config =\r
{\r
.DataINPipeNumber = 1,\r
+ .DataINPipeDoubleBank = false,\r
+\r
.DataOUTPipeNumber = 2,\r
+ .DataOUTPipeDoubleBank = false,\r
\r
.HIDInterfaceProtocol = HID_NON_BOOT_PROTOCOL,\r
\r
\r
\r
/** Main program entry point. This routine configures the hardware required by the application, then\r
- * starts the scheduler to run the application tasks.\r
+ * enters a loop to run the application tasks in sequence.\r
*/\r
int main(void)\r
{\r
uint16_t ConfigDescriptorSize;\r
uint8_t ConfigDescriptorData[512];\r
\r
- if (USB_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
- sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
+ if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,\r
+ sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)\r
{\r
printf("Error Retrieving Configuration Descriptor.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
break;\r
}\r
\r
- if (USB_HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)\r
+ if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)\r
{\r
- printf("Could not Set Report Protocol Mode.\r\n");\r
+ printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n");\r
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
USB_HostState = HOST_STATE_WaitForDeviceRemoval;\r
break;\r
\r
LEDs_SetAllLEDs(LEDS_NO_LEDS);\r
\r
- printf("HID Device Enumerated.\r\n");\r
+ printf("Keyboard Enumerated.\r\n");\r
USB_HostState = HOST_STATE_Configured;\r
break;\r
case HOST_STATE_Configured:\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
- /* 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
* we aren't interested in (preventing us from being able to extract them later on, but saving on the RAM they would\r
* have occupied).\r
*\r
- * \param CurrentItemAttributes Pointer to the attrbutes of the item the HID report parser is currently working with\r
+ * \param[in] CurrentItem Pointer to the item the HID report parser is currently working with\r
*\r
* \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded\r
*/\r
-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_Attributes_t* CurrentItemAttributes)\r
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)\r
{\r
- /* Check the attributes of the current item - see if we are interested in it or not */\r
- if (CurrentItemAttributes->Usage.Page == USAGE_PAGE_KEYBOARD)\r
- {\r
- /* Only store KEYBOARD usage page items into the Processed HID Report structure to save RAM */\r
- return true;\r
- }\r
- else\r
- {\r
- return false;\r
- }\r
+ /* Check the attributes of the current item - see if we are interested in it or not;\r
+ * only store KEYBOARD usage page items into the Processed HID Report structure to\r
+ * save RAM and ignore the rest\r
+ */\r
+ return (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_KEYBOARD);\r
}\r
projects / pub / USBasp.git / blobdiff