X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/9597b33c3320969b8ca53aff0b1b38ee1fa24949..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c index cab978a85..08c50c736 100644 --- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c +++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c @@ -1,13 +1,13 @@ /* LUFA Library - Copyright (C) Dean Camera, 2010. + Copyright (C) Dean Camera, 2011. dean [at] fourwalledcubicle [dot] com - www.fourwalledcubicle.com + www.lufa-lib.org */ /* - Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -53,17 +53,19 @@ TMC_Capabilities_t Capabilities = }; /** Current TMC control request that is being processed */ -uint8_t RequestInProgress = 0; +static uint8_t RequestInProgress = 0; /** Stream callback abort flag for bulk IN data */ -bool IsTMCBulkINReset = false; +static bool IsTMCBulkINReset = false; /** Stream callback abort flag for bulk OUT data */ -bool IsTMCBulkOUTReset = false; +static bool IsTMCBulkOUTReset = false; /** Last used tag value for data transfers */ -uint8_t CurrentTransferTag = 0; +static uint8_t CurrentTransferTag = 0; +/** Length of last data transfer, for reporting to the host in case an in-progress transfer is aborted */ +static uint32_t LastTransferLength = 0; /** Main program entry point. This routine contains the overall program flow, including initial * setup of all components and the main program loop. @@ -118,29 +120,25 @@ void EVENT_USB_Device_Disconnect(void) */ void EVENT_USB_Device_ConfigurationChanged(void) { - LEDs_SetAllLEDs(LEDMASK_USB_READY); - - /* Setup TMC In and Out Endpoints */ - if (!(Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK, - ENDPOINT_DIR_IN, TMC_IO_EPSIZE, - ENDPOINT_BANK_SINGLE))) - { - LEDs_SetAllLEDs(LEDMASK_USB_ERROR); - } - - if (!(Endpoint_ConfigureEndpoint(TMC_OUT_EPNUM, EP_TYPE_BULK, - ENDPOINT_DIR_OUT, TMC_IO_EPSIZE, - ENDPOINT_BANK_SINGLE))) - { - LEDs_SetAllLEDs(LEDMASK_USB_ERROR); - } + bool ConfigSuccess = true; + + /* Setup TMC In, Out and Notification Endpoints */ + ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN, + TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE); + ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN, + TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE); + ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT, + TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE); + + /* Indicate endpoint configuration success or failure */ + LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR); } -/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific - * control requests that are not handled internally by the USB library (including the CDC control commands, - * which are all issued via the control endpoint), so that they can be handled appropriately for the application. +/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to + * the device from the USB host before passing along unhandled control requests to the library for processing + * internally. */ -void EVENT_USB_Device_UnhandledControlRequest(void) +void EVENT_USB_Device_ControlRequest(void) { uint8_t TMCRequestStatus = TMC_STATUS_SUCCESS; @@ -150,8 +148,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_InitiateAbortBulkOut: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) { - Endpoint_ClearSETUP(); - /* Check that no split transaction is already in progress and the data transfer tag is valid */ if (RequestInProgress != 0) { @@ -169,9 +165,11 @@ void EVENT_USB_Device_UnhandledControlRequest(void) /* Save the split request for later checking when a new request is received */ RequestInProgress = Req_InitiateAbortBulkOut; } + + Endpoint_ClearSETUP(); /* Write the request response byte */ - Endpoint_Write_Byte(TMCRequestStatus); + Endpoint_Write_8(TMCRequestStatus); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); @@ -181,20 +179,20 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_CheckAbortBulkOutStatus: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) { - Endpoint_ClearSETUP(); - /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */ if (RequestInProgress != Req_InitiateAbortBulkOut) TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; else if (IsTMCBulkOUTReset) TMCRequestStatus = TMC_STATUS_PENDING; else - RequestInProgress = 0; - + RequestInProgress = 0; + + Endpoint_ClearSETUP(); + /* Write the request response bytes */ - Endpoint_Write_Byte(TMCRequestStatus); - Endpoint_Write_Word_LE(0); - Endpoint_Write_DWord_LE(0); // TODO - Last transfer length + Endpoint_Write_8(TMCRequestStatus); + Endpoint_Write_16_LE(0); + Endpoint_Write_32_LE(LastTransferLength); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); @@ -204,8 +202,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_InitiateAbortBulkIn: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) { - Endpoint_ClearSETUP(); - /* Check that no split transaction is already in progress and the data transfer tag is valid */ if (RequestInProgress != 0) { @@ -223,10 +219,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void) /* Save the split request for later checking when a new request is received */ RequestInProgress = Req_InitiateAbortBulkIn; } + + Endpoint_ClearSETUP(); /* Write the request response bytes */ - Endpoint_Write_Byte(TMCRequestStatus); - Endpoint_Write_Byte(CurrentTransferTag); + Endpoint_Write_8(TMCRequestStatus); + Endpoint_Write_8(CurrentTransferTag); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); @@ -236,8 +234,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_CheckAbortBulkInStatus: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT)) { - Endpoint_ClearSETUP(); - /* Check that an ABORT BULK IN transaction has been requested and that the request has completed */ if (RequestInProgress != Req_InitiateAbortBulkIn) TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; @@ -245,11 +241,13 @@ void EVENT_USB_Device_UnhandledControlRequest(void) TMCRequestStatus = TMC_STATUS_PENDING; else RequestInProgress = 0; - + + Endpoint_ClearSETUP(); + /* Write the request response bytes */ - Endpoint_Write_Byte(TMCRequestStatus); - Endpoint_Write_Word_LE(0); - Endpoint_Write_DWord_LE(0); // TODO - Last transfer length + Endpoint_Write_8(TMCRequestStatus); + Endpoint_Write_16_LE(0); + Endpoint_Write_32_LE(LastTransferLength); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); @@ -259,12 +257,10 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_InitiateClear: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) { - Endpoint_ClearSETUP(); - /* Check that no split transaction is already in progress */ if (RequestInProgress != 0) { - Endpoint_Write_Byte(TMC_STATUS_SPLIT_IN_PROGRESS); + Endpoint_Write_8(TMC_STATUS_SPLIT_IN_PROGRESS); } else { @@ -275,9 +271,11 @@ void EVENT_USB_Device_UnhandledControlRequest(void) /* Save the split request for later checking when a new request is received */ RequestInProgress = Req_InitiateClear; } + + Endpoint_ClearSETUP(); /* Write the request response byte */ - Endpoint_Write_Byte(TMCRequestStatus); + Endpoint_Write_8(TMCRequestStatus); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); @@ -287,8 +285,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_CheckClearStatus: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) { - Endpoint_ClearSETUP(); - /* Check that a CLEAR transaction has been requested and that the request has completed */ if (RequestInProgress != Req_InitiateClear) TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS; @@ -296,10 +292,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void) TMCRequestStatus = TMC_STATUS_PENDING; else RequestInProgress = 0; - + + Endpoint_ClearSETUP(); + /* Write the request response bytes */ - Endpoint_Write_Byte(TMCRequestStatus); - Endpoint_Write_Byte(0); + Endpoint_Write_8(TMCRequestStatus); + Endpoint_Write_8(0); Endpoint_ClearIN(); Endpoint_ClearStatusStage(); @@ -309,13 +307,10 @@ void EVENT_USB_Device_UnhandledControlRequest(void) case Req_GetCapabilities: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) { - /* Acknowledge the SETUP packet, ready for data transfer */ Endpoint_ClearSETUP(); /* Write the device capabilities to the control endpoint */ - Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t)); - - /* Finalize the stream transfer to send the last packet or clear the host abort */ + Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t)); Endpoint_ClearOUT(); } @@ -331,8 +326,9 @@ void TMC_Task(void) return; TMC_MessageHeader_t MessageHeader; + uint16_t BytesTransferred; - /* Check if a TMC packet has been received */ + /* Try to read in a TMC message from the interface, process if one is available */ if (ReadTMCHeader(&MessageHeader)) { /* Indicate busy */ @@ -341,16 +337,35 @@ void TMC_Task(void) switch (MessageHeader.MessageID) { case TMC_MESSAGEID_DEV_DEP_MSG_OUT: - Endpoint_Discard_Stream(MessageHeader.TransferSize, StreamCallback_AbortOUTOnRequest); + BytesTransferred = 0; + while (Endpoint_Discard_Stream(MessageHeader.TransferSize, &BytesTransferred) == + ENDPOINT_RWSTREAM_IncompleteTransfer) + { + if (IsTMCBulkOUTReset) + break; + } + LastTransferLength = BytesTransferred; + Endpoint_ClearOUT(); break; case TMC_MESSAGEID_DEV_DEP_MSG_IN: Endpoint_ClearOUT(); + + char MessageData[] = "TMC Class Test"; - MessageHeader.TransferSize = 3; + MessageHeader.TransferSize = strlen(MessageData); + MessageHeader.MessageIDSpecific.DeviceOUT.LastMessageTransaction = true; WriteTMCHeader(&MessageHeader); - Endpoint_Write_Stream_LE("TMC", 3, StreamCallback_AbortINOnRequest); + BytesTransferred = 0; + while (Endpoint_Write_Stream_LE(MessageData, MessageHeader.TransferSize, &BytesTransferred) == + ENDPOINT_RWSTREAM_IncompleteTransfer) + { + if (IsTMCBulkINReset) + break; + } + LastTransferLength = BytesTransferred; + Endpoint_ClearIN(); break; default: @@ -366,8 +381,17 @@ void TMC_Task(void) IsTMCBulkOUTReset = false; } +/** Attempts to read in the TMC message header from the TMC interface. + * + * \param[out] MessageHeader Pointer to a location where the read header (if any) should be stored + * + * \return Boolean true if a header was read, false otherwise + */ bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader) { + uint16_t BytesTransferred; + uint8_t ErrorCode; + /* Select the Data Out endpoint */ Endpoint_SelectEndpoint(TMC_OUT_EPNUM); @@ -376,20 +400,25 @@ bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader) return false; /* Read in the header of the command from the host */ - Endpoint_Read_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), StreamCallback_AbortOUTOnRequest); + BytesTransferred = 0; + while ((ErrorCode = Endpoint_Read_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), &BytesTransferred)) == + ENDPOINT_RWSTREAM_IncompleteTransfer) + { + if (IsTMCBulkOUTReset) + break; + } /* Store the new command tag value for later use */ CurrentTransferTag = MessageHeader->Tag; /* Indicate if the command has been aborted or not */ - return !IsTMCBulkOUTReset; + return (!(IsTMCBulkOUTReset) && (ErrorCode == ENDPOINT_RWSTREAM_NoError)); } bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader) { - /* Compute the next transfer tag value, must be between 1 and 254 */ - if (++CurrentTransferTag == 0xFF) - CurrentTransferTag = 1; + uint16_t BytesTransferred; + uint8_t ErrorCode; /* Set the message tag of the command header */ MessageHeader->Tag = CurrentTransferTag; @@ -399,34 +428,14 @@ bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader) Endpoint_SelectEndpoint(TMC_IN_EPNUM); /* Send the command header to the host */ - Endpoint_Write_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), StreamCallback_AbortINOnRequest); + BytesTransferred = 0; + while ((ErrorCode = Endpoint_Write_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), &BytesTransferred)) == + ENDPOINT_RWSTREAM_IncompleteTransfer) + { + if (IsTMCBulkINReset) + break; + } /* Indicate if the command has been aborted or not */ - return !IsTMCBulkINReset; -} - -/** Stream callback function for the Endpoint stream write functions. This callback will abort the current stream transfer - * if a TMC Abort Bulk IN request has been issued to the control endpoint. - */ -uint8_t StreamCallback_AbortINOnRequest(void) -{ - /* Abort if a TMC Bulk Data IN abort was received */ - if (IsTMCBulkINReset) - return STREAMCALLBACK_Abort; - - /* Continue with the current stream operation */ - return STREAMCALLBACK_Continue; -} - -/** Stream callback function for the Endpoint stream read functions. This callback will abort the current stream transfer - * if a TMC Abort Bulk OUT request has been issued to the control endpoint. - */ -uint8_t StreamCallback_AbortOUTOnRequest(void) -{ - /* Abort if a TMC Bulk Data IN abort was received */ - if (IsTMCBulkOUTReset) - return STREAMCALLBACK_Abort; - - /* Continue with the current stream operation */ - return STREAMCALLBACK_Continue; + return (!(IsTMCBulkINReset) && (ErrorCode == ENDPOINT_RWSTREAM_NoError)); }