diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-03-23 09:26:41 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-03-23 09:26:41 +0000 |
| commit | 1014dc46f8dbede5b4782e7fc268794f200759df (patch) | |
| tree | 9abb5296608dacb4d142cad90441caf10a7e93b4 /Projects/TempDataLogger | |
| parent | b5ab4df8568a20193ac8ac203e0a6de6d62f3624 (diff) | |
Use the MIN() macro where possible instead of manual "(x < y) ? x : y" constructs.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1723 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Projects/TempDataLogger')
| -rw-r--r-- | Projects/TempDataLogger/Lib/SCSI.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Projects/TempDataLogger/Lib/SCSI.c b/Projects/TempDataLogger/Lib/SCSI.c index b317bce2..b2c192e8 100644 --- a/Projects/TempDataLogger/Lib/SCSI.c +++ b/Projects/TempDataLogger/Lib/SCSI.c @@ -154,8 +154,7 @@ bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) { uint16_t AllocationLength = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[3]); - uint16_t BytesTransferred = (AllocationLength < sizeof(InquiryData))? AllocationLength : - sizeof(InquiryData); + uint16_t BytesTransferred = MIN(AllocationLength, sizeof(InquiryData)); /* Only the standard INQUIRY data is supported, check if any optional INQUIRY bits set */ if ((MSInterfaceInfo->State.CommandBlock.SCSICommandData[1] & ((1 << 0) | (1 << 1))) || @@ -193,7 +192,7 @@ static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* const MSInterfaceInf static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) { uint8_t AllocationLength = MSInterfaceInfo->State.CommandBlock.SCSICommandData[4]; - uint8_t BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData); + uint8_t BytesTransferred = MIN(AllocationLength, sizeof(SenseData)); Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, NULL); Endpoint_Null_Stream((AllocationLength - BytesTransferred), NULL); |