gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2025-07-15 12:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops - ensure the SCSI transfer length is correct in the Mass Storage bootloader.

Browse Source
This commit is contained in:
Dean Camera 2013-03-29 10:40:40 +00:00
parent 907cb2459c
commit ddd6632295
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Bootloaders/MassStorage/Lib/SCSI.c
View File

@ -255,14 +255,12 @@ static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
} }
/* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */ /* Determine if the packet is a READ (10) or WRITE (10) command, call appropriate function */
while (TotalBlocks--) for (uint16_t i = 0; i < TotalBlocks; i++)
{ {
if (IsDataRead == DATA_READ) if (IsDataRead == DATA_READ)
VirtualFAT_ReadBlock(BlockAddress); VirtualFAT_ReadBlock(BlockAddress + i);
else else
VirtualFAT_WriteBlock(BlockAddress); VirtualFAT_WriteBlock(BlockAddress + i);
BlockAddress++;
} }
/* Update the bytes transferred counter and succeed the command */ /* Update the bytes transferred counter and succeed the command */

10
Bootloaders/MassStorage/Lib/VirtualFAT.h
View File

@ -139,15 +139,15 @@
enum enum
{ {
/** Boot sector disk block. */ /** Boot sector disk block. */
DISK_BLOCK_BootBlock = 0, DISK_BLOCK_BootBlock = 0,
/** First copy of the FAT table block. */ /** First copy of the FAT table block. */
DISK_BLOCK_FATBlock1 = 1, DISK_BLOCK_FATBlock1 = 1,
/** Second copy of the FAT table block. */ /** Second copy of the FAT table block. */
DISK_BLOCK_FATBlock2 = 2, DISK_BLOCK_FATBlock2 = 2,
/** Root file and directory entries block. */ /** Root file and directory entries block. */
DISK_BLOCK_RootFilesBlock = 3, DISK_BLOCK_RootFilesBlock = 3,
/** Start block of the disk data section. */ /** Start block of the disk data section. */
DISK_BLOCK_DataStartBlock = 4, DISK_BLOCK_DataStartBlock = 4,
}; };
/* Type Definitions: */ /* Type Definitions: */