/*\r
LUFA Library\r
- Copyright (C) Dean Camera, 2009.\r
+ Copyright (C) Dean Camera, 2010.\r
\r
dean [at] fourwalledcubicle [dot] com\r
www.fourwalledcubicle.com\r
*/\r
\r
/*\r
- Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
- Permission to use, copy, modify, and distribute this software\r
- and its documentation for any purpose and without fee is hereby\r
- granted, provided that the above copyright notice appear in all\r
- copies and that both that the copyright notice and this\r
- permission notice and warranty disclaimer appear in supporting\r
- documentation, and that the name of the author not be used in\r
- advertising or publicity pertaining to distribution of the\r
+ Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+ Permission to use, copy, modify, distribute, and sell this \r
+ software and its documentation for any purpose is hereby granted\r
+ without fee, provided that the above copyright notice appear in \r
+ all copies and that both that the copyright notice and this\r
+ permission notice and warranty disclaimer appear in supporting \r
+ documentation, and that the name of the author not be used in \r
+ advertising or publicity pertaining to distribution of the \r
software without specific, written prior permission.\r
\r
The author disclaim all warranties with regard to this\r
UPCFG0X = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));\r
UPCFG1X = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));\r
\r
+ Pipe_SetInfiniteINRequests();\r
+\r
return Pipe_IsConfigured();\r
}\r
\r
}\r
}\r
\r
+bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)\r
+{\r
+ uint8_t PrevPipeNumber = Pipe_GetCurrentPipe();\r
+\r
+ for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)\r
+ {\r
+ Pipe_SelectPipe(PNum);\r
+ \r
+ if (Pipe_IsConfigured() && (Pipe_BoundEndpointNumber() == (EndpointAddress & PIPE_EPNUM_MASK)))\r
+ return true;\r
+ }\r
+ \r
+ Pipe_SelectPipe(PrevPipeNumber);\r
+ return false;\r
+}\r
+\r
uint8_t Pipe_WaitUntilReady(void)\r
{\r
#if (USB_STREAM_TIMEOUT_MS < 0xFF)\r
#else\r
uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;\r
#endif\r
-\r
+ \r
for (;;)\r
{\r
if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)\r
\r
if (Pipe_IsStalled())\r
return PIPE_READYWAIT_PipeStalled;\r
- else if (!(USB_IsConnected))\r
+ else if (USB_HostState == HOST_STATE_Unattached)\r
return PIPE_READYWAIT_DeviceDisconnected;\r
\r
if (USB_INT_HasOccurred(USB_INT_HSOFI))\r
}\r
}\r
\r
-uint8_t Pipe_Write_Stream_LE(const void* Data, uint16_t Length\r
+uint8_t Pipe_Discard_Stream(uint16_t Length\r
#if !defined(NO_STREAM_CALLBACKS)\r
, StreamCallbackPtr_t Callback\r
#endif\r
)\r
{\r
- uint8_t* DataStream = (uint8_t*)Data;\r
uint8_t ErrorCode;\r
\r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
\r
- while (Length)\r
- {\r
- if (!(Pipe_IsReadWriteAllowed()))\r
- {\r
- Pipe_ClearOUT();\r
- \r
- #if !defined(NO_STREAM_CALLBACKS)\r
- if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
- return PIPE_RWSTREAM_CallbackAborted;\r
- #endif\r
-\r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
- }\r
- else\r
- {\r
- Pipe_Write_Byte(*(DataStream++));\r
- Length--;\r
- }\r
- }\r
-\r
- return PIPE_RWSTREAM_NoError;\r
-}\r
-\r
-uint8_t Pipe_Write_Stream_BE(const void* Data, uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
- , StreamCallbackPtr_t Callback\r
-#endif\r
- )\r
-{\r
- uint8_t* DataStream = (uint8_t*)(Data + Length - 1);\r
- uint8_t ErrorCode;\r
- \r
if ((ErrorCode = Pipe_WaitUntilReady()))\r
return ErrorCode;\r
\r
- while (Length)\r
- {\r
- if (!(Pipe_IsReadWriteAllowed()))\r
- {\r
- Pipe_ClearOUT();\r
- \r
- #if !defined(NO_STREAM_CALLBACKS)\r
- if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
- return PIPE_RWSTREAM_CallbackAborted;\r
- #endif\r
-\r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
- }\r
- else\r
- {\r
- Pipe_Write_Byte(*(DataStream--));\r
- Length--;\r
- }\r
- }\r
-\r
- return PIPE_RWSTREAM_NoError;\r
-}\r
-\r
-uint8_t Pipe_Discard_Stream(uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
- , StreamCallbackPtr_t Callback\r
-#endif\r
- )\r
-{\r
- uint8_t ErrorCode;\r
- \r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
+ #if defined(FAST_STREAM_TRANSFERS)\r
+ uint8_t BytesRemToAlignment = (Pipe_BytesInPipe() & 0x07);\r
\r
- while (Length)\r
+ if (Length >= 8)\r
{\r
- if (!(Pipe_IsReadWriteAllowed()))\r
- {\r
- Pipe_ClearIN();\r
- \r
- #if !defined(NO_STREAM_CALLBACKS)\r
- if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
- return PIPE_RWSTREAM_CallbackAborted;\r
- #endif\r
+ Length -= BytesRemToAlignment;\r
\r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
- }\r
- else\r
+ switch (BytesRemToAlignment)\r
{\r
- Pipe_Discard_Byte();\r
- Length--;\r
+ default:\r
+ do\r
+ {\r
+ if (!(Pipe_IsReadWriteAllowed()))\r
+ {\r
+ Pipe_ClearIN();\r
+ \r
+ #if !defined(NO_STREAM_CALLBACKS)\r
+ if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
+ return PIPE_RWSTREAM_CallbackAborted;\r
+ #endif\r
+\r
+ if ((ErrorCode = Pipe_WaitUntilReady()))\r
+ return ErrorCode;\r
+ }\r
+\r
+ Length -= 8;\r
+ \r
+ Pipe_Discard_Byte();\r
+ case 7: Pipe_Discard_Byte();\r
+ case 6: Pipe_Discard_Byte();\r
+ case 5: Pipe_Discard_Byte();\r
+ case 4: Pipe_Discard_Byte();\r
+ case 3: Pipe_Discard_Byte();\r
+ case 2: Pipe_Discard_Byte();\r
+ case 1: Pipe_Discard_Byte();\r
+ } while (Length >= 8); \r
}\r
}\r
-\r
- return PIPE_RWSTREAM_NoError;\r
-}\r
-\r
-uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
- , StreamCallbackPtr_t Callback\r
-#endif\r
- )\r
-{\r
- uint8_t* DataStream = (uint8_t*)Buffer;\r
- uint8_t ErrorCode;\r
- \r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
+ #endif\r
\r
while (Length)\r
{\r
}\r
else\r
{\r
- *(DataStream++) = Pipe_Read_Byte();\r
+ Pipe_Discard_Byte();\r
Length--;\r
}\r
}\r
return PIPE_RWSTREAM_NoError;\r
}\r
\r
-uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length\r
-#if !defined(NO_STREAM_CALLBACKS)\r
- , StreamCallbackPtr_t Callback\r
-#endif\r
- )\r
-{\r
- uint8_t* DataStream = (uint8_t*)(Buffer + Length - 1);\r
- uint8_t ErrorCode;\r
- \r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
-\r
- while (Length)\r
- {\r
- if (!(Pipe_IsReadWriteAllowed()))\r
- {\r
- Pipe_ClearIN();\r
- \r
- #if !defined(NO_STREAM_CALLBACKS)\r
- if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))\r
- return PIPE_RWSTREAM_CallbackAborted;\r
- #endif\r
-\r
- if ((ErrorCode = Pipe_WaitUntilReady()))\r
- return ErrorCode;\r
- }\r
- else\r
- {\r
- *(DataStream--) = Pipe_Read_Byte();\r
- Length--;\r
- }\r
- }\r
- \r
- return PIPE_RWSTREAM_NoError;\r
-}\r
+/* The following abuses the C preprocessor in order to copy-past common code with slight alterations,\r
+ * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Write_Stream_LE\r
+#define TEMPLATE_BUFFER_TYPE const void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_OUT\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) 0\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Pipe_Write_Byte(*((uint8_t*)BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Write_PStream_LE\r
+#define TEMPLATE_BUFFER_TYPE const void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_OUT\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) 0\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Pipe_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Write_EStream_LE\r
+#define TEMPLATE_BUFFER_TYPE const void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_OUT\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) 0\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr++))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Write_Stream_BE\r
+#define TEMPLATE_BUFFER_TYPE const void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_OUT\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) (Length - 1)\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Pipe_Write_Byte(*((uint8_t*)BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Write_PStream_BE\r
+#define TEMPLATE_BUFFER_TYPE const void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_OUT\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) (Length - 1)\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Pipe_Write_Byte(pgm_read_byte((uint8_t*)BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Write_EStream_BE\r
+#define TEMPLATE_BUFFER_TYPE const void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_OUT\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearOUT()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) (Length - 1)\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) Pipe_Write_Byte(eeprom_read_byte((uint8_t*)BufferPtr--))\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Read_Stream_LE\r
+#define TEMPLATE_BUFFER_TYPE void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_IN\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) 0\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) *((uint8_t*)BufferPtr++) = Pipe_Read_Byte()\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Read_EStream_LE\r
+#define TEMPLATE_BUFFER_TYPE void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_IN\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) 0\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) eeprom_write_byte((uint8_t*)BufferPtr++, Pipe_Read_Byte())\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Read_Stream_BE\r
+#define TEMPLATE_BUFFER_TYPE void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_IN\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) (Length - 1)\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) *((uint8_t*)BufferPtr--) = Pipe_Read_Byte()\r
+#include "Template/Template_Pipe_RW.c"\r
+\r
+#define TEMPLATE_FUNC_NAME Pipe_Read_EStream_BE\r
+#define TEMPLATE_BUFFER_TYPE void*\r
+#define TEMPLATE_TOKEN PIPE_TOKEN_IN\r
+#define TEMPLATE_CLEAR_PIPE() Pipe_ClearIN()\r
+#define TEMPLATE_BUFFER_OFFSET(Length) (Length - 1)\r
+#define TEMPLATE_TRANSFER_BYTE(BufferPtr) eeprom_write_byte((uint8_t*)BufferPtr--, Pipe_Read_Byte())\r
+#include "Template/Template_Pipe_RW.c"\r
\r
#endif\r
projects / pub / USBasp.git / blobdiff