Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
- www.fourwalledcubicle.com\r
+ www.lufa-lib.org\r
*/\r
\r
/*\r
*/\r
void EVENT_USB_Device_ConfigurationChanged(void)\r
{\r
- LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
-\r
- /* Setup TMC In and Out Endpoints */\r
- if (!(Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK,\r
- ENDPOINT_DIR_IN, TMC_IO_EPSIZE,\r
- ENDPOINT_BANK_SINGLE)))\r
- {\r
- LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
- }\r
-\r
- if (!(Endpoint_ConfigureEndpoint(TMC_OUT_EPNUM, EP_TYPE_BULK,\r
- ENDPOINT_DIR_OUT, TMC_IO_EPSIZE,\r
- ENDPOINT_BANK_SINGLE)))\r
- {\r
- LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
- }\r
+ bool ConfigSuccess = true;\r
+\r
+ /* Setup TMC In, Out and Notification Endpoints */\r
+ ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,\r
+ TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE);\r
+ ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN,\r
+ TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE);\r
+ ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,\r
+ TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE);\r
+\r
+ /* Indicate endpoint configuration success or failure */\r
+ LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);\r
}\r
\r
-/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\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
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to\r
+ * the device from the USB host before passing along unhandled control requests to the library for processing\r
+ * internally.\r
*/\r
-void EVENT_USB_Device_UnhandledControlRequest(void)\r
+void EVENT_USB_Device_ControlRequest(void)\r
{\r
uint8_t TMCRequestStatus = TMC_STATUS_SUCCESS;\r
\r
case Req_InitiateAbortBulkOut:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
{\r
- Endpoint_ClearSETUP();\r
- \r
/* Check that no split transaction is already in progress and the data transfer tag is valid */\r
if (RequestInProgress != 0)\r
{\r
/* Save the split request for later checking when a new request is received */\r
RequestInProgress = Req_InitiateAbortBulkOut;\r
}\r
+\r
+ Endpoint_ClearSETUP();\r
\r
/* Write the request response byte */\r
Endpoint_Write_Byte(TMCRequestStatus);\r
case Req_CheckAbortBulkOutStatus:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
{\r
- Endpoint_ClearSETUP();\r
- \r
/* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */\r
if (RequestInProgress != Req_InitiateAbortBulkOut)\r
TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; \r
else if (IsTMCBulkOUTReset)\r
TMCRequestStatus = TMC_STATUS_PENDING;\r
else\r
- RequestInProgress = 0; \r
- \r
+ RequestInProgress = 0; \r
+\r
+ Endpoint_ClearSETUP();\r
+ \r
/* Write the request response bytes */\r
Endpoint_Write_Byte(TMCRequestStatus);\r
Endpoint_Write_Word_LE(0);\r
case Req_InitiateAbortBulkIn:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
{\r
- Endpoint_ClearSETUP();\r
- \r
/* Check that no split transaction is already in progress and the data transfer tag is valid */\r
if (RequestInProgress != 0)\r
{\r
/* Save the split request for later checking when a new request is received */\r
RequestInProgress = Req_InitiateAbortBulkIn;\r
}\r
+\r
+ Endpoint_ClearSETUP();\r
\r
/* Write the request response bytes */\r
Endpoint_Write_Byte(TMCRequestStatus);\r
case Req_CheckAbortBulkInStatus:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
{\r
- Endpoint_ClearSETUP();\r
- \r
/* Check that an ABORT BULK IN transaction has been requested and that the request has completed */\r
if (RequestInProgress != Req_InitiateAbortBulkIn)\r
TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;\r
TMCRequestStatus = TMC_STATUS_PENDING;\r
else\r
RequestInProgress = 0;\r
- \r
+\r
+ Endpoint_ClearSETUP();\r
+ \r
/* Write the request response bytes */\r
Endpoint_Write_Byte(TMCRequestStatus);\r
Endpoint_Write_Word_LE(0);\r
case Req_InitiateClear:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
- Endpoint_ClearSETUP();\r
- \r
/* Check that no split transaction is already in progress */\r
if (RequestInProgress != 0)\r
{\r
/* Save the split request for later checking when a new request is received */\r
RequestInProgress = Req_InitiateClear;\r
}\r
+\r
+ Endpoint_ClearSETUP();\r
\r
/* Write the request response byte */\r
Endpoint_Write_Byte(TMCRequestStatus);\r
case Req_CheckClearStatus:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
- Endpoint_ClearSETUP();\r
- \r
/* Check that a CLEAR transaction has been requested and that the request has completed */\r
if (RequestInProgress != Req_InitiateClear)\r
TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; \r
TMCRequestStatus = TMC_STATUS_PENDING;\r
else\r
RequestInProgress = 0;\r
- \r
+\r
+ Endpoint_ClearSETUP();\r
+\r
/* Write the request response bytes */\r
Endpoint_Write_Byte(TMCRequestStatus);\r
Endpoint_Write_Byte(0);\r
case Req_GetCapabilities:\r
if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
- /* Acknowledge the SETUP packet, ready for data transfer */\r
Endpoint_ClearSETUP();\r
\r
/* Write the device capabilities to the control endpoint */\r
- Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t));\r
- \r
- /* Finalize the stream transfer to send the last packet or clear the host abort */\r
+ Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t)); \r
Endpoint_ClearOUT();\r
}\r
\r
\r
TMC_MessageHeader_t MessageHeader;\r
\r
- /* Check if a TMC packet has been received */\r
+ /* Try to read in a TMC message from the interface, process if one is available */\r
if (ReadTMCHeader(&MessageHeader))\r
{\r
/* Indicate busy */\r
IsTMCBulkOUTReset = false;\r
}\r
\r
+/** Attempts to read in the TMC message header from the TMC interface.\r
+ *\r
+ * \param[out] MessageHeader Pointer to a location where the read header (if any) should be stored\r
+ *\r
+ * \return Boolean true if a header was read, false otherwise\r
+ */\r
bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader)\r
{\r
/* Select the Data Out endpoint */\r
CurrentTransferTag = MessageHeader->Tag;\r
\r
/* Indicate if the command has been aborted or not */\r
- return !IsTMCBulkOUTReset;\r
+ return !(IsTMCBulkOUTReset);\r
}\r
\r
bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader)\r
Endpoint_Write_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), StreamCallback_AbortINOnRequest);\r
\r
/* Indicate if the command has been aborted or not */\r
- return !IsTMCBulkINReset;\r
+ return !(IsTMCBulkINReset);\r
}\r
\r
/** Stream callback function for the Endpoint stream write functions. This callback will abort the current stream transfer\r
/* Continue with the current stream operation */\r
return STREAMCALLBACK_Continue;\r
}\r
+
projects / pub / USBasp.git / blobdiff