summaryrefslogtreecommitdiffstats
path: root/lib/lufa/LUFA
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2018-06-17 16:06:07 +1000
committerskullydazed <skullydazed@users.noreply.github.com>2018-09-11 12:52:57 -0700
commitdf8e417032bace12d69b5d75aebf257ea5dadb86 (patch)
tree52ab88e56f9b905e2df3485bb79e6031872c28b9 /lib/lufa/LUFA
parentc7e1b53913707487b0218b984367d32fb4466aaa (diff)
Fix mismatched aliased event and event stub function prototypes.
Diffstat (limited to 'lib/lufa/LUFA')
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c7
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h5
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h2
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Core/Events.c9
-rw-r--r--lib/lufa/LUFA/Drivers/USB/Core/Events.h6
10 files changed, 28 insertions, 11 deletions
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
index 08cbeb7061..eb3aa57108 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
@@ -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)
{
}
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
index 920281be59..91938af8cc 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
@@ -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);
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
index 867548c00b..93930bc99e 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
@@ -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
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
index f9a53851a5..55dbbc7266 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
@@ -362,7 +362,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);
@@ -370,7 +371,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
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
index 7209c452dc..668b138b7b 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
@@ -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)
{
}
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
index 5ac5279351..d850842d84 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
@@ -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);
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
index af9ed96e24..cc93f96010 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
@@ -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)
{
}
diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
index f5cc4906ba..8d0d89a03e 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
@@ -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);
diff --git a/lib/lufa/LUFA/Drivers/USB/Core/Events.c b/lib/lufa/LUFA/Drivers/USB/Core/Events.c
index 186557956a..e05fd74194 100644
--- a/lib/lufa/LUFA/Drivers/USB/Core/Events.c
+++ b/lib/lufa/LUFA/Drivers/USB/Core/Events.c
@@ -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();
+}
diff --git a/lib/lufa/LUFA/Drivers/USB/Core/Events.h b/lib/lufa/LUFA/Drivers/USB/Core/Events.h
index 91fb31b620..d37bb3065a 100644
--- a/lib/lufa/LUFA/Drivers/USB/Core/Events.h
+++ b/lib/lufa/LUFA/Drivers/USB/Core/Events.h
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 05:30:48 +0000