diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-23 09:26:41 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-23 09:26:41 +0000 |
| commit | 8f5ab27dc9b2a7c4944a5e7d149f39959ead477e (patch) | |
| tree | 9abb5296608dacb4d142cad90441caf10a7e93b4 /Projects | |
| parent | fa5c8700bc0f9efb36f779e217c9fd1e81f8efb6 (diff) | |
| download | lufa-8f5ab27dc9b2a7c4944a5e7d149f39959ead477e.tar.gz lufa-8f5ab27dc9b2a7c4944a5e7d149f39959ead477e.tar.bz2 lufa-8f5ab27dc9b2a7c4944a5e7d149f39959ead477e.zip | |
Use the MIN() macro where possible instead of manual "(x < y) ? x : y" constructs.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c | 5 | ||||
| -rw-r--r-- | Projects/TempDataLogger/Lib/SCSI.c | 5 | ||||
| -rw-r--r-- | Projects/Webserver/Lib/SCSI.c | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c index d36d88743..746eec939 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c @@ -155,8 +155,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))) || @@ -194,7 +193,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); diff --git a/Projects/TempDataLogger/Lib/SCSI.c b/Projects/TempDataLogger/Lib/SCSI.c index b317bce2a..b2c192e85 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); diff --git a/Projects/Webserver/Lib/SCSI.c b/Projects/Webserver/Lib/SCSI.c index b317bce2a..b2c192e85 100644 --- a/Projects/Webserver/Lib/SCSI.c +++ b/Projects/Webserver/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); |