X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6bda628718f67c04ed43e8328f55bdce5319c504..c0e4f52e8fecf74bc26ba813522aa96300bb844e:/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c?ds=inline

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
index 666879c98..94aca2fef 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -194,9 +194,9 @@ void Keyboard_HID_Task(void)
 			{
 				HID_ReportSizeInfo_t* CurrReportIDInfo = &HIDReportInfo.ReportIDSizes[i];
 				
-				uint8_t ReportSizeInBits      = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_In];
-				uint8_t ReportSizeOutBits     = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Out];
-				uint8_t ReportSizeFeatureBits = CurrReportIDInfo->ReportSizeBits[REPORT_ITEM_TYPE_Feature];
+				uint8_t ReportSizeInBits      = CurrReportIDInfo->ReportSizeBits[HID_REPORT_ITEM_In];
+				uint8_t ReportSizeOutBits     = CurrReportIDInfo->ReportSizeBits[HID_REPORT_ITEM_Out];
+				uint8_t ReportSizeFeatureBits = CurrReportIDInfo->ReportSizeBits[HID_REPORT_ITEM_Feature];
 
 				/* Print out the byte sizes of each report within the device */
 				printf_P(PSTR("  + Report ID %d - In: %d bytes, Out: %d bytes, Feature: %d bytes\r\n"),
@@ -254,13 +254,13 @@ void ProcessKeyboardReport(uint8_t* KeyboardReport)
 		/* Create a temporary item pointer to the next report item */
 		HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];
 
-		/* Check if the current report item is a keyboard scancode */
+		/* Check if the current report item is a keyboard scan-code */
 		if ((ReportItem->Attributes.Usage.Page      == USAGE_PAGE_KEYBOARD) &&
 			(ReportItem->Attributes.BitSize         == 8)                   &&
 			(ReportItem->Attributes.Logical.Maximum > 1)                    &&
-			(ReportItem->ItemType                   == REPORT_ITEM_TYPE_In))
+			(ReportItem->ItemType                   == HID_REPORT_ITEM_In))
 		{
-			/* Retrieve the keyboard scancode from the report data retrieved from the device */
+			/* Retrieve the keyboard scan-code from the report data retrieved from the device */
 			bool FoundData = USB_GetHIDReportItemInfo(KeyboardReport, ReportItem);
 			
 			/* For multi-report devices - if the requested data was not in the issued report, continue */
@@ -270,7 +270,7 @@ void ProcessKeyboardReport(uint8_t* KeyboardReport)
 			/* Key code is an unsigned char in length, cast to the appropriate type */
 			uint8_t KeyCode = (uint8_t)ReportItem->Value;
 
-			/* If scancode is non-zero, a key is being pressed */
+			/* If scan-code is non-zero, a key is being pressed */
 			if (KeyCode)
 			{
 				/* Toggle status LED to indicate keypress */
@@ -278,7 +278,7 @@ void ProcessKeyboardReport(uint8_t* KeyboardReport)
 
 				char PressedKey = 0;
 
-				/* Convert scancode to printable character if alphanumeric */
+				/* Convert scan-code to printable character if alphanumeric */
 				if ((KeyCode >= 0x04) && (KeyCode <= 0x1D))
 				  PressedKey = (KeyCode - 0x04) + 'A';
 				else if ((KeyCode >= 0x1E) && (KeyCode <= 0x27))
@@ -293,7 +293,7 @@ void ProcessKeyboardReport(uint8_t* KeyboardReport)
 				  putchar(PressedKey);
 			}
 			
-			/* Once a scancode is found, stop scanning through the report items */
+			/* Once a scan-code is found, stop scanning through the report items */
 			break;
 		}
 	}