Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Erik Strand
lufa
Commits
8f5ab27d
Commit
8f5ab27d
authored
Mar 23, 2011
by
Dean Camera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the MIN() macro where possible instead of manual "(x < y) ? x : y" constructs.
parent
fa5c8700
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
15 additions
and
22 deletions
+15
-22
Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
+2
-3
Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c
Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c
+2
-3
Demos/Device/ClassDriver/VirtualSerialMassStorage/Lib/SCSI.c
Demos/Device/ClassDriver/VirtualSerialMassStorage/Lib/SCSI.c
+2
-3
Demos/Device/LowLevel/MassStorage/Lib/SCSI.c
Demos/Device/LowLevel/MassStorage/Lib/SCSI.c
+2
-3
Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
+1
-1
Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c
Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c
+2
-3
Projects/TempDataLogger/Lib/SCSI.c
Projects/TempDataLogger/Lib/SCSI.c
+2
-3
Projects/Webserver/Lib/SCSI.c
Projects/Webserver/Lib/SCSI.c
+2
-3
No files found.
Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -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
);
...
...
Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -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
);
...
...
Demos/Device/ClassDriver/VirtualSerialMassStorage/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -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
);
...
...
Demos/Device/LowLevel/MassStorage/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -150,8 +150,7 @@ bool SCSI_DecodeSCSICommand(void)
static
bool
SCSI_Command_Inquiry
(
void
)
{
uint16_t
AllocationLength
=
SwapEndian_16
(
*
(
uint16_t
*
)
&
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
((
CommandBlock
.
SCSICommandData
[
1
]
&
((
1
<<
0
)
|
(
1
<<
1
)))
||
...
...
@@ -188,7 +187,7 @@ static bool SCSI_Command_Inquiry(void)
static
bool
SCSI_Command_Request_Sense
(
void
)
{
uint8_t
AllocationLength
=
CommandBlock
.
SCSICommandData
[
4
];
uint8_t
BytesTransferred
=
(
AllocationLength
<
sizeof
(
SenseData
))
?
AllocationLength
:
sizeof
(
SenseData
)
;
uint8_t
BytesTransferred
=
MIN
(
AllocationLength
,
sizeof
(
SenseData
));
/* Send the SENSE data - this indicates to the host the status of the last command */
Endpoint_Write_Stream_LE
(
&
SenseData
,
BytesTransferred
,
NULL
);
...
...
Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
View file @
8f5ab27d
...
...
@@ -181,7 +181,7 @@ void Webserver_ApplicationCallback(TCP_ConnectionState_t* const ConnectionState,
uint16_t
Length
;
/* Determine the length of the loaded block */
Length
=
(
(
RemLength
>
HTTP_REPLY_BLOCK_SIZE
)
?
HTTP_REPLY_BLOCK_SIZE
:
RemLength
);
Length
=
MIN
(
RemLength
,
HTTP_REPLY_BLOCK_SIZE
);
/* Copy the next buffer sized block of the page to the packet buffer */
strncpy_P
(
BufferDataStr
,
&
HTTPPage
[
PageBlock
*
HTTP_REPLY_BLOCK_SIZE
],
Length
);
...
...
Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -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
);
...
...
Projects/TempDataLogger/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -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
);
...
...
Projects/Webserver/Lib/SCSI.c
View file @
8f5ab27d
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment