From 4530a546a16b48fdc34c20102bb72c3968487f4e Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 21 Sep 2009 06:46:39 +0000 Subject: [PATCH] Fix broken MagStripe demo due to the HID Class driver changes. --- Projects/Magstripe/Magstripe.c | 6 +++--- Projects/Magstripe/Magstripe.h | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 3ea5052969..7b3f0be39a 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -180,18 +180,18 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn if ((IsKeyReleaseReport) || (CurrentTrackBuffer == &TrackDataBuffers[TOTAL_TRACKS])) { /* No more data to send, or key release report between key presses */ - KeyboardReport->KeyCode = KEY_NONE; + KeyboardReport->KeyCode[0] = KEY_NONE; } else if (!(CurrentTrackBuffer->Elements)) { /* End of current track, send an enter press and change to the next track's buffer */ - KeyboardReport->KeyCode = KEY_ENTER; + KeyboardReport->KeyCode[0] = KEY_ENTER; CurrentTrackBuffer++; } else { /* Still data in the current track; convert next bit to a 1 or 0 keypress */ - KeyboardReport->KeyCode = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0; + KeyboardReport->KeyCode[0] = BitBuffer_GetNextBit(CurrentTrackBuffer) ? KEY_1 : KEY_0; } *ReportSize = sizeof(USB_KeyboardReport_Data_t); diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index aabf6ac91f..36e4d7091a 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -65,18 +65,6 @@ /** HID keyboard keycode to indicate that the enter key is currently pressed. */ #define KEY_ENTER 40 - - /* Type Defines: */ - /** Type define for the keyboard report structure. This structure matches the report layout - * given to the host in the HID Report descriptor, as well as matches the boot protocol report - * structure. This means that this one report structure can be used in both Report and Boot Protocol - * modes. */ - typedef struct - { - uint8_t Modifier; /**< Modifier byte, indicating pressed modifier keys such as CTRL or ALT */ - uint8_t Reserved; /**< Reserved for OEM use, always set to 0 */ - uint8_t KeyCode; /**< Key code array for pressed keys - up to six can be given simultaneously */ - } USB_KeyboardReport_Data_t; /* Function Prototypes: */ void SetupHardware(void);