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/LowLevel | |
| 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/LowLevel')
| -rw-r--r-- | Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h | 8 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MassStorage/Lib/SCSI.c | 5 | ||||
| -rw-r--r-- | Demos/Device/LowLevel/MassStorage/MassStorage.h | 10 |
3 files changed, 11 insertions, 12 deletions
diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h index 6fcf3916f..330666641 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h +++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h @@ -65,6 +65,14 @@ */ #define VIRTUAL_MEMORY_BLOCKS (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE) + /** Total number of Logical Units (drives) in the device. The total device capacity is shared equally between + * each drive - this can be set to any positive non-zero amount. + */ + #define TOTAL_LUNS 1 + + /** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */ + #define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS) + /* Function Prototypes: */ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlocks); void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBlocks); diff --git a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c index 111c3b726..46c71c35c 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c +++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.c @@ -136,8 +136,7 @@ bool SCSI_DecodeSCSICommand(void) */ static void SCSI_Command_Inquiry(void) { - uint16_t AllocationLength = (((uint16_t)CommandBlock.SCSICommandData[3] << 8) | - CommandBlock.SCSICommandData[4]); + uint16_t AllocationLength = SwapEndian_16(*(uint32_t*)&CommandBlock.SCSICommandData[3]); uint16_t BytesTransferred = (AllocationLength < sizeof(InquiryData))? AllocationLength : sizeof(InquiryData); @@ -260,7 +259,7 @@ static void SCSI_Command_ReadWrite_10(const bool IsDataRead) BlockAddress = SwapEndian_32(*(uint32_t*)&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*)&CommandBlock.SCSICommandData[7]); + TotalBlocks = SwapEndian_16(*(uint32_t*)&CommandBlock.SCSICommandData[7]); /* Check if the block address is outside the maximum allowable value for the LUN */ if (BlockAddress >= LUN_MEDIA_BLOCKS) diff --git a/Demos/Device/LowLevel/MassStorage/MassStorage.h b/Demos/Device/LowLevel/MassStorage/MassStorage.h index 0d05283f3..97b9de04f 100644 --- a/Demos/Device/LowLevel/MassStorage/MassStorage.h +++ b/Demos/Device/LowLevel/MassStorage/MassStorage.h @@ -60,15 +60,7 @@ #define REQ_GetMaxLUN 0xFE /** Maximum length of a SCSI command which can be issued by the device or host in a Mass Storage bulk wrapper. */ - #define MAX_SCSI_COMMAND_LENGTH 16 - - /** Total number of Logical Units (drives) in the device. The total device capacity is shared equally between - * each drive - this can be set to any positive non-zero amount. - */ - #define TOTAL_LUNS 1 - - /** Blocks in each LUN, calculated from the total capacity divided by the total number of Logical Units in the device. */ - #define LUN_MEDIA_BLOCKS (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS) + #define MAX_SCSI_COMMAND_LENGTH 16 /** Magic signature for a Command Block Wrapper used in the Mass Storage Bulk-Only transport protocol. */ #define CBW_SIGNATURE 0x43425355UL |