forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct Endpoint/Pipe maximum constants for the AVR32 UC3 models.

Browse Source
pull/1469/head
Dean Camera 14 years ago
parent 02dfd7dc3d
commit ea361a0d30
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File

40
LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
Unescape View File

@ -98,15 +98,37 @@
#define _ENDPOINT_GET_BANKS2(EPDetails) _ENDPOINT_GET_BANKS3(EPDetails) #define _ENDPOINT_GET_BANKS2(EPDetails) _ENDPOINT_GET_BANKS3(EPDetails)
#define _ENDPOINT_GET_BANKS3(MaxSize, Banks) (Banks) #define _ENDPOINT_GET_BANKS3(MaxSize, Banks) (Banks)
#define ENDPOINT_DETAILS_MAXEP 7 #if defined(USB_SERIES_UC3A0_AVR) || defined(USB_SERIES_UC3A1_AVR)
#define ENDPOINT_DETAILS_MAXEP 7
#define ENDPOINT_DETAILS_EP0 64, 1
#define ENDPOINT_DETAILS_EP1 64, 2 #define ENDPOINT_DETAILS_EP0 64, 1
#define ENDPOINT_DETAILS_EP2 64, 2 #define ENDPOINT_DETAILS_EP1 256, 2
#define ENDPOINT_DETAILS_EP3 64, 2 #define ENDPOINT_DETAILS_EP2 256, 2
#define ENDPOINT_DETAILS_EP4 64, 2 #define ENDPOINT_DETAILS_EP3 64, 2
#define ENDPOINT_DETAILS_EP5 256, 2 #define ENDPOINT_DETAILS_EP4 64, 2
#define ENDPOINT_DETAILS_EP6 256, 2 #define ENDPOINT_DETAILS_EP5 256, 2
#define ENDPOINT_DETAILS_EP6 256, 2
#elif defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR)
#define ENDPOINT_DETAILS_MAXEP 8
#define ENDPOINT_DETAILS_EP0 64, 1
#define ENDPOINT_DETAILS_EP1 512, 2
#define ENDPOINT_DETAILS_EP2 512, 2
#define ENDPOINT_DETAILS_EP3 512, 2
#define ENDPOINT_DETAILS_EP4 512, 2
#define ENDPOINT_DETAILS_EP5 512, 2
#define ENDPOINT_DETAILS_EP6 512, 2
#elif defined(USB_SERIES_UC3B0_AVR) || defined(USB_SERIES_UC3B1_AVR)
#define ENDPOINT_DETAILS_MAXEP 7
#define ENDPOINT_DETAILS_EP0 64, 1
#define ENDPOINT_DETAILS_EP1 64, 2
#define ENDPOINT_DETAILS_EP2 64, 2
#define ENDPOINT_DETAILS_EP3 64, 2
#define ENDPOINT_DETAILS_EP4 64, 2
#define ENDPOINT_DETAILS_EP5 256, 2
#define ENDPOINT_DETAILS_EP6 256, 2
#endif
/* Inline Functions: */ /* Inline Functions: */
static inline uint32_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST static inline uint32_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST

12
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
Unescape View File

@ -172,10 +172,14 @@
*/ */
#define PIPE_CONTROLPIPE_DEFAULT_SIZE 64 #define PIPE_CONTROLPIPE_DEFAULT_SIZE 64
/** Total number of pipes (including the default control pipe at address 0) which may be used in #if defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR) || defined(__DOXYGEN__)
* the device. /** Total number of pipes (including the default control pipe at address 0) which may be used in
*/ * the device.
#define PIPE_TOTAL_PIPES 7 */
#define PIPE_TOTAL_PIPES 8
#else
#define PIPE_TOTAL_PIPES 7
#endif
/** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR /** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR
* model supports the largest bank size possible on the device; different pipe numbers support * model supports the largest bank size possible on the device; different pipe numbers support

Write Preview
Loading…
Cancel
Save