ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed new Start of Frame event from the library; performance suffered far too much and it was only useful in one of the standard classes (HID). Altered HID demos to use the previous method of tracking millisecond periods via a hardware timer rather than the SOF events.

Browse source 
Fixed MIDI class driver blocking on unread events to the host.
This commit is contained in:
Dean Camera 2009-06-02 10:54:32 +00:00
parent 74b7c07e96
commit 7c5444b89a
24 changed files with 78 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Demos/Device/CDC/CDC.h
View file

@ -64,6 +64,5 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
#endif

3
Demos/Device/DualCDC/DualCDC.h
View file

@ -64,6 +64,5 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
#endif

13
Demos/Device/GenericHID/GenericHID.c
View file

@ -40,7 +40,7 @@ USB_ClassInfo_HID_t Generic_HID_Interface =
.ReportOUTEndpointNumber = GENERIC_OUT_EPNUM,
.ReportOUTEndpointSize = GENERIC_EPSIZE,
.ReportBufferSize = GENERIC_REPORT_SIZE,
.ReportINBufferSize = GENERIC_REPORT_SIZE,
.UsingReportProtocol = true,
};
@ -70,6 +70,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);
}
void EVENT_USB_Connect(void)
@ -95,9 +101,10 @@ void EVENT_USB_UnhandledControlPacket(void)
USB_HID_ProcessControlPacket(&Generic_HID_Interface);
}
void EVENT_USB_StartOfFrame(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{
USB_HID_RegisterStartOfFrame(&Generic_HID_Interface);
if (Generic_HID_Interface.IdleMSRemaining)
Generic_HID_Interface.IdleMSRemaining--;
}
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)

1
Demos/Device/GenericHID/GenericHID.h
View file

@ -64,7 +64,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);
void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,

13
Demos/Device/Joystick/Joystick.c
View file

@ -37,7 +37,7 @@ USB_ClassInfo_HID_t Joystick_HID_Interface =
.ReportINEndpointNumber = JOYSTICK_EPNUM,
.ReportINEndpointSize = JOYSTICK_EPSIZE,
.ReportBufferSize = sizeof(USB_JoystickReport_Data_t),
.ReportINBufferSize = sizeof(USB_JoystickReport_Data_t),
.UsingReportProtocol = true,
};
@ -69,6 +69,12 @@ 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);
}
void EVENT_USB_Connect(void)
@ -94,9 +100,10 @@ void EVENT_USB_UnhandledControlPacket(void)
USB_HID_ProcessControlPacket(&Joystick_HID_Interface);
}
void EVENT_USB_StartOfFrame(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{
USB_HID_RegisterStartOfFrame(&Joystick_HID_Interface);
if (Joystick_HID_Interface.IdleMSRemaining)
Joystick_HID_Interface.IdleMSRemaining--;
}
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)

1
Demos/Device/Joystick/Joystick.h
View file

@ -75,7 +75,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);
void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,

13
Demos/Device/Keyboard/Keyboard.c
View file

@ -41,7 +41,7 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface =
.ReportOUTEndpointNumber = KEYBOARD_LEDS_EPNUM,
.ReportOUTEndpointSize = KEYBOARD_EPSIZE,
.ReportBufferSize = sizeof(USB_KeyboardReport_Data_t),
.ReportINBufferSize = sizeof(USB_KeyboardReport_Data_t),
.IdleCount = 500,
};
@ -73,6 +73,12 @@ 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);
}
void EVENT_USB_Connect(void)
@ -98,9 +104,10 @@ void EVENT_USB_UnhandledControlPacket(void)
USB_HID_ProcessControlPacket(&Keyboard_HID_Interface);
}
void EVENT_USB_StartOfFrame(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{
USB_HID_RegisterStartOfFrame(&Keyboard_HID_Interface);
if (Keyboard_HID_Interface.IdleMSRemaining)
Keyboard_HID_Interface.IdleMSRemaining--;
}
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)

1
Demos/Device/Keyboard/Keyboard.h
View file

@ -78,7 +78,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);
void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,

21
Demos/Device/KeyboardMouse/KeyboardMouse.c
View file

@ -41,7 +41,7 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface =
.ReportOUTEndpointNumber = KEYBOARD_OUT_EPNUM,
.ReportOUTEndpointSize = HID_EPSIZE,
.ReportBufferSize = sizeof(USB_KeyboardReport_Data_t),
.ReportINBufferSize = sizeof(USB_KeyboardReport_Data_t),
.IdleCount = 500,
};
@ -53,7 +53,7 @@ USB_ClassInfo_HID_t Mouse_HID_Interface =
.ReportINEndpointNumber = MOUSE_IN_EPNUM,
.ReportINEndpointSize = HID_EPSIZE,
.ReportBufferSize = sizeof(USB_MouseReport_Data_t),
.ReportINBufferSize = sizeof(USB_MouseReport_Data_t),
.ReportOUTEndpointNumber = 0,
.ReportOUTEndpointSize = 0,
@ -85,7 +85,13 @@ void SetupHardware()
/* Hardware Initialization */
Joystick_Init();
LEDs_Init();
USB_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);
}
void EVENT_USB_Connect(void)
@ -115,10 +121,13 @@ void EVENT_USB_UnhandledControlPacket(void)
USB_HID_ProcessControlPacket(&Mouse_HID_Interface);
}
void EVENT_USB_StartOfFrame(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{
USB_HID_RegisterStartOfFrame(&Keyboard_HID_Interface);
USB_HID_RegisterStartOfFrame(&Mouse_HID_Interface);
if (Keyboard_HID_Interface.IdleMSRemaining)
Keyboard_HID_Interface.IdleMSRemaining--;
if (Mouse_HID_Interface.IdleMSRemaining)
Mouse_HID_Interface.IdleMSRemaining--;
}
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)

1
Demos/Device/KeyboardMouse/KeyboardMouse.h
View file

@ -82,7 +82,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);
void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,

13
Demos/Device/Mouse/Mouse.c
View file

@ -37,7 +37,7 @@ USB_ClassInfo_HID_t Mouse_HID_Interface =
.ReportINEndpointNumber = MOUSE_EPNUM,
.ReportINEndpointSize = MOUSE_EPSIZE,
.ReportBufferSize = sizeof(USB_MouseReport_Data_t),
.ReportINBufferSize = sizeof(USB_MouseReport_Data_t),
};
int main(void)
@ -67,6 +67,12 @@ 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);
}
void EVENT_USB_Connect(void)
@ -92,9 +98,10 @@ void EVENT_USB_UnhandledControlPacket(void)
USB_HID_ProcessControlPacket(&Mouse_HID_Interface);
}
void EVENT_USB_StartOfFrame(void)
ISR(TIMER0_COMPA_vect, ISR_BLOCK)
{
USB_HID_RegisterStartOfFrame(&Mouse_HID_Interface);
if (Mouse_HID_Interface.IdleMSRemaining)
Mouse_HID_Interface.IdleMSRemaining--;
}
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData)

1
Demos/Device/Mouse/Mouse.h
View file

@ -77,7 +77,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
uint16_t CALLBACK_USB_HID_CreateNextHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, void* ReportData);
void CALLBACK_USB_HID_ProcessReceivedHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo,

1
Demos/Device/RNDISEthernet/RNDISEthernet.h
View file

@ -71,7 +71,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
void CALLBACK_USB_RNDIS_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_t* RNDISInterfaceInfo);

1
Demos/Device/USBtoSerial/USBtoSerial.h
View file

@ -66,7 +66,6 @@
void EVENT_USB_Disconnect(void);
void EVENT_USB_ConfigurationChanged(void);
void EVENT_USB_UnhandledControlPacket(void);
void EVENT_USB_StartOfFrame(void);
void EVENT_USB_CDC_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo);