projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewritten event system to remove all macros, to make user code clearer.
[pub/USBasp.git]
/
Demos
/
Host
/
CDCHost
/
CDCHost.c
diff --git
a/Demos/Host/CDCHost/CDCHost.c
b/Demos/Host/CDCHost/CDCHost.c
index
80d9939
..
b834731
100644
(file)
--- a/
Demos/Host/CDCHost/CDCHost.c
+++ b/
Demos/Host/CDCHost/CDCHost.c
@@
-39,8
+39,8
@@
/* Scheduler Task List */
\r
TASK_LIST
\r
{
\r
/* Scheduler Task List */
\r
TASK_LIST
\r
{
\r
- {
Task: USB_USBTask , TaskStatus:
TASK_STOP },
\r
- {
Task: USB_CDC_Host , TaskStatus:
TASK_STOP },
\r
+ {
.Task = USB_USBTask , .TaskStatus =
TASK_STOP },
\r
+ {
.Task = USB_CDC_Host , .TaskStatus =
TASK_STOP },
\r
};
\r
\r
\r
};
\r
\r
\r
@@
-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 keyboard and USB management task */
\r
Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);
\r
{
\r
/* Stop keyboard 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 CDC Host task */
\r
Scheduler_SetTaskMode(USB_CDC_Host, TASK_RUN);
\r
{
\r
/* Start CDC Host task */
\r
Scheduler_SetTaskMode(USB_CDC_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
@@
-181,13
+181,13
@@
TASK(USB_CDC_Host)
{
\r
case HOST_STATE_Addressed:
\r
/* Standard request to set the device configuration to configuration 1 */
\r
{
\r
case HOST_STATE_Addressed:
\r
/* Standard request to set the device configuration to configuration 1 */
\r
- USB_
HostRequest = (USB_Host
_Request_Header_t)
\r
+ USB_
ControlRequest = (USB
_Request_Header_t)
\r
{
\r
{
\r
-
bmRequestType:
(REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
\r
-
bRequest:
REQ_SetConfiguration,
\r
-
wValue:
1,
\r
-
wIndex:
0,
\r
-
wLength:
0,
\r
+
.bmRequestType =
(REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
\r
+
.bRequest =
REQ_SetConfiguration,
\r
+
.wValue =
1,
\r
+
.wIndex =
0,
\r
+
.wLength =
0,
\r
};
\r
\r
/* Select the control pipe for the request transfer */
\r
};
\r
\r
/* Select the control pipe for the request transfer */
\r
@@
-246,7
+246,7
@@
TASK(USB_CDC_Host)
{
\r
/* Get the length of the pipe data, and create a new buffer to hold it */
\r
uint16_t BufferLength = Pipe_BytesInPipe();
\r
{
\r
/* Get the length of the pipe data, and create a new buffer to hold it */
\r
uint16_t BufferLength = Pipe_BytesInPipe();
\r
- uint8_t Buffer[BufferLength];
\r
+ uint8_t
Buffer[BufferLength];
\r
\r
/* Read in the pipe data to the temporary buffer */
\r
Pipe_Read_Stream_LE(Buffer, BufferLength);
\r
\r
/* Read in the pipe data to the temporary buffer */
\r
Pipe_Read_Stream_LE(Buffer, BufferLength);
\r
@@
-267,7
+267,7
@@
TASK(USB_CDC_Host)
/* Check if a packet has been received */
\r
if (Pipe_IsINReceived())
\r
{
\r
/* Check if a packet has been received */
\r
if (Pipe_IsINReceived())
\r
{
\r
- /* Discard the event notification */
\r
+ /* Discard the
unused
event notification */
\r
Pipe_ClearIN();
\r
}
\r
\r
Pipe_ClearIN();
\r
}
\r
\r
projects / pub / USBasp.git / blobdiff