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
e95c96ea
Commit
e95c96ea
authored
May 30, 2010
by
Dean Camera
Browse files
Fixed internal device serial not being accessible on the ATMEGAXXU2 AVRs (thanks to Axel Rohde).
parent
328ed71c
Changes
4
Hide whitespace changes
Inline
Side-by-side
LUFA/Drivers/USB/HighLevel/StdDescriptors.h
View file @
e95c96ea
...
...
@@ -80,7 +80,10 @@
*/
#define NO_DESCRIPTOR 0
#if (!defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))) || defined(__DOXYGEN__)
#if (!defined(NO_INTERNAL_SERIAL) && \
(defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__) || \
defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__) || \
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)))
/** String descriptor index for the device's unique serial number string descriptor within the device.
* This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
* number allocations) to a device regardless of the port it is plugged in to on the host. Some USB AVRs contain
...
...
LUFA/Drivers/USB/LowLevel/DevChapter9.c
View file @
e95c96ea
...
...
@@ -208,7 +208,7 @@ void USB_Device_GetConfiguration(void)
Endpoint_ClearStatusStage
();
}
#if !defined(NO_INTERNAL_SERIAL) && (
defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AV
R)
)
#if !defined(NO_INTERNAL_SERIAL) && (
USE_INTERNAL_SERIAL != NO_DESCRIPTO
R)
static
char
USB_Device_NibbleToASCII
(
uint8_t
Nibble
)
{
Nibble
=
((
Nibble
&
0x0F
)
+
'0'
);
...
...
@@ -261,7 +261,7 @@ static void USB_Device_GetDescriptor(void)
uint8_t
DescriptorAddressSpace
;
#endif
#if !defined(NO_INTERNAL_SERIAL) && (
defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AV
R)
)
#if !defined(NO_INTERNAL_SERIAL) && (
USE_INTERNAL_SERIAL != NO_DESCRIPTO
R)
if
(
USB_ControlRequest
.
wValue
==
((
DTYPE_String
<<
8
)
|
USE_INTERNAL_SERIAL
))
{
USB_Device_GetInternalSerialDescriptor
();
...
...
LUFA/Drivers/USB/LowLevel/DevChapter9.h
View file @
e95c96ea
...
...
@@ -149,7 +149,7 @@
static
void
USB_Device_GetStatus
(
void
);
static
void
USB_Device_ClearSetFeature
(
void
);
#if !defined(NO_INTERNAL_SERIAL) && (
defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AV
R)
)
#if !defined(NO_INTERNAL_SERIAL) && (
USE_INTERNAL_SERIAL != NO_DESCRIPTO
R)
static
char
USB_Device_NibbleToASCII
(
uint8_t
Nibble
)
ATTR_ALWAYS_INLINE
;
static
void
USB_Device_GetInternalSerialDescriptor
(
void
);
#endif
...
...
LUFA/ManPages/ChangeLog.txt
View file @
e95c96ea
...
...
@@ -30,6 +30,7 @@
* an overflow in the checksum calculation loop (thanks to Kevin Malec)
* - Fixed XPLAINBridge project not correctly reading the XMEGA's supply voltage when reporting back to the host
* - Fixed incorrect signature for the ATMEGA32U2 in the DFU bootloader (thanks to Axel Rohde)
* - Fixed internal device serial not being accessible on the ATMEGAXXU2 AVRs (thanks to Axel Rohde)
*
* \section Sec_ChangeLog100513 Version 100513
* <b>New:</b>
...
...
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