projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More minor renaming of library enums and events to try to create a consistent API.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
LowLevel
/
Endpoint.c
diff --git
a/LUFA/Drivers/USB/LowLevel/Endpoint.c
b/LUFA/Drivers/USB/LowLevel/Endpoint.c
index
f4f2bdc
..
bd264b1
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/Endpoint.c
+++ b/
LUFA/Drivers/USB/LowLevel/Endpoint.c
@@
-125,7
+125,7
@@
uint8_t Endpoint_Discard_Stream(uint16_t Length
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
- return ENDPOINT_RWSTREAM_
ERROR_
CallbackAborted;
\r
+ return ENDPOINT_RWSTREAM_CallbackAborted;
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
@@
-138,7
+138,7
@@
uint8_t Endpoint_Discard_Stream(uint16_t Length
}
\r
}
\r
\r
}
\r
}
\r
\r
- return ENDPOINT_RWSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
\r
}
\r
\r
uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
\r
@@
-161,7
+161,7
@@
uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
- return ENDPOINT_RWSTREAM_
ERROR_
CallbackAborted;
\r
+ return ENDPOINT_RWSTREAM_CallbackAborted;
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
@@
-174,7
+174,7
@@
uint8_t Endpoint_Write_Stream_LE(const void* Buffer, uint16_t Length
}
\r
}
\r
\r
}
\r
}
\r
\r
- return ENDPOINT_RWSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
\r
}
\r
\r
uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
\r
@@
-197,7
+197,7
@@
uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
- return ENDPOINT_RWSTREAM_
ERROR_
CallbackAborted;
\r
+ return ENDPOINT_RWSTREAM_CallbackAborted;
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
@@
-210,7
+210,7
@@
uint8_t Endpoint_Write_Stream_BE(const void* Buffer, uint16_t Length
}
\r
}
\r
\r
}
\r
}
\r
\r
- return ENDPOINT_RWSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
\r
}
\r
\r
uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
\r
@@
-233,7
+233,7
@@
uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
- return ENDPOINT_RWSTREAM_
ERROR_
CallbackAborted;
\r
+ return ENDPOINT_RWSTREAM_CallbackAborted;
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
@@
-246,7
+246,7
@@
uint8_t Endpoint_Read_Stream_LE(void* Buffer, uint16_t Length
}
\r
}
\r
\r
}
\r
}
\r
\r
- return ENDPOINT_RWSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
\r
}
\r
\r
uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
\r
@@
-269,7
+269,7
@@
uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
\r
#if !defined(NO_STREAM_CALLBACKS)
\r
if ((Callback != NULL) && (Callback() == STREAMCALLBACK_Abort))
\r
- return ENDPOINT_RWSTREAM_
ERROR_
CallbackAborted;
\r
+ return ENDPOINT_RWSTREAM_CallbackAborted;
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
#endif
\r
\r
if ((ErrorCode = Endpoint_WaitUntilReady()))
\r
@@
-282,7
+282,7
@@
uint8_t Endpoint_Read_Stream_BE(void* Buffer, uint16_t Length
}
\r
}
\r
\r
}
\r
}
\r
\r
- return ENDPOINT_RWSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWSTREAM_NoError;
\r
}
\r
#endif
\r
\r
}
\r
#endif
\r
\r
@@
-309,7
+309,7
@@
uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
}
\r
\r
if (Endpoint_IsOUTReceived())
\r
}
\r
\r
if (Endpoint_IsOUTReceived())
\r
- return ENDPOINT_RWCSTREAM_
ERROR_
HostAborted;
\r
+ return ENDPOINT_RWCSTREAM_HostAborted;
\r
\r
if (LastPacketFull)
\r
{
\r
\r
if (LastPacketFull)
\r
{
\r
@@
-319,7
+319,7
@@
uint8_t Endpoint_Write_Control_Stream_LE(const void* Buffer, uint16_t Length)
\r
while (!(Endpoint_IsOUTReceived()));
\r
\r
\r
while (!(Endpoint_IsOUTReceived()));
\r
\r
- return ENDPOINT_RWCSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWCSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
\r
}
\r
\r
uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
\r
@@
-346,7
+346,7
@@
uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
}
\r
\r
if (Endpoint_IsOUTReceived())
\r
}
\r
\r
if (Endpoint_IsOUTReceived())
\r
- return ENDPOINT_RWCSTREAM_
ERROR_
HostAborted;
\r
+ return ENDPOINT_RWCSTREAM_HostAborted;
\r
\r
if (LastPacketFull)
\r
{
\r
\r
if (LastPacketFull)
\r
{
\r
@@
-356,7
+356,7
@@
uint8_t Endpoint_Write_Control_Stream_BE(const void* Buffer, uint16_t Length)
\r
while (!(Endpoint_IsOUTReceived()));
\r
\r
\r
while (!(Endpoint_IsOUTReceived()));
\r
\r
- return ENDPOINT_RWCSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWCSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
\r
}
\r
\r
uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
\r
@@
-379,7
+379,7
@@
uint8_t Endpoint_Read_Control_Stream_LE(void* Buffer, uint16_t Length)
\r
while (!(Endpoint_IsINReady()));
\r
\r
\r
while (!(Endpoint_IsINReady()));
\r
\r
- return ENDPOINT_RWCSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWCSTREAM_NoError;
\r
}
\r
\r
uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
\r
}
\r
\r
uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
\r
@@
-402,7
+402,7
@@
uint8_t Endpoint_Read_Control_Stream_BE(void* Buffer, uint16_t Length)
\r
while (!(Endpoint_IsINReady()));
\r
\r
\r
while (!(Endpoint_IsINReady()));
\r
\r
- return ENDPOINT_RWCSTREAM_
ERROR_
NoError;
\r
+ return ENDPOINT_RWCSTREAM_NoError;
\r
}
\r
\r
#endif
\r
}
\r
\r
#endif
\r
projects / pub / USBasp.git / blobdiff