diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-04-22 13:03:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-04-22 13:03:11 +0000 |
| commit | d860e9e842c05e759214f5170f78783decae9956 (patch) | |
| tree | 688f408e32d6f4d205fce4bd33e953199c9ea7dc /Demos/Host/MassStorageHost | |
| parent | e5e7eaee7af719cee00a8c2cb6fb4649dde0aa05 (diff) | |
| download | lufa-d860e9e842c05e759214f5170f78783decae9956.tar.gz lufa-d860e9e842c05e759214f5170f78783decae9956.tar.bz2 lufa-d860e9e842c05e759214f5170f78783decae9956.zip | |
USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode rather than having the library pass only partially read header data to the application.
The USB_UnhandledControlPacket event has had its parameters removed, in favour of accessing the new USB_ControlRequest structure.
The Endpoint control stream functions now correctly send a ZLP to the host when less data than requested is sent.
Diffstat (limited to 'Demos/Host/MassStorageHost')
| -rw-r--r-- | Demos/Host/MassStorageHost/MassStorageHost.c | 2 | ||||
| -rw-r--r-- | Demos/Host/MassStorageHost/MassStoreCommands.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c index 9352562de..c55a167cc 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/MassStorageHost/MassStorageHost.c @@ -155,7 +155,7 @@ TASK(USB_MassStore_Host) {
case HOST_STATE_Addressed:
/* Standard request to set the device configuration to configuration 1 */
- USB_HostRequest = (USB_Host_Request_Header_t)
+ USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
.bRequest = REQ_SetConfiguration,
diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.c b/Demos/Host/MassStorageHost/MassStoreCommands.c index 864edf30c..d4df205b1 100644 --- a/Demos/Host/MassStorageHost/MassStoreCommands.c +++ b/Demos/Host/MassStorageHost/MassStoreCommands.c @@ -250,7 +250,7 @@ static uint8_t MassStore_GetReturnedStatus(void) */
uint8_t MassStore_ClearPipeStall(const uint8_t EndpointNum)
{
- USB_HostRequest = (USB_Host_Request_Header_t)
+ USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),
.bRequest = REQ_ClearFeature,
@@ -272,7 +272,7 @@ uint8_t MassStore_ClearPipeStall(const uint8_t EndpointNum) */
uint8_t MassStore_MassStorageReset(void)
{
- USB_HostRequest = (USB_Host_Request_Header_t)
+ USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
.bRequest = REQ_MassStorageReset,
@@ -298,7 +298,7 @@ uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex) {
uint8_t ErrorCode;
- USB_HostRequest = (USB_Host_Request_Header_t)
+ USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
.bRequest = REQ_GetMaxLUN,
|