From b71ff7c8cd68209a74c8690f4d190cc634ef8fb3 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Sun, 16 Aug 2009 08:51:54 +0000 Subject: Added new EVENT_USB_Device_StartOfFrame() event, controlled by the new USB_Device_EnableSOFEvents() and USB_Device_DisableSOFEvents() macros to give bus-synchronised millisecond interrupts when in USB device mode. --- Projects/Magstripe/Magstripe.c | 12 ++++-------- Projects/Magstripe/Magstripe.h | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'Projects/Magstripe') diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 5be34492a..3ea505296 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -99,12 +99,6 @@ void SetupHardware(void) /* Hardware Initialization */ Magstripe_Init(); USB_Init(); - - /* Millisecond timer initialization, with output compare interrupt enabled for the idle timing */ - OCR0A = ((F_CPU / 64) / 1000); - TCCR0A = (1 << WGM01); - TCCR0B = ((1 << CS01) | (1 << CS00)); - TIMSK0 = (1 << OCIE0A); } /** Determines if a card has been inserted, and if so reads in each track's contents into the bit buffers @@ -148,6 +142,8 @@ void ReadMagstripeData(void) void EVENT_USB_Device_ConfigurationChanged(void) { HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface); + + USB_Device_EnableSOFEvents(); } /** Event handler for the library USB Unhandled Control Packet event. */ @@ -156,8 +152,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void) HID_Device_ProcessControlRequest(&Keyboard_HID_Interface); } -/** Timer 0 CTC ISR, firing once each millisecond to keep track of elapsed idle time in the HID interface. */ -ISR(TIMER0_COMPA_vect, ISR_BLOCK) +/** Event handler for the USB device Start Of Frame event. */ +void EVENT_USB_Device_StartOfFrame(void) { HID_Device_MillisecondElapsed(&Keyboard_HID_Interface); } diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index 7cbda8302..aabf6ac91 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -84,6 +84,7 @@ void EVENT_USB_Device_ConfigurationChanged(void); void EVENT_USB_Device_UnhandledControlRequest(void); + void EVENT_USB_Device_StartOfFrame(void); bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData, uint16_t* ReportSize); -- cgit v1.2.3