gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-06-12 03:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use static inline intermediatary functions in Endpoint.h to handle the masking for the private endpoint configuration routine, instead of performing the masking in the Endpoint_ConfigureEndpoint() macro.

Browse Source
This commit is contained in:
Dean Camera 2010-07-27 13:49:16 +00:00
parent be2a7d4598
commit 059307d89c
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
LUFA/Drivers/USB/LowLevel/Endpoint.h
View File

@ -1293,14 +1293,23 @@
#define ENDPOINT_DETAILS_EP4 64, true #define ENDPOINT_DETAILS_EP4 64, true
#endif #endif
#define Endpoint_ConfigureEndpoint(Number, Type, Direction, Size, Banks) \ #define Endpoint_ConfigureEndpoint(Number, Type, Direction, Size, Banks) \
Endpoint_ConfigureEndpoint_Prv((Number), \ (__builtin_constant_p(Size) ? Endpoint_ConfigureEndpointStatic((Number), \
(((Type) << EPTYPE0) | (Direction)), \ (Type), \
((1 << ALLOC) | (Banks) | \ (Direction), \
(__builtin_constant_p(Size) ? \ Size, Banks) : \
Endpoint_BytesToEPSizeMask(Size) : \ Endpoint_ConfigureEndpointDynamic((Number), \
Endpoint_BytesToEPSizeMaskDynamic(Size)))) (Type), \
(Direction), \
Size, Banks))
/* Function Prototypes: */
void Endpoint_ClearEndpoints(void);
uint8_t Endpoint_BytesToEPSizeMaskDynamic(const uint16_t Size);
bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
const uint8_t UECFG0XData,
const uint8_t UECFG1XData);
/* Inline Functions: */ /* 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) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE;
static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes)
@ -1316,13 +1325,26 @@
return (MaskVal << EPSIZE0); return (MaskVal << EPSIZE0);
} }
static inline bool Endpoint_ConfigureEndpointStatic(const uint8_t Number,
const uint8_t Type,
const uint8_t Direction,
const uint16_t Size,
const uint8_t Banks)
{
return Endpoint_ConfigureEndpoint_Prv(Number, (((Type) << EPTYPE0) | (Direction)),
((1 << ALLOC) | Banks | Endpoint_BytesToEPSizeMask(Size)));
}
/* Function Prototypes: */ static inline bool Endpoint_ConfigureEndpointDynamic(const uint8_t Number,
void Endpoint_ClearEndpoints(void); const uint8_t Type,
uint8_t Endpoint_BytesToEPSizeMaskDynamic(const uint16_t Size); const uint8_t Direction,
bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number, const uint16_t Size,
const uint8_t UECFG0XData, const uint8_t Banks)
const uint8_t UECFG1XData); {
return Endpoint_ConfigureEndpoint_Prv(Number, (((Type) << EPTYPE0) | (Direction)),
((1 << ALLOC) | Banks | Endpoint_BytesToEPSizeMaskDynamic(Size)));
}
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */