projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken doxygen reference in last commit.
[pub/USBasp.git]
/
Demos
/
Device
/
USBtoSerial
/
USBtoSerial.c
diff --git
a/Demos/Device/USBtoSerial/USBtoSerial.c
b/Demos/Device/USBtoSerial/USBtoSerial.c
index
1d238aa
..
ef51a6e
100644
(file)
--- a/
Demos/Device/USBtoSerial/USBtoSerial.c
+++ b/
Demos/Device/USBtoSerial/USBtoSerial.c
@@
-33,8
+33,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: 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
@@
-43,10
+43,10
@@
TASK_LIST
* These values are set by the host via a class-specific request, and the physical USART should be reconfigured to match the
\r
* new settings each time they are changed by the host.
\r
*/
\r
* These values are set by the host via a class-specific request, and the physical USART should be reconfigured to match the
\r
* new settings each time they are changed by the host.
\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
/** Ring (circular) buffer to hold the RX data - data from the host to the attached device on the serial port. */
\r
RingBuff_t Rx_Buffer;
\r
\r
/** Ring (circular) buffer to hold the RX data - data from the host to the attached device on the serial port. */
\r
RingBuff_t Rx_Buffer;
\r
@@
-93,7
+93,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
@@
-105,7
+105,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
@@
-122,7
+122,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
@@
-148,38
+148,38
@@
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_Clear
Control
SETUP();
\r
+ Endpoint_ClearSETUP();
\r
\r
/* Write the line coding data to the control endpoint */
\r
Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(LineCoding));
\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(LineCoding));
\r
\r
/* Finalize the stream transfer to send the last packet or clear the host abort */
\r
- Endpoint_Clear
Control
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_Clear
Control
SETUP();
\r
+ Endpoint_ClearSETUP();
\r
\r
/* Read the line coding data in from the host into the global struct */
\r
Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(LineCoding));
\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(LineCoding));
\r
\r
/* Finalize the stream transfer to clear the last packet from the host */
\r
- Endpoint_Clear
Control
IN();
\r
+ Endpoint_ClearIN();
\r
\r
/* Reconfigure the USART with the new settings */
\r
ReconfigureUSART();
\r
\r
/* Reconfigure the USART with the new settings */
\r
ReconfigureUSART();
\r
@@
-187,25
+187,19
@@
EVENT_HANDLER(USB_UnhandledControlPacket)
\r
break;
\r
case REQ_SetControlLineState:
\r
\r
break;
\r
case REQ_SetControlLineState:
\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
\r
- {
\r
-#if 0
\r
+ if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
\r
+ {
\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
\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_ClearControlSETUP();
\r
-
\r
/* Acknowledge status stage */
\r
while (!(Endpoint_IsINReady()));
\r
/* Acknowledge status stage */
\r
while (!(Endpoint_IsINReady()));
\r
- Endpoint_Clear
Control
IN();
\r
+ Endpoint_ClearIN();
\r
}
\r
\r
break;
\r
}
\r
\r
break;
\r
@@
-224,11
+218,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
@@
-244,6
+238,7
@@
TASK(CDC_Task)
/* Select the Serial Rx Endpoint */
\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);
\r
\r
/* Select the Serial Rx Endpoint */
\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);
\r
\r
+ /* Check to see if a packet has been received from the host */
\r
if (Endpoint_IsOUTReceived())
\r
{
\r
/* Read the bytes in from the endpoint into the buffer while space is available */
\r
if (Endpoint_IsOUTReceived())
\r
{
\r
/* Read the bytes in from the endpoint into the buffer while space is available */
\r
projects / pub / USBasp.git / blobdiff