Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Erik Strand
lufa
Commits
a08a0248
Commit
a08a0248
authored
Jun 17, 2018
by
Dean Camera
Browse files
Fix mismatched aliased event and event stub function prototypes.
parent
d8e0d67c
Changes
14
Hide whitespace changes
Inline
Side-by-side
Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
View file @
a08a0248
...
...
@@ -231,12 +231,14 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C
*/
bool
HostReady
=
(
CDCInterfaceInfo
->
State
.
ControlLineStates
.
HostToDevice
&
CDC_CONTROL_LINE_OUT_DTR
)
!=
0
;
(
void
)
HostReady
;
if
(
CDCInterfaceInfo
==
&
VirtualSerial1_CDC_Interface
)
{
// CDC interface 1's host is ready to send/receive data
// CDC interface 1's host is ready to send/receive data
if HostReady is true
}
else
{
// CDC interface 2's host is ready to send/receive data
// CDC interface 2's host is ready to send/receive data
if HostReady is true
}
}
Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
View file @
a08a0248
...
...
@@ -199,4 +199,6 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C
in the pending data from the USB endpoints.
*/
bool
HostReady
=
(
CDCInterfaceInfo
->
State
.
ControlLineStates
.
HostToDevice
&
CDC_CONTROL_LINE_OUT_DTR
)
!=
0
;
(
void
)
HostReady
;
}
Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
View file @
a08a0248
...
...
@@ -238,6 +238,8 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C
in the pending data from the USB endpoints.
*/
bool
HostReady
=
(
CDCInterfaceInfo
->
State
.
ControlLineStates
.
HostToDevice
&
CDC_CONTROL_LINE_OUT_DTR
)
!=
0
;
(
void
)
HostReady
;
}
/** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.
...
...
Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
View file @
a08a0248
...
...
@@ -279,4 +279,6 @@ void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t *const C
in the pending data from the USB endpoints.
*/
bool
HostReady
=
(
CDCInterfaceInfo
->
State
.
ControlLineStates
.
HostToDevice
&
CDC_CONTROL_LINE_OUT_DTR
)
!=
0
;
(
void
)
HostReady
;
}
LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
View file @
a08a0248
...
...
@@ -188,7 +188,7 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioIn
return
true
;
}
void
Audio_Device_Event_Stub
(
void
)
void
Audio_Device_Event_Stub
(
USB_ClassInfo_Audio_Device_t
*
const
AudioInterfaceInfo
)
{
}
...
...
LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
View file @
a08a0248
...
...
@@ -377,7 +377,7 @@
#if !defined(__DOXYGEN__)
/* Function Prototypes: */
#if defined(__INCLUDE_FROM_AUDIO_DEVICE_C)
void
Audio_Device_Event_Stub
(
void
);
void
Audio_Device_Event_Stub
(
USB_ClassInfo_Audio_Device_t
*
const
AudioInterfaceInfo
);
void
EVENT_Audio_Device_StreamStartStop
(
USB_ClassInfo_Audio_Device_t
*
const
AudioInterfaceInfo
)
ATTR_WEAK
ATTR_NON_NULL_PTR_ARG
(
1
)
ATTR_ALIAS
(
Audio_Device_Event_Stub
);
...
...
LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
View file @
a08a0248
...
...
@@ -355,10 +355,15 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDC
}
#endif
void
CDC_Device_Event_Stub
(
void
)
void
CDC_Device_Event_Stub
(
USB_ClassInfo_CDC_Device_t
*
const
CDCInterfaceInfo
)
{
}
void
CDC_Device_Event_Stub_2
(
USB_ClassInfo_CDC_Device_t
*
const
CDCInterfaceInfo
,
const
uint8_t
_1
)
{
CDC_Device_Event_Stub
(
CDCInterfaceInfo
);
}
#endif
LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
View file @
a08a0248
...
...
@@ -370,7 +370,8 @@
static
int
CDC_Device_getchar_Blocking
(
FILE
*
Stream
)
ATTR_NON_NULL_PTR_ARG
(
1
);
#endif
void
CDC_Device_Event_Stub
(
void
);
void
CDC_Device_Event_Stub
(
USB_ClassInfo_CDC_Device_t
*
const
CDCInterfaceInfo
);
void
CDC_Device_Event_Stub_2
(
USB_ClassInfo_CDC_Device_t
*
const
CDCInterfaceInfo
,
const
uint8_t
_1
);
void
EVENT_CDC_Device_LineEncodingChanged
(
USB_ClassInfo_CDC_Device_t
*
const
CDCInterfaceInfo
)
ATTR_WEAK
ATTR_NON_NULL_PTR_ARG
(
1
)
ATTR_ALIAS
(
CDC_Device_Event_Stub
);
...
...
@@ -378,7 +379,7 @@
ATTR_WEAK
ATTR_NON_NULL_PTR_ARG
(
1
)
ATTR_ALIAS
(
CDC_Device_Event_Stub
);
void
EVENT_CDC_Device_BreakSent
(
USB_ClassInfo_CDC_Device_t
*
const
CDCInterfaceInfo
,
const
uint8_t
Duration
)
ATTR_WEAK
ATTR_NON_NULL_PTR_ARG
(
1
)
ATTR_ALIAS
(
CDC_Device_Event_Stub
);
ATTR_ALIAS
(
CDC_Device_Event_Stub
_2
);
#endif
#endif
...
...
LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
View file @
a08a0248
...
...
@@ -305,7 +305,7 @@ static int PRNT_Device_getchar_Blocking(FILE* Stream)
}
#endif
void
PRNT_Device_Event_Stub
(
void
)
void
PRNT_Device_Event_Stub
(
USB_ClassInfo_PRNT_Device_t
*
const
PRNTInterfaceInfo
)
{
}
...
...
LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
View file @
a08a0248
...
...
@@ -273,7 +273,7 @@
static
int
PRNT_Device_getchar_Blocking
(
FILE
*
Stream
)
ATTR_NON_NULL_PTR_ARG
(
1
);
#endif
void
PRNT_Device_Event_Stub
(
void
);
void
PRNT_Device_Event_Stub
(
USB_ClassInfo_PRNT_Device_t
*
const
PRNTInterfaceInfo
);
void
EVENT_PRNT_Device_SoftReset
(
USB_ClassInfo_PRNT_Device_t
*
const
PRNTInterfaceInfo
)
ATTR_WEAK
ATTR_NON_NULL_PTR_ARG
(
1
)
ATTR_ALIAS
(
PRNT_Device_Event_Stub
);
...
...
LUFA/Drivers/USB/Class/Host/CDCClassHost.c
View file @
a08a0248
...
...
@@ -505,7 +505,7 @@ uint8_t CDC_Host_Flush(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
}
#endif
void
CDC_Host_Event_Stub
(
void
)
void
CDC_Host_Event_Stub
(
USB_ClassInfo_CDC_Host_t
*
const
CDCInterfaceInfo
)
{
}
...
...
LUFA/Drivers/USB/Class/Host/CDCClassHost.h
View file @
a08a0248
...
...
@@ -368,7 +368,7 @@
static
int
CDC_Host_getchar_Blocking
(
FILE
*
Stream
)
ATTR_NON_NULL_PTR_ARG
(
1
);
#endif
void
CDC_Host_Event_Stub
(
void
);
void
CDC_Host_Event_Stub
(
USB_ClassInfo_CDC_Host_t
*
const
CDCInterfaceInfo
);
void
EVENT_CDC_Host_ControLineStateChanged
(
USB_ClassInfo_CDC_Host_t
*
const
CDCInterfaceInfo
)
ATTR_WEAK
ATTR_NON_NULL_PTR_ARG
(
1
)
ATTR_ALIAS
(
CDC_Host_Event_Stub
);
...
...
LUFA/Drivers/USB/Core/Events.c
View file @
a08a0248
...
...
@@ -37,3 +37,12 @@ void USB_Event_Stub(void)
}
void
USB_Event_Stub_2
(
const
uint8_t
_1
)
{
USB_Event_Stub
();
}
void
USB_Event_Stub_3
(
const
uint8_t
_1
,
const
uint8_t
_2
)
{
USB_Event_Stub
();
}
LUFA/Drivers/USB/Core/Events.h
View file @
a08a0248
...
...
@@ -332,19 +332,21 @@
/* Function Prototypes: */
#if defined(__INCLUDE_FROM_EVENTS_C)
void
USB_Event_Stub
(
void
);
void
USB_Event_Stub_2
(
const
uint8_t
_1
);
void
USB_Event_Stub_3
(
const
uint8_t
_1
,
const
uint8_t
_2
);
#if defined(USB_CAN_BE_BOTH)
void
EVENT_USB_UIDChange
(
void
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
#endif
#if defined(USB_CAN_BE_HOST)
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
void
EVENT_USB_Host_HostError
(
const
uint8_t
ErrorCode
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
_2
);
void
EVENT_USB_Host_DeviceAttached
(
void
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
void
EVENT_USB_Host_DeviceUnattached
(
void
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
void
EVENT_USB_Host_DeviceEnumerationComplete
(
void
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
void
EVENT_USB_Host_DeviceEnumerationFailed
(
const
uint8_t
ErrorCode
,
const
uint8_t
SubErrorCode
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
_3
);
void
EVENT_USB_Host_StartOfFrame
(
void
)
ATTR_WEAK
ATTR_ALIAS
(
USB_Event_Stub
);
#endif
...
...
Write
Preview
Supports
Markdown
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