@ -139,7 +139,7 @@ bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
*/
*/
static void SCSI_Command_Inquiry ( USB_ClassInfo_MS_Device_t * const MSInterfaceInfo )
static void SCSI_Command_Inquiry ( USB_ClassInfo_MS_Device_t * const MSInterfaceInfo )
{
{
uint16_t AllocationLength = SwapEndian_16 ( * ( uint 32 _t* ) & MSInterfaceInfo - > State . CommandBlock . SCSICommandData [ 3 ] ) ;
uint16_t AllocationLength = SwapEndian_16 ( * ( uint 16 _t* ) & MSInterfaceInfo - > State . CommandBlock . SCSICommandData [ 3 ] ) ;
uint16_t BytesTransferred = ( AllocationLength < sizeof ( InquiryData ) ) ? AllocationLength :
uint16_t BytesTransferred = ( AllocationLength < sizeof ( InquiryData ) ) ? AllocationLength :
sizeof ( InquiryData ) ;
sizeof ( InquiryData ) ;
@ -257,7 +257,7 @@ static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfa
BlockAddress = SwapEndian_32 ( * ( uint32_t * ) & MSInterfaceInfo - > State . CommandBlock . SCSICommandData [ 2 ] ) ;
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) */
/* Load in the 16-bit total blocks (SCSI uses big-endian, so have to reverse the byte order) */
TotalBlocks = SwapEndian_16 ( * ( uint 32 _t* ) & MSInterfaceInfo - > State . CommandBlock . SCSICommandData [ 7 ] ) ;
TotalBlocks = SwapEndian_16 ( * ( uint 16 _t* ) & MSInterfaceInfo - > State . CommandBlock . SCSICommandData [ 7 ] ) ;
/* Check if the block address is outside the maximum allowable value for the LUN */
/* Check if the block address is outside the maximum allowable value for the LUN */
if ( BlockAddress > = VIRTUAL_MEMORY_BLOCKS )
if ( BlockAddress > = VIRTUAL_MEMORY_BLOCKS )