Use the MIN() macro where possible instead of manual "(x < y) ? x : y" constructs.

[pub/USBasp.git] / Demos / Device / ClassDriver / VirtualSerialMassStorage / Lib / SCSI.c

diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Lib/SCSI.c b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Lib/SCSI.c
index 78783f0..4e5f3b3 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Lib/SCSI.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/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)\r
 {\r
        uint16_t AllocationLength  = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[3]);\r
 static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
        uint16_t AllocationLength  = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[3]);\r

-       uint16_t BytesTransferred  = (AllocationLength < sizeof(InquiryData))? AllocationLength :\r
-                                                                              sizeof(InquiryData);\r
+       uint16_t BytesTransferred  = MIN(AllocationLength, sizeof(InquiryData));\r

 \r
        /* Only the standard INQUIRY data is supported, check if any optional INQUIRY bits set */\r
        if ((MSInterfaceInfo->State.CommandBlock.SCSICommandData[1] & ((1 << 0) | (1 << 1))) ||\r
 \r
        /* Only the standard INQUIRY data is supported, check if any optional INQUIRY bits set */\r
        if ((MSInterfaceInfo->State.CommandBlock.SCSICommandData[1] & ((1 << 0) | (1 << 1))) ||\r


@@ -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)\r
 {\r
        uint8_t  AllocationLength = MSInterfaceInfo->State.CommandBlock.SCSICommandData[4];\r
 static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
        uint8_t  AllocationLength = MSInterfaceInfo->State.CommandBlock.SCSICommandData[4];\r

-       uint8_t  BytesTransferred = (AllocationLength < sizeof(SenseData))? AllocationLength : sizeof(SenseData);\r
+       uint8_t  BytesTransferred = MIN(AllocationLength, sizeof(SenseData));\r

 \r
        Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, NULL);\r
        Endpoint_Null_Stream((AllocationLength - BytesTransferred), NULL);\r
 \r
        Endpoint_Write_Stream_LE(&SenseData, BytesTransferred, NULL);\r
        Endpoint_Null_Stream((AllocationLength - BytesTransferred), NULL);\r