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.

10 files changed, 26 insertions, 43 deletions

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
index 13db6bf74..c27558b9e 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c
@@ -94,18 +94,12 @@ void SetupHardware(void)
 	/* Hardware Initialization */

 	LEDs_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);

 }

 

 /** Event handler for the library USB Connection event. */

 void EVENT_USB_Device_Connect(void)

 {

-	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);	

 }

 

 /** Event handler for the library USB Disconnection event. */

@@ -121,6 +115,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 

 	if (!(HID_Device_ConfigureEndpoints(&Generic_HID_Interface)))

 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+

+	USB_Device_EnableSOFEvents();

 }

 

 /** Event handler for the library USB Unhandled Control Request event. */

@@ -129,8 +125,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	HID_Device_ProcessControlRequest(&Generic_HID_Interface);

 }

 

-/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

-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(&Generic_HID_Interface);

 }

diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
index 8cf0afc5d..004daf54a 100644
--- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h
+++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h
@@ -40,8 +40,6 @@
 		#include <avr/io.h>

 		#include <avr/wdt.h>

 		#include <avr/power.h>

-		#include <avr/interrupt.h>

-		#include <stdbool.h>

 		#include <string.h>

 		

 		#include "Descriptors.h"

@@ -71,6 +69,7 @@
 		void EVENT_USB_Device_Disconnect(void);

 		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);

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.c b/Demos/Device/ClassDriver/Joystick/Joystick.c
index ea85aadde..b18b7ebc8 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.c
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.c
@@ -88,12 +88,6 @@ void SetupHardware(void)
 	LEDs_Init();

 	Buttons_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);

 }

 

 /** Event handler for the library USB Connection event. */

@@ -115,6 +109,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 

 	if (!(HID_Device_ConfigureEndpoints(&Joystick_HID_Interface)))

 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+

+	USB_Device_EnableSOFEvents();

 }

 

 /** Event handler for the library USB Unhandled Control Request event. */

@@ -123,8 +119,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	HID_Device_ProcessControlRequest(&Joystick_HID_Interface);

 }

 

-/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

-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(&Joystick_HID_Interface);

 }

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h
index 493dfa072..d25ccc139 100644
--- a/Demos/Device/ClassDriver/Joystick/Joystick.h
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.h
@@ -82,6 +82,7 @@
 		void EVENT_USB_Device_Disconnect(void);

 		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);

diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
index 6f0bd1d1a..e609d7acb 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c
@@ -89,12 +89,6 @@ void SetupHardware()
 	LEDs_Init();

 	Buttons_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);

 }

 

 /** Event handler for the library USB Connection event. */

@@ -116,6 +110,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 

 	if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))

 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+

+	USB_Device_EnableSOFEvents();

 }

 

 /** Event handler for the library USB Unhandled Control Request event. */

@@ -124,8 +120,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);

 }

 

-/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

-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/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
index 0f7176ce0..ebd83d5c5 100644
--- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h
+++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h
@@ -85,6 +85,7 @@
 		void EVENT_USB_Device_Disconnect(void);

 		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);

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index e21999049..5ac5b8d85 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -112,12 +112,6 @@ void SetupHardware()
 	Joystick_Init();

 	LEDs_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);

 }

 

 /** Event handler for the library USB Connection event. */

@@ -142,6 +136,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 	

 	if (!(HID_Device_ConfigureEndpoints(&Mouse_HID_Interface)))

 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+

+	USB_Device_EnableSOFEvents();

 }

 

 /** Event handler for the library USB Unhandled Control Request event. */

@@ -151,8 +147,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	HID_Device_ProcessControlRequest(&Mouse_HID_Interface);

 }

 

-/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

-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);

 	HID_Device_MillisecondElapsed(&Mouse_HID_Interface);

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
index 297564157..1f47c3e4b 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h
@@ -89,6 +89,7 @@
 		void EVENT_USB_Device_Disconnect(void);

 		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);

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.c b/Demos/Device/ClassDriver/Mouse/Mouse.c
index 32f8ca667..d54aecfaa 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.c
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.c
@@ -88,12 +88,6 @@ void SetupHardware(void)
 	LEDs_Init();

 	Buttons_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);

 }

 

 /** Event handler for the library USB WakeUp event. */

@@ -115,6 +109,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 

 	if (!(HID_Device_ConfigureEndpoints(&Mouse_HID_Interface)))

 	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

+

+	USB_Device_EnableSOFEvents();

 }

 

 /** Event handler for the library USB Unhandled Control Request event. */

@@ -123,8 +119,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 	HID_Device_ProcessControlRequest(&Mouse_HID_Interface);

 }

 

-/** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */

-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(&Mouse_HID_Interface);

 }

diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h
index 05b73c078..325bfc502 100644
--- a/Demos/Device/ClassDriver/Mouse/Mouse.h
+++ b/Demos/Device/ClassDriver/Mouse/Mouse.h
@@ -84,6 +84,7 @@
 		void EVENT_USB_Device_Disconnect(void);

 		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);