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
/
Device
/
CDC
/
CDC.c
diff --git
a/Demos/Device/CDC/CDC.c
b/Demos/Device/CDC/CDC.c
index
6e933d5
..
d7ebb9e
100644
(file)
--- a/
Demos/Device/CDC/CDC.c
+++ b/
Demos/Device/CDC/CDC.c
@@
-36,17
+36,11
@@
\r
#include "CDC.h"
\r
\r
\r
#include "CDC.h"
\r
\r
-/* Project Tags, for reading out using the ButtLoad project */
\r
-BUTTLOADTAG(ProjName, "LUFA CDC App");
\r
-BUTTLOADTAG(BuildTime, __TIME__);
\r
-BUTTLOADTAG(BuildDate, __DATE__);
\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);
\r
-
\r
/* Scheduler Task List */
\r
TASK_LIST
\r
{
\r
/* Scheduler Task List */
\r
TASK_LIST
\r
{
\r
- {
Task: USB_USBTask , TaskStatus:
TASK_STOP },
\r
- {
Task: CDC_Task , TaskStatus:
TASK_STOP },
\r
+ {
.Task = USB_USBTask , .TaskStatus =
TASK_STOP },
\r
+ {
.Task = CDC_Task , .TaskStatus =
TASK_STOP },
\r
};
\r
\r
/* Globals: */
\r
};
\r
\r
/* Globals: */
\r
@@
-56,17
+50,17
@@
TASK_LIST
*
\r
* These values are set by the host via a class-specific request, however they are not required to be used accurately.
\r
* It is possible to completely ignore these value or use other settings as the host is completely unaware of the physical
\r
*
\r
* These values are set by the host via a class-specific request, however they are not required to be used accurately.
\r
* It is possible to completely ignore these value or use other settings as the host is completely unaware of the physical
\r
- * serial link characteristics and instead sends and rec
ie
ves data in endpoint streams.
\r
+ * serial link characteristics and instead sends and rec
ei
ves data in endpoint streams.
\r
*/
\r
*/
\r
-CDC_Line_Coding_t LineCoding = {
BaudRateBPS:
9600,
\r
-
CharFormat:
OneStopBit,
\r
-
ParityType:
Parity_None,
\r
-
DataBits:
8 };
\r
+CDC_Line_Coding_t LineCoding = {
.BaudRateBPS =
9600,
\r
+
.CharFormat =
OneStopBit,
\r
+
.ParityType =
Parity_None,
\r
+
.DataBits =
8 };
\r
\r
/** String to print through the virtual serial port when the joystick is pressed upwards. */
\r
char JoystickUpString[] = "Joystick Up\r\n";
\r
\r
\r
/** String to print through the virtual serial port when the joystick is pressed upwards. */
\r
char JoystickUpString[] = "Joystick Up\r\n";
\r
\r
-/** String to print through the virtual serial port when the joystick is pressed downward
s
. */
\r
+/** String to print through the virtual serial port when the joystick is pressed downward. */
\r
char JoystickDownString[] = "Joystick Down\r\n";
\r
\r
/** String to print through the virtual serial port when the joystick is pressed left. */
\r
char JoystickDownString[] = "Joystick Down\r\n";
\r
\r
/** String to print through the virtual serial port when the joystick is pressed left. */
\r
@@
-110,7
+104,7
@@
int main(void)
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and
\r
* starts the library USB task to begin the enumeration and USB management process.
\r
*/
\r
/** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and
\r
* starts the library USB task to begin the enumeration and USB management process.
\r
*/
\r
-
EVENT_HANDLER(USB_Connect
)
\r
+
void EVENT_USB_Connect(void
)
\r
{
\r
/* Start USB management task */
\r
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
\r
{
\r
/* Start USB management task */
\r
Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);
\r
@@
-122,7
+116,7
@@
EVENT_HANDLER(USB_Connect)
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
\r
* the status LEDs and stops the USB management and CDC management tasks.
\r
*/
\r
/** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
\r
* the status LEDs and stops the USB management and CDC management tasks.
\r
*/
\r
-
EVENT_HANDLER(USB_Disconnect
)
\r
+
void EVENT_USB_Disconnect(void
)
\r
{
\r
/* Stop running CDC and USB management tasks */
\r
Scheduler_SetTaskMode(CDC_Task, TASK_STOP);
\r
{
\r
/* Stop running CDC and USB management tasks */
\r
Scheduler_SetTaskMode(CDC_Task, TASK_STOP);
\r
@@
-135,7
+129,7
@@
EVENT_HANDLER(USB_Disconnect)
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
\r
* of the USB device after enumeration - the device endpoints are configured and the CDC management task started.
\r
*/
\r
/** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
\r
* of the USB device after enumeration - the device endpoints are configured and the CDC management task started.
\r
*/
\r
-
EVENT_HANDLER(USB_ConfigurationChange
d)
\r
+
void EVENT_USB_ConfigurationChanged(voi
d)
\r
{
\r
/* Setup CDC Notification, Rx and Tx Endpoints */
\r
Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,
\r
{
\r
/* Setup CDC Notification, Rx and Tx Endpoints */
\r
Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,
\r
@@
-161,61
+155,55
@@
EVENT_HANDLER(USB_ConfigurationChanged)
* control requests that are not handled internally by the USB library (including the CDC control commands,
\r
* which are all issued via the control endpoint), so that they can be handled appropriately for the application.
\r
*/
\r
* control requests that are not handled internally by the USB library (including the CDC control commands,
\r
* which are all issued via the control endpoint), so that they can be handled appropriately for the application.
\r
*/
\r
-
EVENT_HANDLER(USB_UnhandledControlPacket
)
\r
+
void EVENT_USB_UnhandledControlPacket(void
)
\r
{
\r
uint8_t* LineCodingData = (uint8_t*)&LineCoding;
\r
\r
/* Process CDC specific control requests */
\r
{
\r
uint8_t* LineCodingData = (uint8_t*)&LineCoding;
\r
\r
/* Process CDC specific control requests */
\r
- switch (bRequest)
\r
+ switch (
USB_ControlRequest.
bRequest)
\r
{
\r
case REQ_GetLineEncoding:
\r
{
\r
case REQ_GetLineEncoding:
\r
- if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
\r
+ if (
USB_ControlRequest.
bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
\r
{
\r
/* Acknowledge the SETUP packet, ready for data transfer */
\r
{
\r
/* Acknowledge the SETUP packet, ready for data transfer */
\r
- Endpoint_ClearS
etupReceived
();
\r
+ Endpoint_ClearS
ETUP
();
\r
\r
/* Write the line coding data to the control endpoint */
\r
Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));
\r
\r
/* Finalize the stream transfer to send the last packet or clear the host abort */
\r
\r
/* Write the line coding data to the control endpoint */
\r
Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));
\r
\r
/* Finalize the stream transfer to send the last packet or clear the host abort */
\r
- Endpoint_Clear
Setup
OUT();
\r
+ Endpoint_ClearOUT();
\r
}
\r
\r
break;
\r
case REQ_SetLineEncoding:
\r
}
\r
\r
break;
\r
case REQ_SetLineEncoding:
\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
\r
+ if (
USB_ControlRequest.
bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
\r
{
\r
/* Acknowledge the SETUP packet, ready for data transfer */
\r
{
\r
/* Acknowledge the SETUP packet, ready for data transfer */
\r
- Endpoint_ClearS
etupReceived
();
\r
+ Endpoint_ClearS
ETUP
();
\r
\r
/* Read the line coding data in from the host into the global struct */
\r
Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));
\r
\r
/* Finalize the stream transfer to clear the last packet from the host */
\r
\r
/* Read the line coding data in from the host into the global struct */
\r
Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(CDC_Line_Coding_t));
\r
\r
/* Finalize the stream transfer to clear the last packet from the host */
\r
- Endpoint_Clear
Setup
IN();
\r
+ Endpoint_ClearIN();
\r
}
\r
\r
break;
\r
case REQ_SetControlLineState:
\r
}
\r
\r
break;
\r
case REQ_SetControlLineState:
\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
\r
+ if (
USB_ControlRequest.
bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
\r
{
\r
{
\r
-#if 0
\r
+ /* Acknowledge the SETUP packet, ready for data transfer */
\r
+ Endpoint_ClearSETUP();
\r
+
\r
/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake
\r
/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake
\r
- lines. The mask is read in from the wValue parameter
, and can be masked against the CONTROL_LINE_OUT_* masks
\r
- to determine the RTS and DTR line states using the following code:
\r
+ lines. The mask is read in from the wValue parameter
in USB_ControlRequest, and can be masked against the
\r
+
CONTROL_LINE_OUT_* masks
to determine the RTS and DTR line states using the following code:
\r
*/
\r
*/
\r
-
\r
- uint16_t wIndex = Endpoint_Read_Word_LE();
\r
-
\r
- // Do something with the given line states in wIndex
\r
-#endif
\r
-
\r
- /* Acknowledge the SETUP packet, ready for data transfer */
\r
- Endpoint_ClearSetupReceived();
\r
\r
/* Acknowledge status stage */
\r
\r
/* Acknowledge status stage */
\r
- while (!(Endpoint_Is
Setup
INReady()));
\r
- Endpoint_Clear
Setup
IN();
\r
+ while (!(Endpoint_IsINReady()));
\r
+ Endpoint_ClearIN();
\r
}
\r
\r
break;
\r
}
\r
\r
break;
\r
@@
-262,11
+250,11
@@
TASK(CDC_Task)
*/
\r
USB_Notification_Header_t Notification = (USB_Notification_Header_t)
\r
{
\r
*/
\r
USB_Notification_Header_t Notification = (USB_Notification_Header_t)
\r
{
\r
-
NotificationType:
(REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
\r
-
Notification:
NOTIF_SerialState,
\r
-
wValue:
0,
\r
-
wIndex:
0,
\r
-
wLength:
sizeof(uint16_t),
\r
+
.NotificationType =
(REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
\r
+
.Notification =
NOTIF_SerialState,
\r
+
.wValue =
0,
\r
+
.wIndex =
0,
\r
+
.wLength =
sizeof(uint16_t),
\r
};
\r
\r
uint16_t LineStateMask;
\r
};
\r
\r
uint16_t LineStateMask;
\r
@@
-276,7
+264,7
@@
TASK(CDC_Task)
Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);
\r
Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));
\r
Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));
\r
Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);
\r
Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));
\r
Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));
\r
- Endpoint_Clear
CurrentBank
();
\r
+ Endpoint_Clear
IN
();
\r
#endif
\r
\r
/* Determine if a joystick action has occurred */
\r
#endif
\r
\r
/* Determine if a joystick action has occurred */
\r
@@
-306,14
+294,28
@@
TASK(CDC_Task)
/* Write the String to the Endpoint */
\r
Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));
\r
\r
/* Write the String to the Endpoint */
\r
Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));
\r
\r
+ /* Remember if the packet to send completely fills the endpoint */
\r
+ bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);
\r
+
\r
/* Finalize the stream transfer to send the last packet */
\r
/* Finalize the stream transfer to send the last packet */
\r
- Endpoint_ClearCurrentBank();
\r
+ Endpoint_ClearIN();
\r
+
\r
+ /* If the last packet filled the endpoint, send an empty packet to release the buffer on
\r
+ * the receiver (otherwise all data will be cached until a non-full packet is received) */
\r
+ if (IsFull)
\r
+ {
\r
+ /* Wait until the endpoint is ready for another packet */
\r
+ while (!(Endpoint_IsINReady()));
\r
+
\r
+ /* Send an empty packet to ensure that the host does not buffer data sent to it */
\r
+ Endpoint_ClearIN();
\r
+ }
\r
}
\r
\r
/* Select the Serial Rx Endpoint */
\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);
\r
\r
/* Throw away any received data from the host */
\r
}
\r
\r
/* Select the Serial Rx Endpoint */
\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);
\r
\r
/* Throw away any received data from the host */
\r
- if (Endpoint_
ReadWriteAllow
ed())
\r
- Endpoint_Clear
CurrentBank
();
\r
+ if (Endpoint_
IsOUTReceiv
ed())
\r
+ Endpoint_Clear
OUT
();
\r
}
\r
}
\r
projects / pub / USBasp.git / blobdiff