Skip to content

Commit

Permalink
Fix mismatched aliased event and event stub function prototypes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@abcminiuser @skullydazed
abcminiuser authored and skullydazed committed Sep 11, 2018
1 parent c7e1b53 commit df8e417
Show file tree
Hide file tree
Showing 14 changed files with 38 additions and 13 deletions.
6 changes: 4 additions & 2 deletions lib/lufa/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
2 changes: 2 additions & 0 deletions lib/lufa/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 2 additions & 0 deletions lib/lufa/Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions lib/lufa/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{

}
Expand Down
2 changes: 1 addition & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 6 additions & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,15 @@ static int CDC_Device_getchar_Blocking(FILE* Stream)
}
#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

5 changes: 3 additions & 2 deletions lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,15 +362,16 @@
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);
void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
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
Expand Down
2 changes: 1 addition & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{

}
Expand Down
2 changes: 1 addition & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ static int CDC_Host_getchar_Blocking(FILE* Stream)
}
#endif

void CDC_Host_Event_Stub(void)
void CDC_Host_Event_Stub(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
{

}
Expand Down
2 changes: 1 addition & 1 deletion lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,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);
Expand Down
9 changes: 9 additions & 0 deletions lib/lufa/LUFA/Drivers/USB/Core/Events.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
6 changes: 4 additions & 2 deletions lib/lufa/LUFA/Drivers/USB/Core/Events.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit df8e417

Please sign in to comment.