eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More XMEGA USB AVR device port work - re-add missing Endpoint stream functions, remove unnecessary internal functions.

This commit is contained in:
Dean Camera 2011-07-14 07:28:32 +00:00
parent 8629e1918c
commit b971dbbce8
3 changed files with 69 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.c
View File

@ -37,7 +37,7 @@
void USB_Device_SendRemoteWakeup(void) void USB_Device_SendRemoteWakeup(void)
{ {
// TODO USB.CTRLB |= USB_RWAKEUP_bm;
} }
#endif #endif

70
LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c
View File

@ -39,13 +39,79 @@
uint8_t Endpoint_Discard_Stream(uint16_t Length, uint8_t Endpoint_Discard_Stream(uint16_t Length,
uint16_t* const BytesProcessed) uint16_t* const BytesProcessed)
{ {
return 0; // TODO uint8_t ErrorCode;
uint16_t BytesInTransfer = 0;
if ((ErrorCode = Endpoint_WaitUntilReady()))
return ErrorCode;
if (BytesProcessed != NULL)
Length -= *BytesProcessed;
while (Length)
{
if (!(Endpoint_IsReadWriteAllowed()))
{
Endpoint_ClearOUT();
if (BytesProcessed != NULL)
{
*BytesProcessed += BytesInTransfer;
return ENDPOINT_RWSTREAM_IncompleteTransfer;
}
if ((ErrorCode = Endpoint_WaitUntilReady()))
return ErrorCode;
}
else
{
Endpoint_Discard_8();
Length--;
BytesInTransfer++;
}
}
return ENDPOINT_RWSTREAM_NoError;
} }
uint8_t Endpoint_Null_Stream(uint16_t Length, uint8_t Endpoint_Null_Stream(uint16_t Length,
uint16_t* const BytesProcessed) uint16_t* const BytesProcessed)
{ {
return 0; // TODO uint8_t ErrorCode;
uint16_t BytesInTransfer = 0;
if ((ErrorCode = Endpoint_WaitUntilReady()))
return ErrorCode;
if (BytesProcessed != NULL)
Length -= *BytesProcessed;
while (Length)
{
if (!(Endpoint_IsReadWriteAllowed()))
{
Endpoint_ClearIN();
if (BytesProcessed != NULL)
{
*BytesProcessed += BytesInTransfer;
return ENDPOINT_RWSTREAM_IncompleteTransfer;
}
if ((ErrorCode = Endpoint_WaitUntilReady()))
return ErrorCode;
}
else
{
Endpoint_Write_8(0);
Length--;
BytesInTransfer++;
}
}
return ENDPOINT_RWSTREAM_NoError;
} }
#define TEMPLATE_FUNC_NAME Endpoint_Write_Stream_LE #define TEMPLATE_FUNC_NAME Endpoint_Write_Stream_LE

8
LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
View File

@ -95,14 +95,6 @@
#define ENDPOINT_DETAILS_MAXEP 16 #define ENDPOINT_DETAILS_MAXEP 16
/* Inline Functions: */
static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST
ATTR_ALWAYS_INLINE;
static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes)
{
return 0; // TODO
}
/* Function Prototypes: */ /* Function Prototypes: */
void Endpoint_ClearEndpoints(void); void Endpoint_ClearEndpoints(void);
bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,