From 754ea083d4c828318ffc621e00d2053acb842e20 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 27 Aug 2009 08:01:33 +0000
Subject: [PATCH] Fix memory corruption in Host mode Mass Storage Class driver.
---
Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c | 2 +-
Demos/Host/makefile | 2 +-
LUFA/Drivers/USB/Class/Host/MassStorage.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
index 57aba4599..01553354d 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
+++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c
@@ -98,7 +98,7 @@ int main(void)
break;
}
- printf("Mouse Enumerated.\r\n");
+ printf("Mass Storage Device Enumerated.\r\n");
USB_HostState = HOST_STATE_Configured;
break;
case HOST_STATE_Configured:
diff --git a/Demos/Host/makefile b/Demos/Host/makefile
index 2da989302..aa7b4cf70 100644
--- a/Demos/Host/makefile
+++ b/Demos/Host/makefile
@@ -14,5 +14,5 @@
# code.
%:
- #make -C ClassDriver/ $@ -- TODO: Re-enable once Host Mode class drivers complete
+ @echo TODO: Re-enable building of Host mode Class Driver demos once complete
make -C LowLevel/ $@
diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 6c01ed4d8..3db4aafef 100644
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -242,7 +242,7 @@ static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,
}
static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,
- MS_CommandStatusWrapper_t* SCSICommandStatus)
+ MS_CommandStatusWrapper_t* SCSICommandStatus)
{
uint8_t ErrorCode = PIPE_RWSTREAM_NoError;
@@ -252,7 +252,7 @@ static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* MSInterfaceInf
Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipeNumber);
Pipe_Unfreeze();
- if ((ErrorCode = Pipe_Read_Stream_LE(&SCSICommandStatus, sizeof(MS_CommandStatusWrapper_t))) != PIPE_RWSTREAM_NoError)
+ if ((ErrorCode = Pipe_Read_Stream_LE(SCSICommandStatus, sizeof(MS_CommandStatusWrapper_t))) != PIPE_RWSTREAM_NoError)
return ErrorCode;
Pipe_ClearIN();
--
GitLab