Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
526e3989
Commit
526e3989
authored
May 07, 2009
by
Dean Camera
Browse files
Fixed inability to enumerate any devices while in host mode (broken in a previous commit).
parent
2bd88ebc
Changes
3
Hide whitespace changes
Inline
Side-by-side
LUFA/Drivers/USB/HighLevel/USBTask.c
View file @
526e3989
...
...
@@ -83,12 +83,11 @@ static void USB_HostTask(void)
{
uint8_t
ErrorCode
=
HOST_ENUMERROR_NoError
;
uint8_t
SubErrorCode
=
HOST_ENUMERROR_NoError
;
uint8_t
PrevPipe
=
Pipe_GetCurrentPipe
();
static
uint16_t
WaitMSRemaining
;
static
uint8_t
PostWaitState
;
uint8_t
PrevPipe
=
Pipe_GetCurrentPipe
();
Pipe_SelectPipe
(
PIPE_CONTROLPIPE
);
switch
(
USB_HostState
)
...
...
@@ -176,10 +175,10 @@ static void USB_HostTask(void)
.
bRequest
=
REQ_GetDescriptor
,
.
wValue
=
(
DTYPE_Device
<<
8
),
.
wIndex
=
0
,
.
wLength
=
PIPE_CONTROLPIPE_DEFAULT_SIZE
,
.
wLength
=
8
,
};
uint8_t
DataBuffer
[
PIPE_CONTROLPIPE_DEFAULT_SIZE
];
uint8_t
DataBuffer
[
8
];
if
((
SubErrorCode
=
USB_Host_SendControlRequest
(
DataBuffer
))
!=
HOST_SENDCONTROL_Successful
)
{
...
...
LUFA/Drivers/USB/LowLevel/DevChapter9.c
View file @
526e3989
...
...
@@ -165,7 +165,7 @@ static void USB_Device_SetConfiguration(void)
void
USB_Device_GetConfiguration
(
void
)
{
Endpoint_ClearSETUP
();
Endpoint_ClearSETUP
();
Endpoint_Write_Byte
(
USB_ConfigurationNumber
);
...
...
LUFA/Drivers/USB/LowLevel/Host.h
View file @
526e3989
...
...
@@ -60,7 +60,7 @@
* and that the address used is not important (other than the fact that it is non-zero), a
* fixed value is specified by the library.
*/
#define USB_HOST_DEVICEADDRESS 1
#define USB_HOST_DEVICEADDRESS
1
#if !defined(USB_HOST_TIMEOUT_MS) || defined(__DOXYGEN__)
/** Constant for the maximum software timeout period of sent USB control transactions to an attached
...
...
@@ -244,7 +244,7 @@
#define USB_Host_HostMode_On() MACROS{ USBCON |= (1 << HOST); }MACROE
#define USB_Host_HostMode_Off() MACROS{ USBCON &= ~(1 << HOST); }MACROE
#define USB_Host_VBUS_Auto_Enable() MACROS{ OTGCON &= ~(1 << VBUSHWC); UHWCON |= (1 << UVCONE);
}MACROE
#define USB_Host_VBUS_Auto_Enable() MACROS{ OTGCON &= ~(1 << VBUSHWC); UHWCON |= (1 << UVCONE); }MACROE
#define USB_Host_VBUS_Manual_Enable() MACROS{ OTGCON |= (1 << VBUSHWC); UHWCON &= ~(1 << UVCONE); DDRE |= (1 << 7); }MACROE
#define USB_Host_VBUS_Auto_On() MACROS{ OTGCON |= (1 << VBUSREQ); }MACROE
...
...
Write
Preview
Supports
Markdown
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