diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-15 10:34:29 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-15 10:34:29 +0000 |
| commit | 40631e9fe5f0782c1fbc3019904d1298ac365cd1 (patch) | |
| tree | 947c29ca6189a7943446b476e204ca17591d65e9 /Demos/Device/ClassDriver/MassStorage/Lib | |
| parent | e2e1fe5aad50809f00f6f5258432bd7aa605f47c (diff) | |
| download | lufa-40631e9fe5f0782c1fbc3019904d1298ac365cd1.tar.gz lufa-40631e9fe5f0782c1fbc3019904d1298ac365cd1.tar.bz2 lufa-40631e9fe5f0782c1fbc3019904d1298ac365cd1.zip | |
Fix pointer aliasing warning in the Mass Storage demos.
Diffstat (limited to 'Demos/Device/ClassDriver/MassStorage/Lib')
| -rw-r--r-- | Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c index 08b055fbe..35d5b5952 100644 --- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c +++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c @@ -138,8 +138,7 @@ bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo) */ static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo) { - uint16_t AllocationLength = (((uint16_t)MSInterfaceInfo->State.CommandBlock.SCSICommandData[3] << 8) | - MSInterfaceInfo->State.CommandBlock.SCSICommandData[4]); + uint16_t AllocationLength = SwapEndian_16(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[3]); uint16_t BytesTransferred = (AllocationLength < sizeof(InquiryData))? AllocationLength : sizeof(InquiryData); @@ -257,7 +256,7 @@ static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo BlockAddress = SwapEndian_32(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[2]); /* Load in the 16-bit total blocks (SCSI uses big-endian, so have to reverse the byte order) */ - TotalBlocks = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[7]); + TotalBlocks = SwapEndian_16(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[7]); /* Check if the block address is outside the maximum allowable value for the LUN */ if (BlockAddress >= LUN_MEDIA_BLOCKS) |