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

Fix compile errors when both Host and Device modes are enabled.

This commit is contained in:
Dean Camera 2011-06-09 04:32:52 +00:00
parent 1191da7b7b
commit e5e34f91fa
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA.pnproj
View File

File diff suppressed because one or more lines are too long

2
LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
View File

@ -330,7 +330,7 @@
static inline uint8_t Pipe_GetBoundEndpointAddress(void) static inline uint8_t Pipe_GetBoundEndpointAddress(void)
{ {
return (((UPCFG0X >> PEPNUM0) & PIPE_EPNUM_MASK) | return (((UPCFG0X >> PEPNUM0) & PIPE_EPNUM_MASK) |
((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? ENDPOINT_DESCRIPTOR_DIR_IN : 0)); ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? PIPE_EPDIR_MASK : 0));
} }
/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds. /** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.

2
LUFA/Drivers/USB/Core/Pipe.h
View File

@ -84,7 +84,7 @@
/* Includes: */ /* Includes: */
#include "../../../Common/Common.h" #include "../../../Common/Common.h"
#include "USBMode.h" #include "USBMode.h"
/* Preprocessor Checks: */ /* Preprocessor Checks: */
#if !defined(__INCLUDE_FROM_USB_DRIVER) #if !defined(__INCLUDE_FROM_USB_DRIVER)

2
LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
View File

@ -341,7 +341,7 @@
static inline uint8_t Pipe_GetBoundEndpointAddress(void) static inline uint8_t Pipe_GetBoundEndpointAddress(void)
{ {
return ((&AVR32_USBB.UPCFG0)[USB_SelectedPipe].pepnum | return ((&AVR32_USBB.UPCFG0)[USB_SelectedPipe].pepnum |
((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? ENDPOINT_DESCRIPTOR_DIR_IN : 0)); ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? PIPE_EPDIR_MASK : 0));
} }
/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds. /** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.

3
LUFA/ManPages/FutureChanges.txt
View File

@ -22,7 +22,7 @@
* -# Pull out third party libraries into a separate folder and reference them as required * -# Pull out third party libraries into a separate folder and reference them as required
* -# Add a LUFA_YIELD macro for integration into a third-party RTOS * -# Add a LUFA_YIELD macro for integration into a third-party RTOS
* -# Abstract out Mass Storage byte send/receive to prevent low level API use in projects * -# Abstract out Mass Storage byte send/receive to prevent low level API use in projects
* -# Consider switch from endpoint numbers to full endpoint addresses for future expansion * -# Consider switch from endpoint numbers to full endpoint addresses to ease future architecture expansion
* - Documentation/Support * - Documentation/Support
* -# Add detailed overviews of how each demo works * -# Add detailed overviews of how each demo works
* -# Add board overviews * -# Add board overviews
@ -30,7 +30,6 @@
* - Demos/Projects * - Demos/Projects
* -# Device/Host USB bridge * -# Device/Host USB bridge
* -# Finish incomplete demos and projects * -# Finish incomplete demos and projects
* -# Add class driver support for Audio Host class
* -# Add class driver support for Test and Measurement class * -# Add class driver support for Test and Measurement class
* -# Add class driver support for EEM class * -# Add class driver support for EEM class
* -# Add class driver support for ECM class * -# Add class driver support for ECM class