Added new RNDIS Host class driver and the beginnings of a RNDISEthernetHost Class...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / MassStorage.c

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index d1622c1..75b8ef4 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -289,9 +289,6 @@ static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* const MSInterf
 \r
 uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
 {\r
 \r
 uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)\r
 {\r

-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
-\r

        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r
        USB_ControlRequest = (USB_Request_Header_t)\r
                {\r
                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),\r


@@ -308,9 +305,6 @@ uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
 \r
 uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_t* const MaxLUNIndex)\r
 {\r
 \r
 uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, uint8_t* const MaxLUNIndex)\r
 {\r

-       if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
-         return HOST_SENDCONTROL_DeviceDisconnect;\r
-\r

        uint8_t ErrorCode;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r
        uint8_t ErrorCode;\r
 \r
        USB_ControlRequest = (USB_Request_Header_t)\r


@@ -334,7 +328,7 @@ uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, c
                                SCSI_Inquiry_Response_t* const InquiryData)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
                                SCSI_Inquiry_Response_t* const InquiryData)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

          \r
        uint8_t ErrorCode;\r
 \r
          \r
        uint8_t ErrorCode;\r
 \r


@@ -370,7 +364,7 @@ uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, c
 uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
 uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, const uint8_t LUNIndex)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;      \r
 \r
 \r
        uint8_t ErrorCode;      \r
 \r


@@ -407,7 +401,7 @@ uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInf
                                    SCSI_Capacity_t* const DeviceCapacity)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
                                    SCSI_Capacity_t* const DeviceCapacity)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -451,7 +445,7 @@ uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo, con
                              SCSI_Request_Sense_Response_t* const SenseData)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
                              SCSI_Request_Sense_Response_t* const SenseData)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -488,7 +482,7 @@ uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* const MSInter
                                           const bool PreventRemoval)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
                                           const bool PreventRemoval)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -525,7 +519,7 @@ uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
                                  const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
                                  const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r


@@ -566,7 +560,7 @@ uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo
                                   const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r
                                   const uint8_t Blocks, const uint16_t BlockSize, void* BlockBuffer)\r
 {\r
        if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))\r

-         return HOST_SENDCONTROL_DeviceDisconnect;\r
+         return HOST_SENDCONTROL_DeviceDisconnected;\r

 \r
        uint8_t ErrorCode;\r
 \r
 \r
        uint8_t ErrorCode;\r
 \r