projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix broken doxygen reference in last commit.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
LowLevel
/
DevChapter9.c
diff --git
a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index
f02d32b
..
8f53105
100644
(file)
--- a/
LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/
LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@
-62,7
+62,8
@@
void USB_Device_ProcessControlPacket(void)
break;
\r
case REQ_ClearFeature:
\r
case REQ_SetFeature:
\r
break;
\r
case REQ_ClearFeature:
\r
case REQ_SetFeature:
\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT))
\r
+ if ((bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE)) ||
\r
+ (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT)))
\r
{
\r
USB_Device_ClearSetFeature();
\r
RequestHandled = true;
\r
{
\r
USB_Device_ClearSetFeature();
\r
RequestHandled = true;
\r
@@
-105,7
+106,7
@@
void USB_Device_ProcessControlPacket(void)
}
\r
\r
if (!(RequestHandled))
\r
}
\r
\r
if (!(RequestHandled))
\r
-
RAISE_EVENT(USB_UnhandledControlPacket
);
\r
+
EVENT_USB_UnhandledControlPacket(
);
\r
\r
if (Endpoint_IsSETUPReceived())
\r
{
\r
\r
if (Endpoint_IsSETUPReceived())
\r
{
\r
@@
-118,8
+119,6
@@
static void USB_Device_SetAddress(void)
{
\r
Endpoint_ClearSETUP();
\r
\r
{
\r
Endpoint_ClearSETUP();
\r
\r
- while (!(Endpoint_IsINReady()));
\r
-
\r
Endpoint_ClearIN();
\r
\r
while (!(Endpoint_IsINReady()));
\r
Endpoint_ClearIN();
\r
\r
while (!(Endpoint_IsINReady()));
\r
@@
-158,14
+157,14
@@
static void USB_Device_SetConfiguration(void)
Endpoint_ClearIN();
\r
\r
if (!(AlreadyConfigured) && USB_ConfigurationNumber)
\r
Endpoint_ClearIN();
\r
\r
if (!(AlreadyConfigured) && USB_ConfigurationNumber)
\r
-
RAISE_EVENT(USB_DeviceEnumerationComplete
);
\r
+
EVENT_USB_DeviceEnumerationComplete(
);
\r
\r
\r
-
RAISE_EVENT(USB_ConfigurationChanged
);
\r
+
EVENT_USB_ConfigurationChanged(
);
\r
}
\r
\r
void USB_Device_GetConfiguration(void)
\r
{
\r
}
\r
\r
void USB_Device_GetConfiguration(void)
\r
{
\r
- Endpoint_ClearSETUP();
\r
+ Endpoint_ClearSETUP();
\r
\r
Endpoint_Write_Byte(USB_ConfigurationNumber);
\r
\r
\r
Endpoint_Write_Byte(USB_ConfigurationNumber);
\r
\r
@@
-299,7
+298,7
@@
static void USB_Device_ClearSetFeature(void)
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- Endpoint_StallTransaction();
\r
+ Endpoint_StallTransaction();
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r
@@
-313,9
+312,6
@@
static void USB_Device_ClearSetFeature(void)
Endpoint_ClearSETUP();
\r
\r
Endpoint_ClearIN();
\r
Endpoint_ClearSETUP();
\r
\r
Endpoint_ClearIN();
\r
-
\r
- while (!(Endpoint_IsOUTReceived()));
\r
- Endpoint_ClearOUT();
\r
}
\r
\r
#endif
\r
}
\r
\r
#endif
\r