projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added Doxygen documentation to the Audio class driver. Added new modules for each...
[pub/USBasp.git]
/
Demos
/
Host
/
GenericHIDHost
/
GenericHIDHost.c
diff --git
a/Demos/Host/GenericHIDHost/GenericHIDHost.c
b/Demos/Host/GenericHIDHost/GenericHIDHost.c
index
5ac4257
..
e731f90
100644
(file)
--- a/
Demos/Host/GenericHIDHost/GenericHIDHost.c
+++ b/
Demos/Host/GenericHIDHost/GenericHIDHost.c
@@
-80,7
+80,7
@@
int main(void)
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
\r
* starts the library USB task to begin the enumeration and USB management process.
\r
*/
\r
/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
\r
* starts the library USB task to begin the enumeration and USB management process.
\r
*/
\r
-
EVENT_HANDLER(USB_DeviceAttache
d)
\r
+
void EVENT_USB_DeviceAttached(voi
d)
\r
{
\r
puts_P(PSTR("Device Attached.\r\n"));
\r
UpdateStatus(Status_USBEnumerating);
\r
{
\r
puts_P(PSTR("Device Attached.\r\n"));
\r
UpdateStatus(Status_USBEnumerating);
\r
@@
-92,7
+92,7
@@
EVENT_HANDLER(USB_DeviceAttached)
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
\r
* stops the library USB task management process.
\r
*/
\r
/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
\r
* stops the library USB task management process.
\r
*/
\r
-
EVENT_HANDLER(USB_DeviceUnattache
d)
\r
+
void EVENT_USB_DeviceUnattached(voi
d)
\r
{
\r
/* Stop HID and USB management task */
\r
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
\r
{
\r
/* Stop HID and USB management task */
\r
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
\r
@@
-105,7
+105,7
@@
EVENT_HANDLER(USB_DeviceUnattached)
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
\r
* enumerated by the host and is now ready to be used by the application.
\r
*/
\r
/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
\r
* enumerated by the host and is now ready to be used by the application.
\r
*/
\r
-
EVENT_HANDLER(USB_DeviceEnumerationComplete
)
\r
+
void EVENT_USB_DeviceEnumerationComplete(void
)
\r
{
\r
/* Start HID Host task */
\r
Scheduler_SetTaskMode(USB_HID_Host, TASK_RUN);
\r
{
\r
/* Start HID Host task */
\r
Scheduler_SetTaskMode(USB_HID_Host, TASK_RUN);
\r
@@
-115,7
+115,7
@@
EVENT_HANDLER(USB_DeviceEnumerationComplete)
}
\r
\r
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
\r
}
\r
\r
/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
\r
-
EVENT_HANDLER(USB_HostError
)
\r
+
void EVENT_USB_HostError(const uint8_t ErrorCode
)
\r
{
\r
USB_ShutDown();
\r
\r
{
\r
USB_ShutDown();
\r
\r
@@
-129,7
+129,7
@@
EVENT_HANDLER(USB_HostError)
/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
\r
* enumerating an attached USB device.
\r
*/
\r
/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
\r
* enumerating an attached USB device.
\r
*/
\r
-
EVENT_HANDLER(USB_DeviceEnumerationFailed
)
\r
+
void EVENT_USB_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode
)
\r
{
\r
puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));
\r
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
\r
{
\r
puts_P(PSTR(ESC_BG_RED "Dev Enum Error\r\n"));
\r
printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
\r
@@
-331,12
+331,6
@@
TASK(USB_HID_Host)
break;
\r
}
\r
\r
break;
\r
}
\r
\r
- #if defined(INTERRUPT_DATA_PIPE)
\r
- /* Select and unfreeze HID data IN pipe */
\r
- Pipe_SelectPipe(HID_DATA_IN_PIPE);
\r
- Pipe_Unfreeze();
\r
- #endif
\r
-
\r
puts_P(PSTR("HID Device Enumerated.\r\n"));
\r
\r
USB_HostState = HOST_STATE_Ready;
\r
puts_P(PSTR("HID Device Enumerated.\r\n"));
\r
\r
USB_HostState = HOST_STATE_Ready;
\r