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

Commit for the 090401 release.

Browse Source
pull/1469/head
Dean Camera 16 years ago
parent 3aa8620a61
commit fa85c5e416
7 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
LUFA/ChangeLog.txt
Unescape View File

@ -6,7 +6,7 @@
/** \page Page_ChangeLog Project Changelog /** \page Page_ChangeLog Project Changelog
* *
* \section Sec_ChangeLogXXXXXX Version XXXXXX * \section Sec_ChangeLog090401 Version 090401
* *
* - Fixed MagStripe project configuration descriptor containing an unused (blank) endpoint descriptor * - Fixed MagStripe project configuration descriptor containing an unused (blank) endpoint descriptor
* - Incorporated makefile changes by Denver Gingerich to retain compatibility with stock (non-WinAVR) AVR-GCC installations * - Incorporated makefile changes by Denver Gingerich to retain compatibility with stock (non-WinAVR) AVR-GCC installations

2
LUFA/Doxygen.conf
Unescape View File

@ -31,7 +31,7 @@ PROJECT_NAME = "LUFA Library"
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 000000 PROJECT_NUMBER = 090401
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

2
LUFA/Drivers/USB/HighLevel/USBTask.c
Unescape View File

@ -94,7 +94,7 @@ static void USB_HostTask(void)
if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful) if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
{ {
USB_HostState = PostWaitState; USB_HostState = PostWaitState;
ErrorCode = HOST_ENUMERROR_WaitStage; ErrorCode = HOST_ENUMERROR_WaitStage;
break; break;
} }

53
LUFA/Drivers/USB/LowLevel/LowLevel.h
Unescape View File

@ -109,20 +109,24 @@
*/ */
#define USB_MODE_DEVICE 1 #define USB_MODE_DEVICE 1
/** Mode mask for the USB_CurrentMode global and the USB_Init() function. This indicates that the #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
* USB interface is or should be initialized in the USB host mode. /** Mode mask for the USB_CurrentMode global and the USB_Init() function. This indicates that the
* * USB interface is or should be initialized in the USB host mode.
* \note Not all USB AVRs support host mode. *
*/ * \note This token is not available on AVR models which do not support host mode.
#define USB_MODE_HOST 2 */
#define USB_MODE_HOST 2
/** Mode mask for the the USB_Init() function. This indicates that the USB interface should be #endif
* initialized into whatever mode the UID pin of the USB AVR indicates, and that the device
* should swap over its mode when the level of the UID pin changes during operation. #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
* /** Mode mask for the the USB_Init() function. This indicates that the USB interface should be
* \note Not all USB AVRs support host mode, and thus UID mode. * initialized into whatever mode the UID pin of the USB AVR indicates, and that the device
*/ * should swap over its mode when the level of the UID pin changes during operation.
#define USB_MODE_UID 3 *
* \note This token is not available on AVR models which do not support both host and device modes.
*/
#define USB_MODE_UID 3
#endif
/** Regulator disable option mask for USB_Init(). This indicates that the internal 3.3V USB data pad /** Regulator disable option mask for USB_Init(). This indicates that the internal 3.3V USB data pad
* regulator should be enabled to regulate the data pin voltages to within the USB standard. * regulator should be enabled to regulate the data pin voltages to within the USB standard.
@ -181,10 +185,14 @@
*/ */
#define EP_TYPE_MASK 0b11 #define EP_TYPE_MASK 0b11
/** Returns boolean true if the VBUS line is currently high (i.e. the USB host is supplying power), #if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__)
* otherwise returns false. /** Returns boolean true if the VBUS line is currently high (i.e. the USB host is supplying power),
*/ * otherwise returns false.
#define USB_VBUS_GetStatus() ((USBSTA & (1 << VBUS)) ? true : false) *
* \note This token is not available on some AVR models which do not support hardware VBUS monitoring.
*/
#define USB_VBUS_GetStatus() ((USBSTA & (1 << VBUS)) ? true : false)
#endif
/** Detaches the device from the USB bus. This has the effect of removing the device from any /** Detaches the device from the USB bus. This has the effect of removing the device from any
* host if, ceasing USB communications. If no host is present, this prevents any host from * host if, ceasing USB communications. If no host is present, this prevents any host from
@ -353,19 +361,18 @@
#define USB_Interface_Reset() MACROS{ uint8_t Temp = USBCON; USBCON = (Temp & ~(1 << USBE)); \ #define USB_Interface_Reset() MACROS{ uint8_t Temp = USBCON; USBCON = (Temp & ~(1 << USBE)); \
USBCON = (Temp | (1 << USBE)); }MACROE USBCON = (Temp | (1 << USBE)); }MACROE
/* Inline Functions: */ /* Inline Functions: */
#if defined(USB_CAN_BE_BOTH)
static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t USB_GetUSBModeFromUID(void) static inline uint8_t USB_GetUSBModeFromUID(void)
{ {
#if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__))
if (USBSTA & (1 << ID)) if (USBSTA & (1 << ID))
return USB_MODE_DEVICE; return USB_MODE_DEVICE;
else else
return USB_MODE_HOST; return USB_MODE_HOST;
#else
return USB_MODE_DEVICE;
#endif
} }
#endif
#endif #endif
/* Disable C linkage for C++ Compilers: */ /* Disable C linkage for C++ Compilers: */

4
LUFA/Drivers/USB/LowLevel/Pipe.c
Unescape View File

@ -190,7 +190,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length
} }
uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
#if !defined(NO_STREAM_CALLBACKS) #if !defined(NO_STREAM_CALLBACKS)
, uint8_t (* const Callback)(void) , uint8_t (* const Callback)(void)
#endif #endif
) )
@ -223,7 +223,7 @@ uint8_t Pipe_Read_Stream_LE(void* Buffer, uint16_t Length
} }
uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length uint8_t Pipe_Read_Stream_BE(void* Buffer, uint16_t Length
#if !defined(NO_STREAM_CALLBACKS) #if !defined(NO_STREAM_CALLBACKS)
, uint8_t (* const Callback)(void) , uint8_t (* const Callback)(void)
#endif #endif
) )

2
LUFA/Drivers/USB/LowLevel/StreamCallbacks.h
Unescape View File

@ -48,7 +48,7 @@
* Stream callback functions should return a value from the StreamCallback_Return_ErrorCodes_t * Stream callback functions should return a value from the StreamCallback_Return_ErrorCodes_t
* enum. * enum.
* *
* Usage Example (Device Endpoint, but applicable for Host pipes also): * Usage Example (Device Endpoint, but applicable for Host Pipes also):
* \code * \code
* STREAM_CALLBACK(GlobalNotSet); // Callback Prototype * STREAM_CALLBACK(GlobalNotSet); // Callback Prototype
* *

2
LUFA/MigrationInformation.txt
Unescape View File

@ -10,7 +10,7 @@
* to the next version released. It does not indicate all new additions to the library in each version change, only * to the next version released. It does not indicate all new additions to the library in each version change, only
* areas relevant to making older projects compatible with the API changes of each new release. * areas relevant to making older projects compatible with the API changes of each new release.
* *
* \section Sec_MigrationXXXXXX Migrating from 090209 to XXXXXX * \section Sec_Migration090401 Migrating from 090209 to 090401
* *
* <b>All</b> * <b>All</b>
* - LUFA projects must now give the raw input clock frequency (before any prescaling) as a compile time constant "F_CLOCK", * - LUFA projects must now give the raw input clock frequency (before any prescaling) as a compile time constant "F_CLOCK",

Write Preview
Loading…
Cancel
Save