diff options
| author | tmk <nobody@nowhere> | 2014-04-25 12:19:14 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-04-25 12:19:14 +0900 |
| commit | ad4cba172b2eea37697ca531016c4c3b4defaeb7 (patch) | |
| tree | 7d27322f6155b1112409ce05b3984a193106fd09 | |
| parent | 00e9a342df752f06888d3093110a703c70985128 (diff) | |
Move macro definitions from lufa.c to lufa.h
| -rw-r--r-- | protocol/lufa/lufa.c | 9 | ||||
| -rw-r--r-- | protocol/lufa/lufa.h | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c index 68119d5e7a..86e9f23d17 100644 --- a/protocol/lufa/lufa.c +++ b/protocol/lufa/lufa.c @@ -184,15 +184,6 @@ void EVENT_USB_Device_StartOfFrame(void) /** Event handler for the USB_ConfigurationChanged event. * This is fired when the host sets the current configuration of the USB device after enumeration. */ -#if LUFA_VERSION_INTEGER < 0x120730 - /* old API 120219 */ - #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint(epnum, eptype, epdir, epsize, epbank) -#else - /* new API >= 120730 */ - #define ENDPOINT_BANK_SINGLE 1 - #define ENDPOINT_BANK_DOUBLE 2 - #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum) , eptype, epsize, epbank) -#endif void EVENT_USB_Device_ConfigurationChanged(void) { bool ConfigSuccess = true; diff --git a/protocol/lufa/lufa.h b/protocol/lufa/lufa.h index bcee060d67..195123c0f9 100644 --- a/protocol/lufa/lufa.h +++ b/protocol/lufa/lufa.h @@ -66,4 +66,15 @@ typedef struct { uint16_t usage; } __attribute__ ((packed)) report_extra_t; + +#if LUFA_VERSION_INTEGER < 0x120730 + /* old API 120219 */ + #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint(epnum, eptype, epdir, epsize, epbank) +#else + /* new API >= 120730 */ + #define ENDPOINT_BANK_SINGLE 1 + #define ENDPOINT_BANK_DOUBLE 2 + #define ENDPOINT_CONFIG(epnum, eptype, epdir, epsize, epbank) Endpoint_ConfigureEndpoint((epdir) | (epnum) , eptype, epsize, epbank) +#endif + #endif |