Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
fa85c5e4
Commit
fa85c5e4
authored
Mar 31, 2009
by
Dean Camera
Browse files
Commit for the 090401 release.
parent
3aa8620a
Changes
7
Hide whitespace changes
Inline
Side-by-side
LUFA/ChangeLog.txt
View file @
fa85c5e4
...
...
@@ -6,7 +6,7 @@
/** \page Page_ChangeLog Project Changelog
*
* \section Sec_ChangeLog
XXXXXX
Version
XXXXXX
* \section Sec_ChangeLog
090401
Version
090401
*
* - 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
...
...
LUFA/Doxygen.conf
View file @
fa85c5e4
...
...
@@ -31,7 +31,7 @@ PROJECT_NAME = "LUFA Library"
# This could be handy for archiving the generated documentation or
# if some version control system is used.
PROJECT_NUMBER
=
0
00000
PROJECT_NUMBER
=
0
90401
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
...
...
LUFA/Drivers/USB/HighLevel/USBTask.c
View file @
fa85c5e4
...
...
@@ -94,7 +94,7 @@ static void USB_HostTask(void)
if
((
SubErrorCode
=
USB_Host_WaitMS
(
1
))
!=
HOST_WAITERROR_Successful
)
{
USB_HostState
=
PostWaitState
;
ErrorCode
=
HOST_ENUMERROR_WaitStage
;
ErrorCode
=
HOST_ENUMERROR_WaitStage
;
break
;
}
...
...
LUFA/Drivers/USB/LowLevel/LowLevel.h
View file @
fa85c5e4
...
...
@@ -109,20 +109,24 @@
*/
#define USB_MODE_DEVICE 1
/** 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.
*/
#define USB_MODE_HOST 2
/** Mode mask for the the USB_Init() function. This indicates that the USB interface should be
* 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.
*
* \note Not all USB AVRs support host mode, and thus UID mode.
*/
#define USB_MODE_UID 3
#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
/** 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 This token is not available on AVR models which do not support host mode.
*/
#define USB_MODE_HOST 2
#endif
#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
/** Mode mask for the the USB_Init() function. This indicates that the USB interface should be
* 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.
*
* \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 should be enabled to regulate the data pin voltages to within the USB standard.
...
...
@@ -181,10 +185,14 @@
*/
#define EP_TYPE_MASK 0b11
/** 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)
#if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER) || defined(__DOXYGEN__)
/** Returns boolean true if the VBUS line is currently high (i.e. the USB host is supplying power),
* otherwise returns 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
* 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)); \
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
)
{
#if (defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__))
if
(
USBSTA
&
(
1
<<
ID
))
return
USB_MODE_DEVICE
;
else
return
USB_MODE_HOST
;
#else
return
USB_MODE_DEVICE
;
#endif
}
#endif
#endif
/* Disable C linkage for C++ Compilers: */
...
...
LUFA/Drivers/USB/LowLevel/Pipe.c
View file @
fa85c5e4
...
...
@@ -190,7 +190,7 @@ uint8_t Pipe_Discard_Stream(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
)
#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
#if !defined(NO_STREAM_CALLBACKS)
#if !defined(NO_STREAM_CALLBACKS)
,
uint8_t
(
*
const
Callback
)(
void
)
#endif
)
...
...
LUFA/Drivers/USB/LowLevel/StreamCallbacks.h
View file @
fa85c5e4
...
...
@@ -48,7 +48,7 @@
* Stream callback functions should return a value from the StreamCallback_Return_ErrorCodes_t
* enum.
*
* Usage Example (Device Endpoint, but applicable for Host
p
ipes also):
* Usage Example (Device Endpoint, but applicable for Host
P
ipes also):
* \code
* STREAM_CALLBACK(GlobalNotSet); // Callback Prototype
*
...
...
LUFA/MigrationInformation.txt
View file @
fa85c5e4
...
...
@@ -10,7 +10,7 @@
* 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.
*
* \section Sec_Migration
XXXXXX
Migrating from 090209 to
XXXXXX
* \section Sec_Migration
090401
Migrating from 090209 to
090401
*
* <b>All</b>
* - LUFA projects must now give the raw input clock frequency (before any prescaling) as a compile time constant "F_CLOCK",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment