Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
f469eb77
Commit
f469eb77
authored
Aug 06, 2018
by
Dean Camera
Browse files
Add const qualifiers to class driver callback parameters, fix parameter naming.
parent
2a057a72
Changes
4
Hide whitespace changes
Inline
Side-by-side
Demos/Device/ClassDriver/CCID/CCID.c
View file @
f469eb77
...
...
@@ -158,7 +158,7 @@ void EVENT_USB_Device_ControlRequest(void)
* THe slot must reply back with a recognizable ATR (answer to reset)
*/
uint8_t
CALLBACK_CCID_IccPowerOn
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
slot
,
const
uint8_t
slot
,
uint8_t
*
const
atr
,
uint8_t
*
const
attrSize
,
uint8_t
*
const
error
)
...
...
@@ -180,7 +180,7 @@ uint8_t CALLBACK_CCID_IccPowerOn(USB_ClassInfo_CCID_Device_t* const CCIDInterfac
* whenever an application at the host wants to send a power off signal to a slot.
*/
uint8_t
CALLBACK_CCID_IccPowerOff
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
slot
,
const
uint8_t
slot
,
uint8_t
*
const
error
)
{
if
(
slot
<
CCID_Interface
.
Config
.
TotalSlots
)
...
...
@@ -200,7 +200,7 @@ uint8_t CALLBACK_CCID_IccPowerOff(USB_ClassInfo_CCID_Device_t* const CCIDInterfa
*
*/
uint8_t
CALLBACK_CCID_GetSlotStatus
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
slot
,
const
uint8_t
slot
,
uint8_t
*
const
error
)
{
if
(
slot
<
CCID_Interface
.
Config
.
TotalSlots
)
...
...
@@ -220,7 +220,7 @@ uint8_t CALLBACK_CCID_GetSlotStatus(USB_ClassInfo_CCID_Device_t* const CCIDInter
* given slot.
*/
uint8_t
CALLBACK_CCID_SetParameters_T0
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Error
,
USB_CCID_ProtocolData_T0_t
*
const
T0
)
{
...
...
@@ -244,7 +244,7 @@ uint8_t CALLBACK_CCID_SetParameters_T0(USB_ClassInfo_CCID_Device_t* const CCIDIn
* a given slot.
*/
uint8_t
CALLBACK_CCID_GetParameters_T0
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Error
,
uint8_t
*
const
ProtocolNum
,
USB_CCID_ProtocolData_T0_t
*
const
T0
)
...
...
@@ -269,9 +269,9 @@ uint8_t CALLBACK_CCID_GetParameters_T0(USB_ClassInfo_CCID_Device_t* const CCIDIn
* THe device reply back with an array of bytes
*/
uint8_t
CALLBACK_CCID_XfrBlock
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
uint8_t
*
const
ReceivedBuffer
,
uint8_t
ReceivedBufferSize
,
const
uint8_t
Slot
,
const
uint8_t
*
ReceivedBuffer
,
const
uint8_t
ReceivedBufferSize
,
uint8_t
*
const
SendBuffer
,
uint8_t
*
const
SentBufferSize
,
uint8_t
*
const
Error
)
...
...
@@ -294,8 +294,8 @@ uint8_t CALLBACK_CCID_XfrBlock(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceI
}
uint8_t
CALLBACK_CCID_Abort
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
uint8_t
Seq
,
const
uint8_t
Slot
,
const
uint8_t
Seq
,
uint8_t
*
const
Error
)
{
if
(
CCID_Interface
.
State
.
Aborted
&&
Slot
==
0
&&
CCID_Interface
.
State
.
AbortedSeq
==
Seq
)
...
...
Demos/Device/ClassDriver/CCID/CCID.h
View file @
f469eb77
...
...
@@ -76,26 +76,26 @@
void
EVENT_USB_Device_ControlRequest
(
void
);
uint8_t
CALLBACK_CCID_IccPowerOn
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
s
lot
,
uint8_t
*
const
a
tr
,
uint8_t
*
const
a
trSize
,
uint8_t
*
const
e
rror
);
const
uint8_t
S
lot
,
uint8_t
*
const
A
tr
,
uint8_t
*
const
A
trSize
,
uint8_t
*
const
E
rror
);
uint8_t
CALLBACK_CCID_IccPowerOff
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
s
lot
,
uint8_t
*
const
e
rror
);
const
uint8_t
S
lot
,
uint8_t
*
const
E
rror
);
uint8_t
CALLBACK_CCID_GetSlotStatus
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
s
lot
,
uint8_t
*
const
e
rror
);
const
uint8_t
S
lot
,
uint8_t
*
const
E
rror
);
uint8_t
CALLBACK_CCID_XfrBlock
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
s
lot
,
uint8_t
*
const
r
eceivedBuffer
,
uint8_t
r
eceivedBufferSize
,
uint8_t
*
const
s
endBuffer
,
uint8_t
*
const
s
entBufferSize
,
uint8_t
*
const
e
rror
);
const
uint8_t
S
lot
,
const
uint8_t
*
R
eceivedBuffer
,
const
uint8_t
R
eceivedBufferSize
,
uint8_t
*
const
S
endBuffer
,
uint8_t
*
const
S
entBufferSize
,
uint8_t
*
const
E
rror
);
uint8_t
CALLBACK_CCID_Abort
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
s
lot
,
uint8_t
s
eq
,
const
uint8_t
S
lot
,
const
uint8_t
S
eq
,
uint8_t
*
const
error
);
#endif
...
...
Demos/Device/LowLevel/CCID/CCID.h
View file @
f469eb77
...
...
@@ -72,18 +72,18 @@
void
SetupHardware
(
void
);
void
CCID_Task
(
void
);
uint8_t
CCID_IccPowerOn
(
uint8_t
s
lot
,
uint8_t
*
const
a
ttr
,
uint8_t
*
const
a
ttrLength
,
uint8_t
*
const
e
rror
);
uint8_t
CCID_IccPowerOff
(
uint8_t
s
lot
,
uint8_t
*
const
e
rror
);
uint8_t
CCID_GetSlotStatus
(
uint8_t
s
lot
,
uint8_t
*
const
e
rror
);
uint8_t
CCID_Abort
(
uint8_t
s
lot
,
uint8_t
s
eq
,
uint8_t
*
const
e
rror
);
bool
CCID_CheckStatusNoError
(
uint8_t
s
tatus
);
uint8_t
CCID_IccPowerOn
(
uint8_t
S
lot
,
uint8_t
*
const
A
ttr
,
uint8_t
*
const
A
ttrLength
,
uint8_t
*
const
E
rror
);
uint8_t
CCID_IccPowerOff
(
uint8_t
S
lot
,
uint8_t
*
const
E
rror
);
uint8_t
CCID_GetSlotStatus
(
uint8_t
S
lot
,
uint8_t
*
const
E
rror
);
uint8_t
CCID_Abort
(
uint8_t
S
lot
,
uint8_t
S
eq
,
uint8_t
*
const
E
rror
);
bool
CCID_CheckStatusNoError
(
uint8_t
S
tatus
);
void
EVENT_USB_Device_Connect
(
void
);
void
EVENT_USB_Device_Disconnect
(
void
);
...
...
LUFA/Drivers/USB/Class/Device/CCIDClassDevice.h
View file @
f469eb77
...
...
@@ -125,7 +125,7 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_IccPowerOn
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Atr
,
uint8_t
*
const
AtrSize
,
uint8_t
*
const
Error
)
ATTR_NON_NULL_PTR_ARG
(
1
);
...
...
@@ -140,7 +140,7 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_IccPowerOff
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Error
)
ATTR_NON_NULL_PTR_ARG
(
1
);
/** CCID class driver callback for PC_TO_RDR_GetSlotStatus CCID message
...
...
@@ -153,7 +153,7 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_GetSlotStatus
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Error
)
ATTR_NON_NULL_PTR_ARG
(
1
);
...
...
@@ -168,9 +168,9 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_SetParameters_T0
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Error
,
USB_CCID_ProtocolData_T0_t
*
const
T0
);
USB_CCID_ProtocolData_T0_t
*
const
T0
)
ATTR_NON_NULL_PTR_ARG
(
1
)
;
/** CCID class driver callback for PC_TO_RDR_SetParameters CCID message for T=0
* Retrieves the current parameters of a given slot
...
...
@@ -183,10 +183,10 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_GetParameters_T0
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
const
uint8_t
Slot
,
uint8_t
*
const
Error
,
uint8_t
*
const
ProtocolNum
,
USB_CCID_ProtocolData_T0_t
*
const
T0
);
USB_CCID_ProtocolData_T0_t
*
const
T0
)
ATTR_NON_NULL_PTR_ARG
(
1
)
;
/** CCID class driver callback for PC_TO_RDR_XfrBlock CCID message
* Send a block of bytes from the host to a slot in the device
...
...
@@ -203,12 +203,12 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_XfrBlock
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
uint8_t
*
const
ReceivedBuffer
,
uint8_t
ReceivedBufferSize
,
const
uint8_t
Slot
,
const
uint8_t
*
ReceivedBuffer
,
const
uint8_t
ReceivedBufferSize
,
uint8_t
*
const
SendBuffer
,
uint8_t
*
const
SentBufferSize
,
uint8_t
*
const
Error
);
uint8_t
*
const
Error
)
ATTR_NON_NULL_PTR_ARG
(
1
)
;
/** CCID class driver callback for CCID_PC_to_RDR_Abort CCID message
* Aborts a BULK out message previously sent to a slot
...
...
@@ -222,8 +222,8 @@
* \return The command result code.
*/
uint8_t
CALLBACK_CCID_Abort
(
USB_ClassInfo_CCID_Device_t
*
const
CCIDInterfaceInfo
,
uint8_t
Slot
,
uint8_t
Seq
,
const
uint8_t
Slot
,
const
uint8_t
Seq
,
uint8_t
*
const
Error
)
ATTR_NON_NULL_PTR_ARG
(
1
);
...
...
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