diff options
271 files changed, 1316 insertions, 625 deletions
| diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index c7dcf5535e..e808fcfe1e 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -201,7 +201,9 @@ USB_Descriptor_String_t ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index 845ab55658..f8e557ccfb 100644 --- a/Bootloaders/CDC/Descriptors.h +++ b/Bootloaders/CDC/Descriptors.h @@ -140,7 +140,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index 1e9ec45876..4e7272cb71 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -143,7 +143,9 @@ USB_Descriptor_String_t ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index 3cf152639f..d89cc90463 100644 --- a/Bootloaders/DFU/Descriptors.h +++ b/Bootloaders/DFU/Descriptors.h @@ -166,7 +166,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c index 006e45b5b7..2a58064fba 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c @@ -271,7 +271,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h index 79825bd40f..30249e9cb4 100644 --- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h +++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h @@ -76,7 +76,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c index a9a5f05a19..0fc52a667d 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c @@ -271,7 +271,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h index ff7f0bbc6b..4804c2c84f 100644 --- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h +++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h @@ -76,7 +76,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c index 5a89cc8b15..d50e27d436 100644 --- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c +++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c @@ -338,7 +338,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h index 8cebab3791..968ddd3752 100644 --- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h +++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h @@ -96,7 +96,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c index 35b655949b..b0413a6573 100644 --- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c +++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c @@ -189,7 +189,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.h b/Demos/Device/ClassDriver/GenericHID/Descriptors.h index 410e1954fb..2192da6970 100644 --- a/Demos/Device/ClassDriver/GenericHID/Descriptors.h +++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.h @@ -66,7 +66,8 @@  		#define GENERIC_REPORT_SIZE       8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); - +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +											  #endif diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.c b/Demos/Device/ClassDriver/GenericHID/GenericHID.c index de01ef5800..8b51b76571 100644 --- a/Demos/Device/ClassDriver/GenericHID/GenericHID.c +++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.c @@ -143,8 +143,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	if (HIDReportEcho.ReportID)  	  *ReportID = HIDReportEcho.ReportID; @@ -163,8 +166,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	HIDReportEcho.ReportID   = ReportID;  	HIDReportEcho.ReportSize = ReportSize; diff --git a/Demos/Device/ClassDriver/GenericHID/GenericHID.h b/Demos/Device/ClassDriver/GenericHID/GenericHID.h index 6327958623..8fa0b9354a 100644 --- a/Demos/Device/ClassDriver/GenericHID/GenericHID.h +++ b/Demos/Device/ClassDriver/GenericHID/GenericHID.h @@ -72,9 +72,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c index ec46c3f512..125297d5d2 100644 --- a/Demos/Device/ClassDriver/Joystick/Descriptors.c +++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c @@ -199,7 +199,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h index a80260c1a4..fc8cbe537f 100644 --- a/Demos/Device/ClassDriver/Joystick/Descriptors.h +++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h @@ -63,7 +63,9 @@  		#define JOYSTICK_EPSIZE              8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress)  		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.c b/Demos/Device/ClassDriver/Joystick/Joystick.c index 9c6311a176..e2804d6e0c 100644 --- a/Demos/Device/ClassDriver/Joystick/Joystick.c +++ b/Demos/Device/ClassDriver/Joystick/Joystick.c @@ -137,8 +137,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData; @@ -173,8 +176,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports  } diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.h b/Demos/Device/ClassDriver/Joystick/Joystick.h index 1cb3d9580b..fc06634ffc 100644 --- a/Demos/Device/ClassDriver/Joystick/Joystick.h +++ b/Demos/Device/ClassDriver/Joystick/Joystick.h @@ -85,9 +85,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.h b/Demos/Device/ClassDriver/Keyboard/Descriptors.h index 7ea7f47a44..4100faabac 100644 --- a/Demos/Device/ClassDriver/Keyboard/Descriptors.h +++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.h @@ -63,7 +63,8 @@  		#define KEYBOARD_EPSIZE              8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.c b/Demos/Device/ClassDriver/Keyboard/Keyboard.c index f194f397b9..80f0ad9883 100644 --- a/Demos/Device/ClassDriver/Keyboard/Keyboard.c +++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.c @@ -178,8 +178,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	uint8_t  LEDMask   = LEDS_NO_LEDS;  	uint8_t* LEDReport = (uint8_t*)ReportData; diff --git a/Demos/Device/ClassDriver/Keyboard/Keyboard.h b/Demos/Device/ClassDriver/Keyboard/Keyboard.h index df272e216d..4c4e2d5d82 100644 --- a/Demos/Device/ClassDriver/Keyboard/Keyboard.h +++ b/Demos/Device/ClassDriver/Keyboard/Keyboard.h @@ -75,9 +75,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c index fa34436bde..c510ce629a 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c @@ -275,7 +275,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h index 3dd2ec7b91..b4bf3d2728 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h +++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h @@ -69,7 +69,8 @@  		#define HID_EPSIZE                8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c index b032f8707a..43634eac3b 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c @@ -165,8 +165,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	uint8_t JoyStatus_LCL    = Joystick_GetStatus();  	uint8_t ButtonStatus_LCL = Buttons_GetStatus(); @@ -232,8 +235,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	if (HIDInterfaceInfo == &Keyboard_HID_Interface)  	{ diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h index 34c1467ef1..9cbba7aaa1 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h +++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.h @@ -70,9 +70,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c index 640c832244..9ce300afc5 100644 --- a/Demos/Device/ClassDriver/MIDI/Descriptors.c +++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c @@ -283,7 +283,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h index 9933d060e5..fc648de4b2 100644 --- a/Demos/Device/ClassDriver/MIDI/Descriptors.h +++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h @@ -75,7 +75,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.c b/Demos/Device/ClassDriver/MassStorage/Descriptors.c index d7d41c5bba..b1744e6859 100644 --- a/Demos/Device/ClassDriver/MassStorage/Descriptors.c +++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.c @@ -174,7 +174,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.h b/Demos/Device/ClassDriver/MassStorage/Descriptors.h index a13ee013f5..b7d15e48fe 100644 --- a/Demos/Device/ClassDriver/MassStorage/Descriptors.h +++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.h @@ -66,7 +66,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c index bf0b33074f..64db4466c1 100644 --- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c +++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.c @@ -47,7 +47,9 @@   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write   */ -void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                  const uint32_t BlockAddress, +                                  uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -181,7 +183,9 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read   */ -void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                 const uint32_t BlockAddress, +                                 uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -289,7 +293,9 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf   *  \param[in] TotalBlocks   Number of blocks of data to write   *  \param[in] BufferPtr     Pointer to the data source RAM buffer   */ -void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +                                      uint16_t TotalBlocks, +                                      uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -388,7 +394,9 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota   *  \param[in] TotalBlocks   Number of blocks of data to read   *  \param[out] BufferPtr    Pointer to the data destination RAM buffer   */ -void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +                                     uint16_t TotalBlocks, +                                     uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h index f3e1b65262..f162c03b29 100644 --- a/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h +++ b/Demos/Device/ClassDriver/MassStorage/Lib/DataflashManager.h @@ -67,13 +67,17 @@  		#define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)  	/* Function Prototypes: */ -		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                  const uint32_t BlockAddress,  		                                  uint16_t TotalBlocks); -		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                 const uint32_t BlockAddress,  		                                 uint16_t TotalBlocks); -		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +		                                      uint16_t TotalBlocks,  		                                      uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3); -		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +		                                     uint16_t TotalBlocks,  		                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);  		void DataflashManager_ResetDataflashProtections(void);  		bool DataflashManager_CheckDataflashOperation(void); diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c index 0bc92c1d41..fcda46c033 100644 --- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c +++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.c @@ -247,7 +247,8 @@ static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInte   *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with   *  \param[in] IsDataRead  Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)   */ -static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead) +static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                      const bool IsDataRead)  {  	uint32_t BlockAddress = SwapEndian_32(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[2]);  	uint16_t TotalBlocks  = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[7]); diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h index dab3ebb001..0c00cfb4ff 100644 --- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h +++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h @@ -80,7 +80,8 @@  			static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -			static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead); +			static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +			                                      const bool IsDataRead);  		#endif  #endif diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c index 4bd2e48850..f8c2ff7443 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c @@ -254,7 +254,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h index 70b161d93d..50c618664b 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h @@ -77,7 +77,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.c b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.c index f3a0ea17c5..00016b0a2d 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.c +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.c @@ -47,7 +47,9 @@   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write   */ -void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                  const uint32_t BlockAddress, +                                  uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -181,7 +183,9 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read   */ -void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                 const uint32_t BlockAddress, +                                 uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -289,7 +293,9 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf   *  \param[in] TotalBlocks   Number of blocks of data to write   *  \param[in] BufferPtr     Pointer to the data source RAM buffer   */ -void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +                                      uint16_t TotalBlocks, +                                      uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -388,7 +394,9 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota   *  \param[in] TotalBlocks   Number of blocks of data to read   *  \param[out] BufferPtr    Pointer to the data destination RAM buffer   */ -void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +                                     uint16_t TotalBlocks, +                                     uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h index 585af0ddca..f1f0ec734a 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/DataflashManager.h @@ -70,13 +70,17 @@  		#define LUN_MEDIA_BLOCKS                   (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS)  	/* Function Prototypes: */ -		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                  const uint32_t BlockAddress,  		                                  uint16_t TotalBlocks); -		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                 const uint32_t BlockAddress,  		                                 uint16_t TotalBlocks); -		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +		                                      uint16_t TotalBlocks,  		                                      uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3); -		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +		                                     uint16_t TotalBlocks,  		                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);  		void DataflashManager_ResetDataflashProtections(void); diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c index fb9bda1a81..c55af622d1 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.c @@ -300,7 +300,8 @@ static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInte   *   *  \return Boolean true if the command completed successfully, false otherwise.   */ -static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead) +static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                      const bool IsDataRead)  {  	uint32_t BlockAddress;  	uint16_t TotalBlocks; diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.h index 125bce4086..6025d866f0 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.h +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Lib/SCSI.h @@ -81,7 +81,8 @@  			static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -			static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead); +			static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +			                                      const bool IsDataRead);  		#endif  #endif diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c index 330252fc84..2a6e3dd785 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c @@ -185,8 +185,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData; @@ -223,8 +226,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	uint8_t  LEDMask   = LEDS_NO_LEDS;  	uint8_t* LEDReport = (uint8_t*)ReportData; diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h index a6a16d1050..6e1a083688 100644 --- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h +++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.h @@ -86,10 +86,15 @@  		bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); - +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.c b/Demos/Device/ClassDriver/Mouse/Descriptors.c index 703051e844..66db661c07 100644 --- a/Demos/Device/ClassDriver/Mouse/Descriptors.c +++ b/Demos/Device/ClassDriver/Mouse/Descriptors.c @@ -199,7 +199,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.h b/Demos/Device/ClassDriver/Mouse/Descriptors.h index 2c77d7841e..59910dec4d 100644 --- a/Demos/Device/ClassDriver/Mouse/Descriptors.h +++ b/Demos/Device/ClassDriver/Mouse/Descriptors.h @@ -63,7 +63,8 @@  		#define MOUSE_EPSIZE              8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.c b/Demos/Device/ClassDriver/Mouse/Mouse.c index f242736285..19ca0132af 100644 --- a/Demos/Device/ClassDriver/Mouse/Mouse.c +++ b/Demos/Device/ClassDriver/Mouse/Mouse.c @@ -137,8 +137,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData; @@ -173,8 +176,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports  } diff --git a/Demos/Device/ClassDriver/Mouse/Mouse.h b/Demos/Device/ClassDriver/Mouse/Mouse.h index c3d9ce6942..9a3c6e5544 100644 --- a/Demos/Device/ClassDriver/Mouse/Mouse.h +++ b/Demos/Device/ClassDriver/Mouse/Mouse.h @@ -76,9 +76,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c index 4857892f22..21b4fbb4a1 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c @@ -212,7 +212,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h index 8e8cde25eb..7d6c3b99bb 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h @@ -77,7 +77,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.c index 6cbc67f89d..18da19cdb2 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.c @@ -46,7 +46,8 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t ARP_ProcessARPPacket(void* InDataStart, void* OutDataStart) +int16_t ARP_ProcessARPPacket(void* InDataStart, +                             void* OutDataStart)  {  	DecodeARPHeader(InDataStart); diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.h index 6ae9b7be3e..8de76f3b62 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ARP.h @@ -69,6 +69,7 @@  		} ARP_Header_t;  	/* Function Prototypes: */ -		int16_t ARP_ProcessARPPacket(void* InDataStart, void* OutDataStart); +		int16_t ARP_ProcessARPPacket(void* InDataStart, +		                             void* OutDataStart);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.c index 761c6adf14..f694f2c819 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.c @@ -46,7 +46,9 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, void* DHCPHeaderInStart, void* DHCPHeaderOutStart) +int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, +                               void* DHCPHeaderInStart, +                               void* DHCPHeaderOutStart)  {  	IP_Header_t*   IPHeaderIN    = (IP_Header_t*)IPHeaderInStart;  	DHCP_Header_t* DHCPHeaderIN  = (DHCP_Header_t*)DHCPHeaderInStart; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.h index 2c8c4d8843..3bfdb29be8 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/DHCP.h @@ -120,6 +120,8 @@  		} DHCP_Header_t;  	/* Function Prototypes: */ -		int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, void* DHCPHeaderInStart, void* DHCPHeaderOutStart); +		int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, +		                               void* DHCPHeaderInStart, +		                               void* DHCPHeaderOutStart);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.c index e34f824e93..5f396234c2 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.c @@ -56,7 +56,8 @@ const IP_Address_t  ClientIPAddress     = {CLIENT_IP_ADDRESS};  /** Processes an incoming Ethernet frame, and writes the appropriate response to the output Ethernet   *  frame buffer if the sub protocol handlers create a valid response.   */ -void Ethernet_ProcessPacket(Ethernet_Frame_Info_t* FrameIN, Ethernet_Frame_Info_t* FrameOUT) +void Ethernet_ProcessPacket(Ethernet_Frame_Info_t* const FrameIN, +                            Ethernet_Frame_Info_t* const FrameOUT)  {  	DecodeEthernetFrameHeader(FrameIN); @@ -115,7 +116,8 @@ void Ethernet_ProcessPacket(Ethernet_Frame_Info_t* FrameIN, Ethernet_Frame_Info_   *   *  \return A 16-bit Ethernet checksum value   */ -uint16_t Ethernet_Checksum16(void* Data, uint16_t Bytes) +uint16_t Ethernet_Checksum16(void* Data, +                             uint16_t Bytes)  {  	uint16_t* Words    = (uint16_t*)Data;  	uint32_t  Checksum = 0; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h index f8b8bffdea..233f48d1b8 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Ethernet.h @@ -96,7 +96,9 @@  		extern const IP_Address_t  ClientIPAddress;  	/* Function Prototypes: */ -		void     Ethernet_ProcessPacket(Ethernet_Frame_Info_t* FrameIN, Ethernet_Frame_Info_t* FrameOUT); -		uint16_t Ethernet_Checksum16(void* Data, uint16_t Bytes); +		void     Ethernet_ProcessPacket(Ethernet_Frame_Info_t* const FrameIN, +		                                Ethernet_Frame_Info_t* const FrameOUT); +		uint16_t Ethernet_Checksum16(void* Data, +		                             uint16_t Bytes);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.c index fa1a651e6e..fec74b37bd 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.c @@ -46,7 +46,9 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t ICMP_ProcessICMPPacket(Ethernet_Frame_Info_t* FrameIN, void* InDataStart, void* OutDataStart) +int16_t ICMP_ProcessICMPPacket(Ethernet_Frame_Info_t* const FrameIN, +                               void* InDataStart, +                               void* OutDataStart)  {  	ICMP_Header_t* ICMPHeaderIN  = (ICMP_Header_t*)InDataStart;  	ICMP_Header_t* ICMPHeaderOUT = (ICMP_Header_t*)OutDataStart; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.h index 4fe42957c1..9982560b17 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ICMP.h @@ -75,6 +75,8 @@  		} ICMP_Header_t;  	/* Function Prototypes: */ -		int16_t ICMP_ProcessICMPPacket(Ethernet_Frame_Info_t* FrameIN, void* InDataStart, void* OutDataStart); +		int16_t ICMP_ProcessICMPPacket(Ethernet_Frame_Info_t* const FrameIN, +		                               void* InDataStart, +		                               void* OutDataStart);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.c index 6766322ca4..6f49eac88d 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.c @@ -47,7 +47,9 @@   *           response was generated, NO_PROCESS if the packet processing was deferred until the   *           next Ethernet packet handler iteration   */ -int16_t IP_ProcessIPPacket(Ethernet_Frame_Info_t* FrameIN, void* InDataStart, void* OutDataStart) +int16_t IP_ProcessIPPacket(Ethernet_Frame_Info_t* const FrameIN, +                           void* InDataStart, +                           void* OutDataStart)  {  	DecodeIPHeader(InDataStart); diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h index ede537acef..215695756f 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/IP.h @@ -90,6 +90,8 @@  		} IP_Header_t;  	/* Function Prototypes: */ -		int16_t IP_ProcessIPPacket(Ethernet_Frame_Info_t* FrameIN, void* InDataStart, void* OutDataStart); +		int16_t IP_ProcessIPPacket(Ethernet_Frame_Info_t* const FrameIN, +		                           void* InDataStart, +		                           void* OutDataStart);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c index e0bf6ecfe9..676bf7a94d 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.c @@ -53,7 +53,7 @@   *   *  \param[in] FrameINData  Pointer to the start of an Ethernet frame information structure   */ -void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* FrameINData) +void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* const FrameINData)  {  	#if !defined(NO_DECODE_ETHERNET)  	Ethernet_Frame_Header_t* FrameHeader = (Ethernet_Frame_Header_t*)FrameINData->FrameData; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h index 56ed795e6a..c1d3b395dd 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/ProtocolDecoders.h @@ -48,7 +48,7 @@  		#include "Ethernet.h"  	/* Function Prototypes: */ -		void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* FrameINData); +		void DecodeEthernetFrameHeader(Ethernet_Frame_Info_t* const FrameINData);  		void DecodeARPHeader(void* InDataStart);  		void DecodeIPHeader(void* InDataStart);  		void DecodeICMPHeader(void* InDataStart); diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.c index 6b62edb13a..e0c581f599 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.c @@ -55,7 +55,7 @@ TCP_ConnectionState_t  ConnectionStateTable[MAX_TCP_CONNECTIONS];   *  level. If an application produces a response, this task constructs the appropriate Ethernet frame and places it into the Ethernet OUT   *  buffer for later transmission.   */ -void TCP_TCPTask(USB_ClassInfo_RNDIS_Device_t* RNDISInterfaceInfo) +void TCP_TCPTask(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)  {  	/* Run each application in sequence, to process incoming and generate outgoing packets */  	for (uint8_t CSTableEntry = 0; CSTableEntry < MAX_TCP_CONNECTIONS; CSTableEntry++) @@ -178,7 +178,9 @@ void TCP_Init(void)   *   *  \return Boolean true if the port state was set, false otherwise (no more space in the port state table)   */ -bool TCP_SetPortState(uint16_t Port, uint8_t State, void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*)) +bool TCP_SetPortState(const uint16_t Port, +                      const uint8_t State, +                      void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*))  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -225,7 +227,7 @@ bool TCP_SetPortState(uint16_t Port, uint8_t State, void (*Handler)(TCP_Connecti   *   *  \return A value from the TCP_PortStates_t enum   */ -uint8_t TCP_GetPortState(uint16_t Port) +uint8_t TCP_GetPortState(const uint16_t Port)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -250,7 +252,10 @@ uint8_t TCP_GetPortState(uint16_t Port)   *   *  \return Boolean true if the connection was updated or created, false otherwise (no more space in the connection state table)   */ -bool TCP_SetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort, uint8_t State) +bool TCP_SetConnectionState(const uint16_t Port, +                            const IP_Address_t RemoteAddress, +                            const uint16_t RemotePort, +                            const uint8_t State)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -290,7 +295,9 @@ bool TCP_SetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t   *   *  \return A value from the TCP_ConnectionStates_t enum   */ -uint8_t TCP_GetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort) +uint8_t TCP_GetConnectionState(const uint16_t Port, +                               const IP_Address_t RemoteAddress, +                               const uint16_t RemotePort)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -317,7 +324,9 @@ uint8_t TCP_GetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16   *   *  \return ConnectionInfo structure of the connection if found, NULL otherwise   */ -TCP_ConnectionInfo_t* TCP_GetConnectionInfo(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort) +TCP_ConnectionInfo_t* TCP_GetConnectionInfo(const uint16_t Port, +                                            const IP_Address_t RemoteAddress, +                                            const uint16_t RemotePort)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -346,7 +355,9 @@ TCP_ConnectionInfo_t* TCP_GetConnectionInfo(uint16_t Port, IP_Address_t RemoteAd   *           response was generated, NO_PROCESS if the packet processing was deferred until the   *           next Ethernet packet handler iteration   */ -int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void* TCPHeaderOutStart) +int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, +                             void* TCPHeaderInStart, +                             void* TCPHeaderOutStart)  {  	IP_Header_t*  IPHeaderIN   = (IP_Header_t*)IPHeaderInStart;  	TCP_Header_t* TCPHeaderIN  = (TCP_Header_t*)TCPHeaderInStart; @@ -593,8 +604,10 @@ int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void   *   *  \return A 16-bit TCP checksum value   */ -static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, IP_Address_t SourceAddress, -                               IP_Address_t DestinationAddress, uint16_t TCPOutSize) +static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, +                               const IP_Address_t SourceAddress, +                               const IP_Address_t DestinationAddress, +                               const uint16_t TCPOutSize)  {  	uint32_t Checksum = 0; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h index ac144150c2..d412647eb6 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/TCP.h @@ -228,18 +228,31 @@  		} TCP_Header_t;  	/* Function Prototypes: */ -		void                  TCP_TCPTask(USB_ClassInfo_RNDIS_Device_t* RNDISInterfaceInfo); +		void                  TCP_TCPTask(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo);  		void                  TCP_Init(void); -		bool                  TCP_SetPortState(uint16_t Port, uint8_t State, void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*)); -		uint8_t               TCP_GetPortState(uint16_t Port); -		bool                  TCP_SetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort, uint8_t State); -		uint8_t               TCP_GetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort); -		TCP_ConnectionInfo_t* TCP_GetConnectionInfo(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort); -		int16_t               TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void* TCPHeaderOutStart); +		bool                  TCP_SetPortState(const uint16_t Port, +		                                       const uint8_t State, +		                                       void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*)); +		uint8_t               TCP_GetPortState(const uint16_t Port); +		bool                  TCP_SetConnectionState(const uint16_t Port, +		                                             const IP_Address_t RemoteAddress, +		                                             const uint16_t RemotePort, +		                                             const uint8_t State); +		uint8_t               TCP_GetConnectionState(const uint16_t Port, +		                                             const IP_Address_t RemoteAddress, +		                                             const uint16_t RemotePort); +		TCP_ConnectionInfo_t* TCP_GetConnectionInfo(const uint16_t Port, +		                                            const IP_Address_t RemoteAddress, +		                                            const uint16_t RemotePort); +		int16_t               TCP_ProcessTCPPacket(void* IPHeaderInStart, +		                                           void* TCPHeaderInStart, +		                                           void* TCPHeaderOutStart);  		#if defined(INCLUDE_FROM_TCP_C) -			static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, IP_Address_t SourceAddress, -										   IP_Address_t DestinationAddress, uint16_t TCPOutSize); +			static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, +			                               const IP_Address_t SourceAddress, +										   const IP_Address_t DestinationAddress, +			                               uint16_t TCPOutSize);  		#endif  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.c index c9c523f71b..15b0656562 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.c @@ -46,7 +46,9 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, void* UDPHeaderInStart, void* UDPHeaderOutStart) +int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, +                             void* UDPHeaderInStart, +                             void* UDPHeaderOutStart)  {  	UDP_Header_t* UDPHeaderIN  = (UDP_Header_t*)UDPHeaderInStart;  	UDP_Header_t* UDPHeaderOUT = (UDP_Header_t*)UDPHeaderOutStart; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.h index ee90522752..57abd0dc75 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/UDP.h @@ -62,6 +62,8 @@  		} UDP_Header_t;  	/* Function Prototypes: */ -		int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, void* UDPHeaderInStart, void* UDPHeaderOutStart); +		int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, +		                             void* UDPHeaderInStart, +		                             void* UDPHeaderOutStart);  #endif diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c index 7f90de3b8b..e01a04fb4b 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c @@ -90,7 +90,8 @@ void Webserver_Init(void)   *   *  \return Boolean true if the command matches the request, false otherwise   */ -static bool IsHTTPCommand(uint8_t* RequestHeader, char* Command) +static bool IsHTTPCommand(uint8_t* RequestHeader, +                          char* Command)  {  	/* Returns true if the non null terminated string in RequestHeader matches the null terminated string Command */  	return (strncmp((char*)RequestHeader, Command, strlen(Command)) == 0); @@ -102,7 +103,8 @@ static bool IsHTTPCommand(uint8_t* RequestHeader, char* Command)   *  \param[in] ConnectionState  Pointer to a TCP Connection State structure giving connection information   *  \param[in,out] Buffer       Pointer to the application's send/receive packet buffer   */ -void Webserver_ApplicationCallback(TCP_ConnectionState_t* ConnectionState, TCP_ConnectionBuffer_t* Buffer) +void Webserver_ApplicationCallback(TCP_ConnectionState_t* const ConnectionState, +                                   TCP_ConnectionBuffer_t* const Buffer)  {  	char*          BufferDataStr = (char*)Buffer->Data;  	static uint8_t PageBlock     = 0; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.h b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.h index 3ba4186ea1..87fe1c91d1 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.h @@ -50,6 +50,7 @@  	/* Function Prototypes: */  		void Webserver_Init(void); -		void Webserver_ApplicationCallback(TCP_ConnectionState_t* ConnectionState, TCP_ConnectionBuffer_t* Buffer); +		void Webserver_ApplicationCallback(TCP_ConnectionState_t* const ConnectionState, +		                                   TCP_ConnectionBuffer_t* const Buffer);  #endif diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c index 97b66de9b4..8f11d4a26b 100644 --- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c +++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c @@ -224,7 +224,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h index 017e3fe1ef..387034f11d 100644 --- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h +++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h @@ -77,7 +77,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c index f91fa4c934..83fe2fe8e8 100644 --- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c +++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c @@ -311,7 +311,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h index f4733c2b53..82b3ed1d67 100644 --- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h +++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h @@ -88,7 +88,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c index 313f6c036a..8db86b84a2 100644 --- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c +++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c @@ -199,8 +199,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData; @@ -235,8 +238,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports  } diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h index 64d04ec27c..64ad52299f 100644 --- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h +++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.h @@ -76,8 +76,14 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c index f6d16c8412..e05358e68c 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.c +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c @@ -154,7 +154,9 @@ USB_OSCompatibleIDDescriptor_t PROGMEM DevCompatIDs =  	                         SubCompatibleID: "UNIV1"}  }; -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); @@ -207,11 +209,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,  	return Size;  } -bool USB_GetOSFeatureDescriptor(const uint16_t wValue, const uint8_t wIndex, -                                void** const DescriptorAddress, uint16_t* const DescriptorSize) +uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	void*    Address = NULL; -	uint16_t Size    = 0; +	uint16_t Size    = NO_DESCRIPTOR;  	/* Check if a device level OS feature descriptor is being requested */  	if (wValue == 0x0000) @@ -224,13 +227,6 @@ bool USB_GetOSFeatureDescriptor(const uint16_t wValue, const uint8_t wIndex,  		}  	} -	if (Address != NULL) -	{ -		*DescriptorAddress = Address; -		*DescriptorSize    = Size; - -		return true; -	} -		 -	return false; +	*DescriptorAddress = Address; +	return Size;  }
\ No newline at end of file diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.h b/Demos/Device/Incomplete/Sideshow/Descriptors.h index 83c683be5c..4d672c0ceb 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.h +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.h @@ -85,11 +85,12 @@  		} USB_OSCompatibleIDDescriptor_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -								            ATTR_WARN_UNUSED_RESULT ATTR_WEAK ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); -		bool USB_GetOSFeatureDescriptor(const uint16_t wValue, const uint8_t wIndex, -		                                void** const DescriptorAddress, uint16_t* const DescriptorSize) -		                                ATTR_WARN_UNUSED_RESULT ATTR_WEAK ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4); +		uint16_t USB_GetOSFeatureDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c index a6c529e69d..e8631be8e6 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c @@ -44,7 +44,7 @@ SideShow_Application_t* SideShow_GetFreeApplication(void)  	return NULL;  } -SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* GUID) +SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* const GUID)  {  	for (uint8_t App = 0; App < ARRAY_ELEMENTS(InstalledApplications); App++)  	{ diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.h index ed885d40da..9624c7c345 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.h +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.h @@ -57,6 +57,6 @@  	/* Function Prototypes: */  		SideShow_Application_t* SideShow_GetFreeApplication(void); -		SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* GUID); +		SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* const GUID);  #endif diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.c index 5bce088c89..827deb0a42 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.c +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.c @@ -280,7 +280,8 @@ static void SideShow_GetCapabilities(SideShow_PacketHeader_t* const PacketHeader  	return;  } -static void SideShow_GetString(SideShow_PacketHeader_t* const PacketHeader, void* const UnicodeStruct) +static void SideShow_GetString(SideShow_PacketHeader_t* const PacketHeader, +                               void* const UnicodeStruct)  {  	Endpoint_ClearOUT(); diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.h index 6d4ad4c26c..1395cd3675 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.h +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommands.h @@ -151,7 +151,8 @@  			static void SideShow_GetCurrentUser(SideShow_PacketHeader_t* const PacketHeader);  			static void SideShow_SetCurrentUser(SideShow_PacketHeader_t* const PacketHeader);  			static void SideShow_GetCapabilities(SideShow_PacketHeader_t* const PacketHeader); -			static void SideShow_GetString(SideShow_PacketHeader_t* const PacketHeader, void* const UnicodeStruct); +			static void SideShow_GetString(SideShow_PacketHeader_t* const PacketHeader, +			                               void* const UnicodeStruct);  			static void SideShow_GetApplicationOrder(SideShow_PacketHeader_t* const PacketHeader);  			static void SideShow_GetSupportedEndpoints(SideShow_PacketHeader_t* const PacketHeader);  			static void SideShow_AddApplication(SideShow_PacketHeader_t* const PacketHeader); diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c index 29f768ecc7..02b681c50d 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c @@ -30,7 +30,8 @@  #include "SideshowCommon.h" -uint16_t SideShow_Read_Unicode_String(void* const UnicodeString, const uint16_t MaxBytes) +uint16_t SideShow_Read_Unicode_String(void* const UnicodeString, +                                      const uint16_t MaxBytes)  {  	Unicode_String_t* const UnicodeStruct = (Unicode_String_t*)UnicodeString;  	uint32_t                UnicodeCharsToRead; diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h index 7c632b3c4c..b801ecfa5a 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.h @@ -96,7 +96,8 @@  		} SideShow_PacketHeader_t;  	/* Function Prototypes: */ -		uint16_t SideShow_Read_Unicode_String(void* UnicodeString, const uint16_t MaxBytes); +		uint16_t SideShow_Read_Unicode_String(void* UnicodeString, +		                                      const uint16_t MaxBytes);  		void     SideShow_Write_Unicode_String(void* UnicodeString);  		void     SideShow_Discard_Byte_Stream(void); diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c index 0d1dd80fb0..5bfae1b494 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c @@ -31,7 +31,8 @@  #define  INCLUDE_FROM_SIDESHOWCONTENT_C  #include "SideshowContent.h" -bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, SideShow_Application_t* const Application) +bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, +                               SideShow_Application_t* const Application)  {  	uint32_t ContentSize;  	uint32_t ContentID; @@ -69,7 +70,8 @@ bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, Side  	return true;  } -static void SideShow_ProcessXMLContent(void* ContentData, uint32_t ContentSize) +static void SideShow_ProcessXMLContent(void* ContentData, +                                       uint32_t ContentSize)  {  	printf(" XML");  	Endpoint_Discard_Stream(ContentSize); diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h index 97a6bee817..6e3031c138 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.h @@ -116,10 +116,12 @@  		#define XML_END_TAG           "</body>"  	/* Function Prototypes: */ -		bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, SideShow_Application_t* const Application); +		bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, +		                               SideShow_Application_t* const Application);  		#if defined(INCLUDE_FROM_SIDESHOWCONTENT_C) -			static void SideShow_ProcessXMLContent(void* ContentData, uint32_t ContentSize); +			static void SideShow_ProcessXMLContent(void* ContentData, +			                                       uint32_t ContentSize);  		#endif  #endif
\ No newline at end of file diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.c b/Demos/Device/Incomplete/Sideshow/Sideshow.c index 3e9778e29a..2972e0cf72 100644 --- a/Demos/Device/Incomplete/Sideshow/Sideshow.c +++ b/Demos/Device/Incomplete/Sideshow/Sideshow.c @@ -122,13 +122,11 @@ void EVENT_USB_Device_UnhandledControlRequest(void)  			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))  			{  				void*    DescriptorPointer; -				uint16_t DescriptorSize; +				uint16_t DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex, +				                                                     &DescriptorPointer, &DescriptorSize); -				if (!(USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex, -				                                 &DescriptorPointer, &DescriptorSize))) -				{ -					return; -				} +				if (DescriptorSize == NO_DESCRIPTOR) +				  return;  				Endpoint_ClearSETUP(); diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.c b/Demos/Device/LowLevel/AudioInput/Descriptors.c index 414c7666b4..cfe1fd03f9 100644 --- a/Demos/Device/LowLevel/AudioInput/Descriptors.c +++ b/Demos/Device/LowLevel/AudioInput/Descriptors.c @@ -272,7 +272,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.h b/Demos/Device/LowLevel/AudioInput/Descriptors.h index 443cd1a10a..91c1d56080 100644 --- a/Demos/Device/LowLevel/AudioInput/Descriptors.h +++ b/Demos/Device/LowLevel/AudioInput/Descriptors.h @@ -312,7 +312,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.c b/Demos/Device/LowLevel/AudioOutput/Descriptors.c index bcde7f9829..414bae8d4a 100644 --- a/Demos/Device/LowLevel/AudioOutput/Descriptors.c +++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.c @@ -272,7 +272,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.h b/Demos/Device/LowLevel/AudioOutput/Descriptors.h index 87c75941cd..ea9b9f0258 100644 --- a/Demos/Device/LowLevel/AudioOutput/Descriptors.h +++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.h @@ -312,7 +312,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c index a7d64a4e3c..a134813b7c 100644 --- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c +++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c @@ -338,7 +338,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h index f69c8c64c0..61941b1682 100644 --- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h +++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h @@ -110,7 +110,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.c b/Demos/Device/LowLevel/GenericHID/Descriptors.c index 12ff1f01e0..0d83fe1eec 100644 --- a/Demos/Device/LowLevel/GenericHID/Descriptors.c +++ b/Demos/Device/LowLevel/GenericHID/Descriptors.c @@ -199,7 +199,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.h b/Demos/Device/LowLevel/GenericHID/Descriptors.h index 0babc22694..8e9e37b299 100644 --- a/Demos/Device/LowLevel/GenericHID/Descriptors.h +++ b/Demos/Device/LowLevel/GenericHID/Descriptors.h @@ -94,7 +94,8 @@  		#define DTYPE_Report              0x22  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.c b/Demos/Device/LowLevel/Joystick/Descriptors.c index a1e35fe6e8..45e771eacb 100644 --- a/Demos/Device/LowLevel/Joystick/Descriptors.c +++ b/Demos/Device/LowLevel/Joystick/Descriptors.c @@ -199,7 +199,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.h b/Demos/Device/LowLevel/Joystick/Descriptors.h index a3144c4cc6..c133f0b2c3 100644 --- a/Demos/Device/LowLevel/Joystick/Descriptors.h +++ b/Demos/Device/LowLevel/Joystick/Descriptors.h @@ -87,7 +87,8 @@  		#define DTYPE_Report              0x22  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/Joystick/Joystick.c b/Demos/Device/LowLevel/Joystick/Joystick.c index 6ced1ce44e..561914a5c5 100644 --- a/Demos/Device/LowLevel/Joystick/Joystick.c +++ b/Demos/Device/LowLevel/Joystick/Joystick.c @@ -141,7 +141,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)   *   *  \return Boolean true if the new report differs from the last report, false otherwise   */ -bool GetNextReport(USB_JoystickReport_Data_t* ReportData) +bool GetNextReport(USB_JoystickReport_Data_t* const ReportData)  {  	static uint8_t PrevJoyStatus    = 0;  	static uint8_t PrevButtonStatus = 0; diff --git a/Demos/Device/LowLevel/Joystick/Joystick.h b/Demos/Device/LowLevel/Joystick/Joystick.h index 3d876befce..607f56ec92 100644 --- a/Demos/Device/LowLevel/Joystick/Joystick.h +++ b/Demos/Device/LowLevel/Joystick/Joystick.h @@ -87,6 +87,6 @@  		void EVENT_USB_Device_ConfigurationChanged(void);  		void EVENT_USB_Device_UnhandledControlRequest(void); -		bool GetNextReport(USB_JoystickReport_Data_t* ReportData); +		bool GetNextReport(USB_JoystickReport_Data_t* const ReportData);  #endif diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.c b/Demos/Device/LowLevel/Keyboard/Descriptors.c index 598616a6a2..6a2dfb5c76 100644 --- a/Demos/Device/LowLevel/Keyboard/Descriptors.c +++ b/Demos/Device/LowLevel/Keyboard/Descriptors.c @@ -216,7 +216,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.h b/Demos/Device/LowLevel/Keyboard/Descriptors.h index d4d7a9870d..d4b9ebf795 100644 --- a/Demos/Device/LowLevel/Keyboard/Descriptors.h +++ b/Demos/Device/LowLevel/Keyboard/Descriptors.h @@ -92,7 +92,8 @@  		#define DTYPE_Report              0x22  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c index c581626494..71b586176b 100644 --- a/Demos/Device/LowLevel/Keyboard/Keyboard.c +++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c @@ -257,7 +257,7 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \param[out] ReportData  Pointer to a HID report data structure to be filled   */ -void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData) +void CreateKeyboardReport(USB_KeyboardReport_Data_t* const ReportData)  {  	uint8_t JoyStatus_LCL     = Joystick_GetStatus();  	uint8_t ButtonStatus_LCL  = Buttons_GetStatus(); @@ -291,7 +291,7 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData)   *   *  \param[in] LEDReport  LED status report from the host   */ -void ProcessLEDReport(uint8_t LEDReport) +void ProcessLEDReport(const uint8_t LEDReport)  {  	uint8_t LEDMask = LEDS_LED2; diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.h b/Demos/Device/LowLevel/Keyboard/Keyboard.h index a3c3bd4072..e5904b8d6c 100644 --- a/Demos/Device/LowLevel/Keyboard/Keyboard.h +++ b/Demos/Device/LowLevel/Keyboard/Keyboard.h @@ -144,8 +144,8 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		void CreateKeyboardReport(USB_KeyboardReport_Data_t* ReportData); -		void ProcessLEDReport(uint8_t LEDReport); +		void CreateKeyboardReport(USB_KeyboardReport_Data_t* const ReportData); +		void ProcessLEDReport(const uint8_t LEDReport);  		void SendNextReport(void);  		void ReceiveNextReport(void); diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c index e09e3c857a..a5505ea7c3 100644 --- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c +++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c @@ -286,7 +286,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h index f23ef3696b..f76d5c9b2a 100644 --- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h +++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h @@ -98,7 +98,8 @@  		#define DTYPE_Report              0x22  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.c b/Demos/Device/LowLevel/MIDI/Descriptors.c index cc1f2efd96..a6d73a3248 100644 --- a/Demos/Device/LowLevel/MIDI/Descriptors.c +++ b/Demos/Device/LowLevel/MIDI/Descriptors.c @@ -283,7 +283,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h index 70686102e7..afb74c6826 100644 --- a/Demos/Device/LowLevel/MIDI/Descriptors.h +++ b/Demos/Device/LowLevel/MIDI/Descriptors.h @@ -183,7 +183,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/MassStorage/Descriptors.c b/Demos/Device/LowLevel/MassStorage/Descriptors.c index d7d41c5bba..b1744e6859 100644 --- a/Demos/Device/LowLevel/MassStorage/Descriptors.c +++ b/Demos/Device/LowLevel/MassStorage/Descriptors.c @@ -174,7 +174,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/MassStorage/Descriptors.h b/Demos/Device/LowLevel/MassStorage/Descriptors.h index 6d468f6bfe..ce1c03c289 100644 --- a/Demos/Device/LowLevel/MassStorage/Descriptors.h +++ b/Demos/Device/LowLevel/MassStorage/Descriptors.h @@ -65,7 +65,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c index aedfcc715f..07926ccd07 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c +++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.c @@ -46,7 +46,8 @@   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write   */ -void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_WriteBlocks(const uint32_t BlockAddress, +                                  uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -179,7 +180,8 @@ void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlo   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read   */ -void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_ReadBlocks(const uint32_t BlockAddress, +                                 uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -287,7 +289,9 @@ void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBloc   *  \param[in] TotalBlocks   Number of blocks of data to write   *  \param[in] BufferPtr     Pointer to the data source RAM buffer   */ -void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +                                      uint16_t TotalBlocks, +                                      uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -386,7 +390,9 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota   *  \param[in] TotalBlocks   Number of blocks of data to read   *  \param[out] BufferPtr    Pointer to the data destination RAM buffer   */ -void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +                                     uint16_t TotalBlocks, +                                     uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); diff --git a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h index 3306666411..7a62ace046 100644 --- a/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h +++ b/Demos/Device/LowLevel/MassStorage/Lib/DataflashManager.h @@ -74,11 +74,15 @@  		#define LUN_MEDIA_BLOCKS                    (VIRTUAL_MEMORY_BLOCKS / TOTAL_LUNS)     	/* Function Prototypes: */ -		void DataflashManager_WriteBlocks(const uint32_t BlockAddress, uint16_t TotalBlocks); -		void DataflashManager_ReadBlocks(const uint32_t BlockAddress, uint16_t TotalBlocks); -		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_WriteBlocks(const uint32_t BlockAddress, +		                                  uint16_t TotalBlocks); +		void DataflashManager_ReadBlocks(const uint32_t BlockAddress, +		                                 uint16_t TotalBlocks); +		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +		                                      uint16_t TotalBlocks,  		                                      uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3); -		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +		                                     uint16_t TotalBlocks,  		                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);  		void DataflashManager_ResetDataflashProtections(void);  		bool DataflashManager_CheckDataflashOperation(void); diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.c b/Demos/Device/LowLevel/Mouse/Descriptors.c index f7fc2f7149..46533eeed7 100644 --- a/Demos/Device/LowLevel/Mouse/Descriptors.c +++ b/Demos/Device/LowLevel/Mouse/Descriptors.c @@ -199,7 +199,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.h b/Demos/Device/LowLevel/Mouse/Descriptors.h index 21c394ff12..eb7246883a 100644 --- a/Demos/Device/LowLevel/Mouse/Descriptors.h +++ b/Demos/Device/LowLevel/Mouse/Descriptors.h @@ -87,7 +87,8 @@  		#define DTYPE_Report              0x22  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/Mouse/Mouse.c b/Demos/Device/LowLevel/Mouse/Mouse.c index 7e38e7afd4..97aa55ff4b 100644 --- a/Demos/Device/LowLevel/Mouse/Mouse.c +++ b/Demos/Device/LowLevel/Mouse/Mouse.c @@ -226,7 +226,7 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \param[out] ReportData  Pointer to a HID report data structure to be filled   */ -void CreateMouseReport(USB_MouseReport_Data_t* ReportData) +void CreateMouseReport(USB_MouseReport_Data_t* const ReportData)  {  	uint8_t JoyStatus_LCL    = Joystick_GetStatus();  	uint8_t ButtonStatus_LCL = Buttons_GetStatus(); diff --git a/Demos/Device/LowLevel/Mouse/Mouse.h b/Demos/Device/LowLevel/Mouse/Mouse.h index e818f8005f..56766a6dfe 100644 --- a/Demos/Device/LowLevel/Mouse/Mouse.h +++ b/Demos/Device/LowLevel/Mouse/Mouse.h @@ -107,6 +107,6 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		void CreateMouseReport(USB_MouseReport_Data_t* ReportData); +		void CreateMouseReport(USB_MouseReport_Data_t* const ReportData);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c index c823d443f6..d7ad8f22fa 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c @@ -212,7 +212,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h index 43a83e8e10..144fc9054e 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h @@ -91,7 +91,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.c index 6eb74faff1..853d505424 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.c @@ -46,7 +46,8 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t ARP_ProcessARPPacket(void* InDataStart, void* OutDataStart) +int16_t ARP_ProcessARPPacket(void* InDataStart, +                             void* OutDataStart)  {  	DecodeARPHeader(InDataStart); diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h index 6ae9b7be3e..8de76f3b62 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/ARP.h @@ -69,6 +69,7 @@  		} ARP_Header_t;  	/* Function Prototypes: */ -		int16_t ARP_ProcessARPPacket(void* InDataStart, void* OutDataStart); +		int16_t ARP_ProcessARPPacket(void* InDataStart, +		                             void* OutDataStart);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.c index eeed88491a..41265aa275 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.c @@ -46,7 +46,9 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, void* DHCPHeaderInStart, void* DHCPHeaderOutStart) +int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, +                               void* DHCPHeaderInStart, +                               void* DHCPHeaderOutStart)  {  	IP_Header_t*   IPHeaderIN    = (IP_Header_t*)IPHeaderInStart;  	DHCP_Header_t* DHCPHeaderIN  = (DHCP_Header_t*)DHCPHeaderInStart; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.h index 2c8c4d8843..3bfdb29be8 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/DHCP.h @@ -120,6 +120,8 @@  		} DHCP_Header_t;  	/* Function Prototypes: */ -		int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, void* DHCPHeaderInStart, void* DHCPHeaderOutStart); +		int16_t DHCP_ProcessDHCPPacket(void* IPHeaderInStart, +		                               void* DHCPHeaderInStart, +		                               void* DHCPHeaderOutStart);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.c index 044b0695b1..0b9563347f 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.c @@ -120,7 +120,8 @@ void Ethernet_ProcessPacket(void)   *   *  \return A 16-bit Ethernet checksum value   */ -uint16_t Ethernet_Checksum16(void* Data, uint16_t Bytes) +uint16_t Ethernet_Checksum16(void* Data, +                             uint16_t Bytes)  {  	uint16_t* Words    = (uint16_t*)Data;  	uint32_t  Checksum = 0; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h index 683b187c3e..49c6b1c257 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Ethernet.h @@ -109,6 +109,7 @@  	/* Function Prototypes: */  		void     Ethernet_ProcessPacket(void); -		uint16_t Ethernet_Checksum16(void* Data, uint16_t Bytes); +		uint16_t Ethernet_Checksum16(void* Data, +		                             uint16_t Bytes);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.c index a43ffca54c..7e4be9c3d1 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.c @@ -45,7 +45,8 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t ICMP_ProcessICMPPacket(void* InDataStart, void* OutDataStart) +int16_t ICMP_ProcessICMPPacket(void* InDataStart, +                               void* OutDataStart)  {  	ICMP_Header_t* ICMPHeaderIN  = (ICMP_Header_t*)InDataStart;  	ICMP_Header_t* ICMPHeaderOUT = (ICMP_Header_t*)OutDataStart; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.h index dfffae249f..dcea1ada4e 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/ICMP.h @@ -75,6 +75,7 @@  		} ICMP_Header_t;  	/* Function Prototypes: */ -		int16_t ICMP_ProcessICMPPacket(void* InDataStart, void* OutDataStart); +		int16_t ICMP_ProcessICMPPacket(void* InDataStart, +		                               void* OutDataStart);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.c index 078f5b58f6..85ccf426ed 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.c @@ -46,7 +46,8 @@   *           response was generated, NO_PROCESS if the packet processing was deferred until the   *           next Ethernet packet handler iteration   */ -int16_t IP_ProcessIPPacket(void* InDataStart, void* OutDataStart) +int16_t IP_ProcessIPPacket(void* InDataStart, +                           void* OutDataStart)  {  	DecodeIPHeader(InDataStart); diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.h index b0a06b8d04..8f45113be3 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/IP.h @@ -90,6 +90,7 @@  		} IP_Header_t;  	/* Function Prototypes: */ -		int16_t IP_ProcessIPPacket(void* InDataStart, void* OutDataStart); +		int16_t IP_ProcessIPPacket(void* InDataStart, +		                           void* OutDataStart);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c index 80b8bc8130..3875f8801c 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c @@ -239,7 +239,7 @@ void ProcessRNDISControlMessage(void)   *   *  \return Boolean true if the query was handled, false otherwise   */ -static bool ProcessNDISQuery(uint32_t OId, void* QueryData, uint16_t QuerySize, +static bool ProcessNDISQuery(const uint32_t OId, void* QueryData, uint16_t QuerySize,                               void* ResponseData, uint16_t* ResponseSize)  {  	/* Handler for REMOTE_NDIS_QUERY_MSG messages */ diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h index cabea97bb5..5168dc8ef7 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h @@ -215,9 +215,14 @@  		void ProcessRNDISControlMessage(void);  		#if defined(INCLUDE_FROM_RNDIS_C) -			static bool ProcessNDISQuery(uint32_t OId, void* QueryData, uint16_t QuerySize, -										 void* ResponseData, uint16_t* ResponseSize); -			static bool ProcessNDISSet(uint32_t OId, void* SetData, uint16_t SetSize);	 +			static bool ProcessNDISQuery(const uint32_t OId, +			                             void* QueryData, +			                             uint16_t QuerySize, +										 void* ResponseData, +			                             uint16_t* ResponseSize); +			static bool ProcessNDISSet(const uint32_t OId, +			                           void* SetData, +			                           uint16_t SetSize);	  		#endif  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c index 76031490dc..f75b828bc3 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.c @@ -175,7 +175,9 @@ void TCP_Init(void)   *   *  \return Boolean true if the port state was set, false otherwise (no more space in the port state table)   */ -bool TCP_SetPortState(uint16_t Port, uint8_t State, void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*)) +bool TCP_SetPortState(const uint16_t Port, +                      const uint8_t State, +                      void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*))  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -222,7 +224,7 @@ bool TCP_SetPortState(uint16_t Port, uint8_t State, void (*Handler)(TCP_Connecti   *   *  \return A value from the TCP_PortStates_t enum   */ -uint8_t TCP_GetPortState(uint16_t Port) +uint8_t TCP_GetPortState(const uint16_t Port)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -247,7 +249,10 @@ uint8_t TCP_GetPortState(uint16_t Port)   *   *  \return Boolean true if the connection was updated or created, false otherwise (no more space in the connection state table)   */ -bool TCP_SetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort, uint8_t State) +bool TCP_SetConnectionState(const uint16_t Port, +                            const IP_Address_t RemoteAddress, +                            const uint16_t RemotePort, +                            const uint8_t State)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -287,7 +292,9 @@ bool TCP_SetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t   *   *  \return A value from the TCP_ConnectionStates_t enum   */ -uint8_t TCP_GetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort) +uint8_t TCP_GetConnectionState(const uint16_t Port, +                               const IP_Address_t RemoteAddress, +                               const uint16_t RemotePort)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -314,7 +321,9 @@ uint8_t TCP_GetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16   *   *  \return ConnectionInfo structure of the connection if found, NULL otherwise   */ -TCP_ConnectionInfo_t* TCP_GetConnectionInfo(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort) +TCP_ConnectionInfo_t* TCP_GetConnectionInfo(const uint16_t Port, +                                            const IP_Address_t RemoteAddress, +                                            const uint16_t RemotePort)  {  	/* Note, Port number should be specified in BIG endian to simplify network code */ @@ -343,7 +352,9 @@ TCP_ConnectionInfo_t* TCP_GetConnectionInfo(uint16_t Port, IP_Address_t RemoteAd   *           response was generated, NO_PROCESS if the packet processing was deferred until the   *           next Ethernet packet handler iteration   */ -int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void* TCPHeaderOutStart) +int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, +                             void* TCPHeaderInStart, +                             void* TCPHeaderOutStart)  {  	IP_Header_t*  IPHeaderIN   = (IP_Header_t*)IPHeaderInStart;  	TCP_Header_t* TCPHeaderIN  = (TCP_Header_t*)TCPHeaderInStart; @@ -590,8 +601,10 @@ int16_t TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void   *   *  \return A 16-bit TCP checksum value   */ -static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, IP_Address_t SourceAddress, -                               IP_Address_t DestinationAddress, uint16_t TCPOutSize) +static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, +                               const IP_Address_t SourceAddress, +                               const IP_Address_t DestinationAddress, +                               uint16_t TCPOutSize)  {  	uint32_t Checksum = 0; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h index 1e9b99bb1e..984793e59b 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h @@ -231,16 +231,29 @@  	/* Function Prototypes: */  		void                  TCP_Init(void);  		void                  TCP_Task(void); -		bool                  TCP_SetPortState(uint16_t Port, uint8_t State, void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*)); -		uint8_t               TCP_GetPortState(uint16_t Port); -		bool                  TCP_SetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort, uint8_t State); -		uint8_t               TCP_GetConnectionState(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort); -		TCP_ConnectionInfo_t* TCP_GetConnectionInfo(uint16_t Port, IP_Address_t RemoteAddress, uint16_t RemotePort); -		int16_t               TCP_ProcessTCPPacket(void* IPHeaderInStart, void* TCPHeaderInStart, void* TCPHeaderOutStart); +		bool                  TCP_SetPortState(const uint16_t Port, +		                                       const uint8_t State, +		                                       void (*Handler)(TCP_ConnectionState_t*, TCP_ConnectionBuffer_t*)); +		uint8_t               TCP_GetPortState(const uint16_t Port); +		bool                  TCP_SetConnectionState(const uint16_t Port, +		                                             const IP_Address_t RemoteAddress, +		                                             const uint16_t RemotePort, +		                                             const uint8_t State); +		uint8_t               TCP_GetConnectionState(const uint16_t Port, +		                                             const IP_Address_t RemoteAddress, +		                                             const uint16_t RemotePort); +		TCP_ConnectionInfo_t* TCP_GetConnectionInfo(const uint16_t Port, +		                                            const IP_Address_t RemoteAddress, +		                                            const uint16_t RemotePort); +		int16_t               TCP_ProcessTCPPacket(void* IPHeaderInStart, +		                                           void* TCPHeaderInStart, +		                                           void* TCPHeaderOutStart);  		#if defined(INCLUDE_FROM_TCP_C) -			static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, IP_Address_t SourceAddress, -										   IP_Address_t DestinationAddress, uint16_t TCPOutSize); +			static uint16_t TCP_Checksum16(void* TCPHeaderOutStart, +			                               const IP_Address_t SourceAddress, +										   const IP_Address_t DestinationAddress, +			                               uint16_t TCPOutSize);  		#endif  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.c index c9c523f71b..15b0656562 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.c @@ -46,7 +46,9 @@   *   *  \return The number of bytes written to the out Ethernet frame if any, NO_RESPONSE otherwise   */ -int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, void* UDPHeaderInStart, void* UDPHeaderOutStart) +int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, +                             void* UDPHeaderInStart, +                             void* UDPHeaderOutStart)  {  	UDP_Header_t* UDPHeaderIN  = (UDP_Header_t*)UDPHeaderInStart;  	UDP_Header_t* UDPHeaderOUT = (UDP_Header_t*)UDPHeaderOutStart; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.h index 6cbc0b8195..42d7925a32 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/UDP.h @@ -65,6 +65,8 @@  		} UDP_Header_t;  	/* Function Prototypes: */ -		int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, void* UDPHeaderInStart, void* UDPHeaderOutStart); +		int16_t UDP_ProcessUDPPacket(void* IPHeaderInStart, +		                             void* UDPHeaderInStart, +		                             void* UDPHeaderOutStart);  #endif diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c index 51a9fadec9..807c1a2e31 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c @@ -90,7 +90,8 @@ void Webserver_Init(void)   *   *  \return Boolean true if the command matches the request, false otherwise   */ -static bool IsHTTPCommand(uint8_t* RequestHeader, char* Command) +static bool IsHTTPCommand(uint8_t* RequestHeader, +                          char* Command)  {  	/* Returns true if the non null terminated string in RequestHeader matches the null terminated string Command */  	return (strncmp((char*)RequestHeader, Command, strlen(Command)) == 0); @@ -102,7 +103,8 @@ static bool IsHTTPCommand(uint8_t* RequestHeader, char* Command)   *  \param[in] ConnectionState  Pointer to a TCP Connection State structure giving connection information   *  \param[in,out] Buffer       Pointer to the application's send/receive packet buffer   */ -void Webserver_ApplicationCallback(TCP_ConnectionState_t* ConnectionState, TCP_ConnectionBuffer_t* Buffer) +void Webserver_ApplicationCallback(TCP_ConnectionState_t* const ConnectionState, +                                   TCP_ConnectionBuffer_t* const Buffer)  {  	char*          BufferDataStr = (char*)Buffer->Data;  	static uint8_t PageBlock     = 0; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.h index 3ba4186ea1..87fe1c91d1 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.h @@ -50,6 +50,7 @@  	/* Function Prototypes: */  		void Webserver_Init(void); -		void Webserver_ApplicationCallback(TCP_ConnectionState_t* ConnectionState, TCP_ConnectionBuffer_t* Buffer); +		void Webserver_ApplicationCallback(TCP_ConnectionState_t* const ConnectionState, +		                                   TCP_ConnectionBuffer_t* const Buffer);  #endif diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c index a9c044df90..1e87766eaf 100644 --- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c +++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c @@ -224,7 +224,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h index 3ca71f5ddf..2b06da0a68 100644 --- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h +++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h @@ -91,7 +91,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c index 703051e844..66db661c07 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c @@ -199,7 +199,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h index 2c77d7841e..59910dec4d 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h @@ -63,7 +63,8 @@  		#define MOUSE_EPSIZE              8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c index 6ec88aea3e..e2a2128e93 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.c @@ -104,8 +104,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	USB_MouseReport_Data_t* MouseReport = (USB_MouseReport_Data_t*)ReportData; @@ -140,8 +143,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports  } diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h index f96d0aea13..90db85f170 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/DeviceFunctions.h @@ -43,10 +43,16 @@  		extern USB_ClassInfo_HID_Device_t Mouse_HID_Device_Interface;  	/* Function Prototypes: */ -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  		void EVENT_USB_Device_Connect(void);  		void EVENT_USB_Device_Disconnect(void); diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c index bb9286bbe1..dfd67ae62e 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c @@ -93,7 +93,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.h b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.h index 63f64ffd38..fe5214e0a5 100644 --- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.h +++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.h @@ -48,7 +48,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c index 8f0b405331..f1b4cac7b0 100644 --- a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c +++ b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c @@ -231,7 +231,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" @@ -250,7 +251,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8   *   *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded   */ -bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem) +bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)  {  	bool IsJoystick = false; diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.h b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.h index da667e6329..1cebb924c1 100644 --- a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.h +++ b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.h @@ -85,9 +85,10 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void); -		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem); +		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);  #endif diff --git a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c index 8ae7d83126..8bdf2b6ec4 100644 --- a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c +++ b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c @@ -211,7 +211,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.h b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.h index 948ff6a990..fd6b83882d 100644 --- a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.h @@ -70,7 +70,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c index dedf12fc46..9d28e7136b 100644 --- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c +++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c @@ -237,7 +237,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" @@ -256,7 +257,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8   *   *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded   */ -bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem) +bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)  {  	/* Check the attributes of the current item - see if we are interested in it or not;  	 * only store KEYBOARD usage page items into the Processed HID Report structure to diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h index 8a0aeffd61..5ecfdf4585 100644 --- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h +++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.h @@ -73,9 +73,10 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void); -		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem); +		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);  #endif diff --git a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c index 108c807c64..faaebdd7c4 100644 --- a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c +++ b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.c @@ -252,7 +252,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.h b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.h index f33ecb7504..84e7680f34 100644 --- a/Demos/Host/ClassDriver/MIDIHost/MIDIHost.h +++ b/Demos/Host/ClassDriver/MIDIHost/MIDIHost.h @@ -73,7 +73,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c index 697da34209..40cf2a48d3 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.c @@ -289,7 +289,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h index 0cd9897817..b99471205f 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/ClassDriver/MassStorageHost/MassStorageHost.h @@ -74,7 +74,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.c b/Demos/Host/ClassDriver/MouseHost/MouseHost.c index 6edceb08dc..a03381cc6a 100644 --- a/Demos/Host/ClassDriver/MouseHost/MouseHost.c +++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.c @@ -207,7 +207,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.h b/Demos/Host/ClassDriver/MouseHost/MouseHost.h index ccbaa82136..7664580cb4 100644 --- a/Demos/Host/ClassDriver/MouseHost/MouseHost.h +++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.h @@ -70,7 +70,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c index ef7835e54e..111bed48e7 100644 --- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c +++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c @@ -240,7 +240,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" @@ -259,7 +260,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8   *   *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded   */ -bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem) +bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)  {  	bool IsMouse = false; diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h index 342dff79aa..3b26cead55 100644 --- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h +++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.h @@ -88,9 +88,10 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void); -		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem); +		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);  #endif diff --git a/Demos/Host/ClassDriver/PrinterHost/PrinterHost.c b/Demos/Host/ClassDriver/PrinterHost/PrinterHost.c index 9d5ca08d9a..e0d9726b6e 100644 --- a/Demos/Host/ClassDriver/PrinterHost/PrinterHost.c +++ b/Demos/Host/ClassDriver/PrinterHost/PrinterHost.c @@ -211,7 +211,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/PrinterHost/PrinterHost.h b/Demos/Host/ClassDriver/PrinterHost/PrinterHost.h index a4880577e8..a2b90a69d5 100644 --- a/Demos/Host/ClassDriver/PrinterHost/PrinterHost.h +++ b/Demos/Host/ClassDriver/PrinterHost/PrinterHost.h @@ -73,7 +73,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.c b/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.c index 589faebcad..b793db9285 100644 --- a/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.c +++ b/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.c @@ -236,7 +236,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.h b/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.h index 06f5ec2f05..f3c04f593d 100644 --- a/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.h +++ b/Demos/Host/ClassDriver/RNDISEthernetHost/RNDISEthernetHost.h @@ -74,7 +74,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c index 8f91d81f1e..152639fef8 100644 --- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c +++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c @@ -205,7 +205,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.h b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.h index 5c163ef54b..1b776596bb 100644 --- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.h +++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.h @@ -70,7 +70,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c index e6403ecdfc..543e098252 100644 --- a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c +++ b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c @@ -182,7 +182,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h index bd5cd6ad65..ed4ffcef7a 100644 --- a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h +++ b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.h @@ -70,7 +70,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c index 55c399778a..8301e85bd0 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.c @@ -123,7 +123,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h index e0de59ae25..0814845a05 100644 --- a/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h +++ b/Demos/Host/Incomplete/BluetoothHost/BluetoothHost.h @@ -79,7 +79,8 @@  		void EVENT_USB_Host_DeviceUnattached(void);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  	/* Function Prototypes: */  		void SetupHardware(void); diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c index 68a02d48b7..939b2ae5f6 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothACLPackets.c @@ -211,7 +211,8 @@ static void Bluetooth_ProcessIncomingACLPackets(void)   *   *  \return Pointer to the matching channel information structure in the channel table if found, NULL otherwise   */ -Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, const uint8_t SearchKey) +Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, +                                              const uint8_t SearchKey)  {  	for (uint8_t i = 0; i < BLUETOOTH_MAX_OPEN_CHANNELS; i++)  	{ @@ -253,7 +254,9 @@ Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, const   *   * \return A value from the \ref BT_SendPacket_ErrorCodes_t enum   */ -uint8_t Bluetooth_SendPacket(void* Data, const uint16_t DataLen, Bluetooth_Channel_t* const ACLChannel) +uint8_t Bluetooth_SendPacket(void* Data, +                             const uint16_t DataLen, +                             Bluetooth_Channel_t* const ACLChannel)  {  	BT_ACL_Header_t        ACLPacketHeader;  	BT_DataPacket_Header_t DataHeader; diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c index 0db17a263e..7f6f8b78d3 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.c @@ -374,7 +374,9 @@ void Bluetooth_HCITask(void)   *   *  \return A value from the USB_Host_SendControlErrorCodes_t enum.   */ -static uint8_t Bluetooth_SendHCICommand(const BT_HCICommand_Header_t* const HCICommandHeader, const void* Parameters, const uint16_t ParameterLength) +static uint8_t Bluetooth_SendHCICommand(const BT_HCICommand_Header_t* const HCICommandHeader, +                                        const void* Parameters, +                                        const uint16_t ParameterLength)  {  	/* Need to reserve the amount of bytes given in the header for the complete payload */  	uint8_t CommandBuffer[sizeof(BT_HCICommand_Header_t) + HCICommandHeader->ParameterLength]; diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h index 5a556e1141..9476446f65 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothHCICommands.h @@ -204,7 +204,8 @@  		void Bluetooth_HCITask(void);  		#if defined(INCLUDE_FROM_BLUETOOTHHCICOMMANDS_C) -			static uint8_t Bluetooth_SendHCICommand(const BT_HCICommand_Header_t* const HCICommandHeader, const void* Parameters, +			static uint8_t Bluetooth_SendHCICommand(const BT_HCICommand_Header_t* const HCICommandHeader, +			                                        const void* Parameters,  			                                        const uint16_t ParameterLength);  		#endif diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h index f47bf1e0a1..6f1ea67424 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/BluetoothStack.h @@ -155,13 +155,17 @@  		void                 Bluetooth_ConnectionComplete(void);  		void                 Bluetooth_DisconnectionComplete(void);  		bool                 Bluetooth_ChannelConnectionRequest(const uint16_t PSM); -		void                 Bluetooth_PacketReceived(void* Data, uint16_t DataLen, Bluetooth_Channel_t* const ACLChannel); +		void                 Bluetooth_PacketReceived(void* Data, uint16_t DataLen, +		                                              Bluetooth_Channel_t* const ACLChannel);  		void                 Bluetooth_ChannelOpened(Bluetooth_Channel_t* const ACLChannel); -		Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, const uint8_t SearchKey); +		Bluetooth_Channel_t* Bluetooth_GetChannelData(const uint16_t SearchValue, +		                                              const uint8_t SearchKey);  		Bluetooth_Channel_t* Bluetooth_OpenChannel(const uint16_t PSM);  		void                 Bluetooth_CloseChannel(Bluetooth_Channel_t* const ACLChannel); -		uint8_t              Bluetooth_SendPacket(void* Data, uint16_t DataLen, Bluetooth_Channel_t* const ACLChannel); +		uint8_t              Bluetooth_SendPacket(void* Data, +		                                          uint16_t DataLen, +		                                          Bluetooth_Channel_t* const ACLChannel);  	/* External Variables: */  		extern Bluetooth_Device_t      Bluetooth_DeviceConfiguration; diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c index d091676aad..f74002a076 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.c @@ -118,7 +118,8 @@ void RFCOMM_ServiceChannels(Bluetooth_Channel_t* const ACLChannel)   *  \param[in] Data        Incoming packet data containing the RFCOMM packet   *  \param[in] ACLChannel  ACL channel the request was issued to by the remote device   */ -void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const ACLChannel) +void RFCOMM_ProcessPacket(void* Data, +                          Bluetooth_Channel_t* const ACLChannel)  {  	const RFCOMM_Header_t* FrameHeader  = (const RFCOMM_Header_t*)Data;  	const uint8_t*         FrameData    = (const uint8_t*)Data + sizeof(RFCOMM_Header_t); @@ -154,7 +155,8 @@ void RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const ACLChannel)   *  \param[in] RFCOMMChannel  RFCOMM logical channel whose local terminal signals have changed   *  \param[in] ACLChannel     ACL channel which has been opened to carry RFCOMM traffic between devices   */ -void RFCOMM_SendChannelSignals(const RFCOMM_Channel_t* const RFCOMMChannel, Bluetooth_Channel_t* const ACLChannel) +void RFCOMM_SendChannelSignals(const RFCOMM_Channel_t* const RFCOMMChannel, +                               Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, ">> MSC Command");  	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", RFCOMMChannel->DLCI); @@ -184,7 +186,9 @@ void RFCOMM_SendChannelSignals(const RFCOMM_Channel_t* const RFCOMMChannel, Blue   *  \param[in] RFCOMMChannel  RFCOMM logical channel which is to be transmitted to   *  \param[in] ACLChannel     ACL channel which has been opened to carry RFCOMM traffic between devices   */ -void RFCOMM_SendData(const uint16_t DataLen, const uint8_t* Data, const RFCOMM_Channel_t* const RFCOMMChannel, +void RFCOMM_SendData(const uint16_t DataLen, +                     const uint8_t* Data, +                     const RFCOMM_Channel_t* const RFCOMMChannel,                       Bluetooth_Channel_t* const ACLChannel)  {  	if (RFCOMMChannel->State != RFCOMM_Channel_Open) @@ -263,8 +267,12 @@ uint16_t RFCOMM_GetVariableFieldValue(const uint8_t** BufferPos)  	return (((uint16_t)SecondOctet << 7) | FirstOctet >> 1);  } -void RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, const uint8_t Control, const uint16_t DataLen, -                      const void* Data, Bluetooth_Channel_t* const ACLChannel) +void RFCOMM_SendFrame(const uint8_t DLCI, +                      const bool CommandResponse, +                      const uint8_t Control, +                      const uint16_t DataLen, +                      const void* Data, +                      Bluetooth_Channel_t* const ACLChannel)  {  	struct  	{ @@ -304,7 +312,8 @@ void RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, const uint  	Bluetooth_SendPacket(&ResponsePacket, sizeof(ResponsePacket), ACLChannel);  } -static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint8_t Length) +static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, +                                  uint8_t Length)  {  	uint8_t FCS = 0xFF; @@ -315,13 +324,15 @@ static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint8_t Length)  	return ~FCS;  } -static void RFCOMM_ProcessDM(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessDM(const RFCOMM_Address_t* const FrameAddress, +                             Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< DM Received");  	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);  } -static void RFCOMM_ProcessDISC(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessDISC(const RFCOMM_Address_t* const FrameAddress, +                               Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< DISC Received");  	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI); @@ -336,7 +347,8 @@ static void RFCOMM_ProcessDISC(const RFCOMM_Address_t* const FrameAddress, Bluet  	RFCOMM_SendFrame(FrameAddress->DLCI, true, (RFCOMM_Frame_UA | FRAME_POLL_FINAL), 0, NULL, ACLChannel);  } -static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, +                               Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< SABM Received");  	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI); @@ -375,14 +387,17 @@ static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, Bluet  	}  } -static void RFCOMM_ProcessUA(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessUA(const RFCOMM_Address_t* const FrameAddress, +                             Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< UA Received");  	BT_RFCOMM_DEBUG(2, "-- DLCI 0x%02X", FrameAddress->DLCI);  } -static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, const uint16_t FrameLength,  -                              const uint8_t* FrameData, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, +                              const uint16_t FrameLength,  +                              const uint8_t* FrameData, +                              Bluetooth_Channel_t* const ACLChannel)  {  	if (FrameAddress->DLCI == RFCOMM_CONTROL_DLCI)  	{ diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h index 5d22e38250..7b74f4fab3 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMM.h @@ -102,33 +102,48 @@  	/* Function Prototypes: */  		void              RFCOMM_Initialize(void);  		void              RFCOMM_ServiceChannels(Bluetooth_Channel_t* const ACLChannel); -		void              RFCOMM_ProcessPacket(void* Data, Bluetooth_Channel_t* const ACLChannel); +		void              RFCOMM_ProcessPacket(void* Data, +		                                       Bluetooth_Channel_t* const ACLChannel);  		void              RFCOMM_SendChannelSignals(const RFCOMM_Channel_t* const RFCOMMChannel,  		                                            Bluetooth_Channel_t* const ACLChannel); -		void              RFCOMM_SendData(const uint16_t DataLen, const uint8_t* Data, +		void              RFCOMM_SendData(const uint16_t DataLen, +		                                  const uint8_t* Data,  		                                  const RFCOMM_Channel_t* const RFCOMMChannel,  		                                  Bluetooth_Channel_t* const ACLChannel);  		void              RFCOMM_ChannelOpened(RFCOMM_Channel_t* const RFCOMMChannel); -		void              RFCOMM_DataReceived(RFCOMM_Channel_t* const RFCOMMChannel, uint16_t DataLen, const uint8_t* Data); +		void              RFCOMM_DataReceived(RFCOMM_Channel_t* const RFCOMMChannel, +		                                      uint16_t DataLen, +		                                      const uint8_t* Data);  		void              RFCOMM_ChannelSignalsReceived(RFCOMM_Channel_t* const RFCOMMChannel);  		RFCOMM_Channel_t* RFCOMM_GetFreeChannelEntry(const uint8_t DLCI);  		RFCOMM_Channel_t* RFCOMM_GetChannelData(const uint8_t DLCI);  		uint16_t          RFCOMM_GetVariableFieldValue(const uint8_t** BufferPos); -		void              RFCOMM_SendFrame(const uint8_t DLCI, const bool CommandResponse, const uint8_t Control, -			                               const uint16_t DataLen, const void* Data, Bluetooth_Channel_t* const ACLChannel); +		void              RFCOMM_SendFrame(const uint8_t DLCI, +		                                   const bool CommandResponse, +		                                   const uint8_t Control, +			                               const uint16_t DataLen, +		                                   const void* Data, +		                                   Bluetooth_Channel_t* const ACLChannel);  		#if defined(INCLUDE_FROM_RFCOMM_C) -			static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, uint8_t Length); +			static uint8_t RFCOMM_GetFCSValue(const void* FrameStart, +			                                  uint8_t Length); -			static void RFCOMM_ProcessDM(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessDISC(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessUA(const RFCOMM_Address_t* const FrameAddress, Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, const uint16_t FrameLength,  -                                          const uint8_t* FrameData, Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessDM(const RFCOMM_Address_t* const FrameAddress, +			                             Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessDISC(const RFCOMM_Address_t* const FrameAddress, +			                               Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessSABM(const RFCOMM_Address_t* const FrameAddress, +			                               Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessUA(const RFCOMM_Address_t* const FrameAddress, +			                             Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessUIH(const RFCOMM_Address_t* const FrameAddress, +			                              const uint16_t FrameLength,  +                                          const uint8_t* FrameData, +			                              Bluetooth_Channel_t* const ACLChannel);  		#endif  #endif diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c index 0f829eab56..5bd8845720 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.c @@ -38,7 +38,8 @@  #define  INCLUDE_FROM_RFCOMM_CONTROL_C  #include "RFCOMMControl.h" -void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const ACLChannel) +void RFCOMM_ProcessControlCommand(const uint8_t* Command, +                                  Bluetooth_Channel_t* const ACLChannel)  {  	const RFCOMM_Command_t* CommandHeader  = (const RFCOMM_Command_t*)Command;  	const uint8_t*          CommandData    = (const uint8_t*)Command + sizeof(RFCOMM_Command_t); @@ -73,8 +74,10 @@ void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* c  	}  } -static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, -                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, +                                      const uint8_t CommandDataLen, +                                      const uint8_t* CommandData, +                                      Bluetooth_Channel_t* const ACLChannel)  {  	const uint8_t* Params = (const uint8_t*)CommandData; @@ -98,20 +101,24 @@ static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeade  	RFCOMM_SendFrame(RFCOMM_CONTROL_DLCI, false, RFCOMM_Frame_UIH, sizeof(TestResponse), &TestResponse, ACLChannel);  } -static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, +                                     const uint8_t* CommandData,  			                         Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< FCE Command");  } -static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, +                                     const uint8_t* CommandData,  			                         Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< FCD Command");  } -static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, -                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel) +static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, +                                     const uint8_t CommandDataLen, +                                     const uint8_t* CommandData, +                                     Bluetooth_Channel_t* const ACLChannel)  {  	const RFCOMM_MSC_Parameters_t* Params = (const RFCOMM_MSC_Parameters_t*)CommandData; @@ -168,19 +175,22 @@ static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader  	}	  } -static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, +                                     const uint8_t* CommandData,  			                         Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< RPN Command");  } -static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, +                                     const uint8_t* CommandData,  			                         Bluetooth_Channel_t* const ACLChannel)  {  	BT_RFCOMM_DEBUG(1, "<< RLS Command");  } -static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, +                                     const uint8_t* CommandData,  			                         Bluetooth_Channel_t* const ACLChannel)  {  	const RFCOMM_DPN_Parameters_t* Params = (const RFCOMM_DPN_Parameters_t*)CommandData; diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h index d47715f804..b527bfa7c2 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/RFCOMMControl.h @@ -115,22 +115,32 @@  		} RFCOMM_MSC_Parameters_t;  	/* Function Prototypes: */ -		void RFCOMM_ProcessControlCommand(const uint8_t* Command, Bluetooth_Channel_t* const Channel); +		void RFCOMM_ProcessControlCommand(const uint8_t* Command, +		                                  Bluetooth_Channel_t* const Channel);  		#if defined(INCLUDE_FROM_RFCOMM_CONTROL_C) -			static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen,  -			                                      const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +			static void RFCOMM_ProcessTestCommand(const RFCOMM_Command_t* const CommandHeader, +			                                      const uint8_t CommandDataLen,  +			                                      const uint8_t* CommandData, +			                                      Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessFCECommand(const RFCOMM_Command_t* const CommandHeader, +			                                     const uint8_t* CommandData,  			                                     Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +			static void RFCOMM_ProcessFCDCommand(const RFCOMM_Command_t* const CommandHeader, +			                                     const uint8_t* CommandData,  			                                     Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t CommandDataLen, -			                                     const uint8_t* CommandData, Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +			static void RFCOMM_ProcessMSCCommand(const RFCOMM_Command_t* const CommandHeader, +			                                     const uint8_t CommandDataLen, +			                                     const uint8_t* CommandData,  			                                     Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +			static void RFCOMM_ProcessRPNCommand(const RFCOMM_Command_t* const CommandHeader, +			                                     const uint8_t* CommandData,  			                                     Bluetooth_Channel_t* const ACLChannel); -			static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, const uint8_t* CommandData, +			static void RFCOMM_ProcessRLSCommand(const RFCOMM_Command_t* const CommandHeader, +			                                     const uint8_t* CommandData, +			                                     Bluetooth_Channel_t* const ACLChannel); +			static void RFCOMM_ProcessDPNCommand(const RFCOMM_Command_t* const CommandHeader, +			                                     const uint8_t* CommandData,  			                                     Bluetooth_Channel_t* const ACLChannel);  		#endif diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c index eb501f7096..e0522f9943 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.c @@ -88,7 +88,8 @@ void SDP_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel)   *  \param[in] SDPHeader  Pointer to the start of the issued SDP request   *  \param[in] Channel    Pointer to the Bluetooth channel structure the request was issued to   */ -static void SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel) +static void SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, +                                     Bluetooth_Channel_t* const Channel)  {  	const void* CurrentParameter = ((const void*)SDPHeader + sizeof(SDP_PDUHeader_t)); @@ -169,7 +170,8 @@ static void SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, Blu   *  \param[in] SDPHeader  Pointer to the start of the issued SDP request   *  \param[in] Channel    Pointer to the Bluetooth channel structure the request was issued to   */ -static void SDP_ProcessServiceAttribute(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel) +static void SDP_ProcessServiceAttribute(const SDP_PDUHeader_t* const SDPHeader, +                                        Bluetooth_Channel_t* const Channel)  {  	const void* CurrentParameter = ((const void*)SDPHeader + sizeof(SDP_PDUHeader_t)); @@ -259,7 +261,8 @@ static void SDP_ProcessServiceAttribute(const SDP_PDUHeader_t* const SDPHeader,   *  \param[in] SDPHeader  Pointer to the start of the issued SDP request   *  \param[in] Channel    Pointer to the Bluetooth channel structure the request was issued to   */ -static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel) +static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHeader, +                                              Bluetooth_Channel_t* const Channel)  {  	const void* CurrentParameter = ((const void*)SDPHeader + sizeof(SDP_PDUHeader_t)); @@ -348,8 +351,10 @@ static void SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHe   *   *  \return Number of bytes added to the output buffer   */ -static uint16_t SDP_AddListedAttributesToResponse(const ServiceAttributeTable_t* AttributeTable, uint16_t AttributeList[][2], -                                                  const uint8_t TotalAttributes, void** const BufferPos) +static uint16_t SDP_AddListedAttributesToResponse(const ServiceAttributeTable_t* AttributeTable, +                                                  uint16_t AttributeList[][2], +                                                  const uint8_t TotalAttributes, +                                                  void** const BufferPos)  {  	uint16_t TotalResponseSize; @@ -396,7 +401,9 @@ static uint16_t SDP_AddListedAttributesToResponse(const ServiceAttributeTable_t*   *   *  \return Number of bytes added to the response buffer   */ -static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, const void* AttributeValue, void** ResponseBuffer) +static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, +                                           const void* AttributeValue, +                                           void** ResponseBuffer)  {  	/* Retrieve the size of the attribute value from its container header */  	uint8_t  AttributeHeaderLength; @@ -424,7 +431,8 @@ static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, const voi   *   *  \return Pointer to the start of the Attribute's value if found within the table, NULL otherwise   */ -static void* SDP_GetAttributeValue(const ServiceAttributeTable_t* AttributeTable, const uint16_t AttributeID) +static void* SDP_GetAttributeValue(const ServiceAttributeTable_t* AttributeTable, +                                   const uint16_t AttributeID)  {  	void* CurrTableItemData; @@ -449,7 +457,8 @@ static void* SDP_GetAttributeValue(const ServiceAttributeTable_t* AttributeTable   *   *  \return True if all the UUIDs given in the UUID list appear in the given attribute table, false otherwise   */ -static bool SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, +static bool SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], +                                   const uint8_t TotalUUIDs,  			                       const ServiceAttributeTable_t* CurrAttributeTable)  {  	const void* CurrAttribute; @@ -481,8 +490,10 @@ static bool SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], const ui   *   *  \return True if all the UUIDs given in the UUID list appear in the given attribute table, false otherwise   */ -static void SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, -                               uint16_t* const UUIDMatchFlags, const void* CurrAttribute) +static void SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], +                               const uint8_t TotalUUIDs, +                               uint16_t* const UUIDMatchFlags, +                               const void* CurrAttribute)  {  	uint8_t CurrAttributeType = (pgm_read_byte(CurrAttribute) & ~0x07); @@ -536,7 +547,8 @@ static void SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_   *   *  \return Total number of Attribute ranges stored in the Data Element Sequence   */ -static uint8_t SDP_GetAttributeList(uint16_t AttributeList[][2], const void** const CurrentParameter) +static uint8_t SDP_GetAttributeList(uint16_t AttributeList[][2], +                                    const void** const CurrentParameter)  {  	uint8_t ElementHeaderSize;  	uint8_t TotalAttributes = 0; @@ -578,7 +590,8 @@ static uint8_t SDP_GetAttributeList(uint16_t AttributeList[][2], const void** co   *   *  \return Total number of UUIDs stored in the Data Element Sequence   */ -static uint8_t SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void** const CurrentParameter) +static uint8_t SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], +                               const void** const CurrentParameter)  {  	uint8_t ElementHeaderSize;  	uint8_t TotalUUIDs = 0; @@ -629,7 +642,8 @@ static uint8_t SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void**   *   *  \return Size in bytes of the entire attribute container, including the header   */ -static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData, uint8_t* const HeaderSize) +static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData, +                                                   uint8_t* const HeaderSize)  {  	/* Fetch the size of the Data Element structure from the header */  	uint8_t SizeIndex = (pgm_read_byte(AttributeData) & 0x07); @@ -668,7 +682,8 @@ static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeDa   *   *  \return Size in bytes of the Data Element container's contents, minus the header   */ -static uint32_t SDP_GetDataElementSize(const void** const DataElementHeader, uint8_t* const ElementHeaderSize) +static uint32_t SDP_GetDataElementSize(const void** const DataElementHeader, +                                       uint8_t* const ElementHeaderSize)  {  	/* Fetch the size of the Data Element structure from the header, increment the current buffer pos */  	uint8_t  SizeIndex = (SDP_ReadData8(DataElementHeader) & 0x07);	 diff --git a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h index 548f3d5579..2df8c225d7 100644 --- a/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h +++ b/Demos/Host/Incomplete/BluetoothHost/Lib/SDP.h @@ -110,7 +110,8 @@  		 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be written to  		 *  \param[in]      Data       Data to write to the buffer  		 */ -		static inline void SDP_WriteData8(void** BufferPos, uint8_t Data) +		static inline void SDP_WriteData8(void** BufferPos, +		                                  const uint8_t Data)  		{  			*((uint8_t*)*BufferPos) = Data;  			*BufferPos += sizeof(uint8_t); @@ -121,7 +122,8 @@  		 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be written to  		 *  \param[in]      Data       Data to write to the buffer  		 */ -		static inline void SDP_WriteData16(void** BufferPos, uint16_t Data) +		static inline void SDP_WriteData16(void** BufferPos, +		                                   const uint16_t Data)  		{  			*((uint16_t*)*BufferPos) = SwapEndian_16(Data);  			*BufferPos += sizeof(uint16_t); @@ -132,7 +134,8 @@  		 *  \param[in, out] BufferPos  Current position in the buffer where the data is to be written to  		 *  \param[in]      Data       Data to write to the buffer  		 */ -		static inline void SDP_WriteData32(void** BufferPos, uint32_t Data) +		static inline void SDP_WriteData32(void** BufferPos, +		                                   const uint32_t Data)  		{  			*((uint32_t*)*BufferPos) = SwapEndian_32(Data);  			*BufferPos += sizeof(uint32_t); @@ -203,28 +206,44 @@  		}  	/* Function Prototypes: */ -		void SDP_ProcessPacket(void* Data, Bluetooth_Channel_t* const Channel); +		void SDP_ProcessPacket(void* Data, +		                       Bluetooth_Channel_t* const Channel);  		#if defined(INCLUDE_FROM_SERVICEDISCOVERYPROTOCOL_C) -			static void     SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel); -			static void     SDP_ProcessServiceAttribute(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel); -			static void     SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHeader, Bluetooth_Channel_t* const Channel); - -			static uint16_t SDP_AddListedAttributesToResponse(const ServiceAttributeTable_t* AttributeTable, uint16_t AttributeList[][2], -			                                                  const uint8_t TotalAttributes, void** const BufferPos); -			static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, const void* AttributeValue, void** ResponseBuffer); -			static void*    SDP_GetAttributeValue(const ServiceAttributeTable_t* AttributeTable, const uint16_t AttributeID); - -			static bool     SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, +			static void     SDP_ProcessServiceSearch(const SDP_PDUHeader_t* const SDPHeader, +			                                         Bluetooth_Channel_t* const Channel); +			static void     SDP_ProcessServiceAttribute(const SDP_PDUHeader_t* const SDPHeader, +			                                            Bluetooth_Channel_t* const Channel); +			static void     SDP_ProcessServiceSearchAttribute(const SDP_PDUHeader_t* const SDPHeader, +			                                                  Bluetooth_Channel_t* const Channel); + +			static uint16_t SDP_AddListedAttributesToResponse(const ServiceAttributeTable_t* AttributeTable, +			                                                  uint16_t AttributeList[][2], +			                                                  const uint8_t TotalAttributes, +			                                                  void** const BufferPos); +			static uint16_t SDP_AddAttributeToResponse(const uint16_t AttributeID, +			                                           const void* AttributeValue, +			                                           void** ResponseBuffer); +			static void*    SDP_GetAttributeValue(const ServiceAttributeTable_t* AttributeTable, +			                                      const uint16_t AttributeID); + +			static bool     SDP_SearchServiceTable(uint8_t UUIDList[][UUID_SIZE_BYTES], +			                                       const uint8_t TotalUUIDs,  			                                       const ServiceAttributeTable_t* CurrAttributeTable); -			static void     SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], const uint8_t TotalUUIDs, -			                                   uint16_t* const UUIDMatchFlags, const void* CurrAttribute); - -			static uint8_t  SDP_GetAttributeList(uint16_t AttributeList[][2], const void** const CurrentParameter); -			static uint8_t  SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], const void** const CurrentParameter); - -			static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData, uint8_t* const HeaderSize); -			static uint32_t SDP_GetDataElementSize(const void** const AttributeHeader, uint8_t* const ElementHeaderSize); +			static void     SDP_CheckUUIDMatch(uint8_t UUIDList[][UUID_SIZE_BYTES], +			                                   const uint8_t TotalUUIDs, +			                                   uint16_t* const UUIDMatchFlags, +			                                   const void* CurrAttribute); + +			static uint8_t  SDP_GetAttributeList(uint16_t AttributeList[][2], +			                                     const void** const CurrentParameter); +			static uint8_t  SDP_GetUUIDList(uint8_t UUIDList[][UUID_SIZE_BYTES], +			                                const void** const CurrentParameter); + +			static uint32_t SDP_GetLocalAttributeContainerSize(const void* const AttributeData, +			                                                   uint8_t* const HeaderSize); +			static uint32_t SDP_GetDataElementSize(const void** const AttributeHeader, +			                                       uint8_t* const ElementHeaderSize);  		#endif  #endif diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c index f477ac2768..66a5b8e7ee 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c +++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" @@ -165,11 +166,14 @@ void ReadNextReport(void)  /** Writes a report to the attached device.   *   *  \param[in] ReportOUTData  Buffer containing the report to send to the device - *  \param[in] ReportIndex  Index of the report in the device (zero if the device does not use multiple reports) - *  \param[in] ReportType  Type of report to send, either REPORT_TYPE_OUT or REPORT_TYPE_FEATURE - *  \param[in] ReportLength  Length of the report to send + *  \param[in] ReportIndex    Index of the report in the device (zero if the device does not use multiple reports) + *  \param[in] ReportType     Type of report to send, either REPORT_TYPE_OUT or REPORT_TYPE_FEATURE + *  \param[in] ReportLength   Length of the report to send   */ -void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength) +void WriteNextReport(uint8_t* ReportOUTData, +                     const uint8_t ReportIndex, +                     const uint8_t ReportType, +                     uint16_t ReportLength)  {  	/* Select the HID data OUT pipe */  	Pipe_SelectPipe(HID_DATA_OUT_PIPE); diff --git a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h index 8d0674eee6..89ac01958e 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h +++ b/Demos/Host/LowLevel/GenericHIDHost/GenericHIDHost.h @@ -90,10 +90,14 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void ReadNextReport(void); -		void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength); +		void WriteNextReport(uint8_t* ReportOUTData, +		                     const uint8_t ReportIndex, +		                     const uint8_t ReportType, +		                     uint16_t ReportLength);  #endif diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.c b/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.c index cc7c98bfcf..bda99bdd02 100644 --- a/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.c +++ b/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.c @@ -79,7 +79,7 @@ uint8_t GetHIDReportData(void)   *   *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded   */ -bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem) +bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)  {  	bool IsJoystick = false; diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.h b/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.h index 3ffc051e84..da73ff823a 100644 --- a/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/JoystickHostWithParser/HIDReport.h @@ -89,6 +89,6 @@  	/* Function Prototypes: */  		uint8_t GetHIDReportData(void); -		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem); +		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);  #endif diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.h b/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.h index cf6369b9b9..95a0a639e9 100644 --- a/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.h +++ b/Demos/Host/LowLevel/JoystickHostWithParser/JoystickHostWithParser.h @@ -76,7 +76,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void ProcessJoystickReport(uint8_t* JoystickReport); diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c index debbf76510..d98c265575 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h index dc09f84c9f..91a2be534c 100644 --- a/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h +++ b/Demos/Host/LowLevel/KeyboardHost/KeyboardHost.h @@ -87,7 +87,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void ReadNextReport(void); diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c index eb8ec59a83..6b4df377d2 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.c @@ -79,7 +79,7 @@ uint8_t GetHIDReportData(void)   *   *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded   */ -bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem) +bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)  {  	/* Check the attributes of the current item - see if we are interested in it or not;  	 * only store KEYBOARD usage page items into the Processed HID Report structure to diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h index 428b91a2b1..09cace965c 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/HIDReport.h @@ -77,6 +77,6 @@  	/* Function Prototypes: */  		uint8_t GetHIDReportData(void); -		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem); +		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);  #endif diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c index 301f6de3ed..666879c982 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h index 500b7cb2c4..76b3b49a99 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/KeyboardHostWithParser.h @@ -71,7 +71,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void ProcessKeyboardReport(uint8_t* KeyboardReport); diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.c b/Demos/Host/LowLevel/MIDIHost/MIDIHost.c index 9c81902865..f518550b5d 100644 --- a/Demos/Host/LowLevel/MIDIHost/MIDIHost.c +++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.c @@ -114,7 +114,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/MIDIHost/MIDIHost.h b/Demos/Host/LowLevel/MIDIHost/MIDIHost.h index 1338f65166..ecae67c8d6 100644 --- a/Demos/Host/LowLevel/MIDIHost/MIDIHost.h +++ b/Demos/Host/LowLevel/MIDIHost/MIDIHost.h @@ -108,7 +108,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c index 129c50af83..b94bbcac7d 100644 --- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c +++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c @@ -63,7 +63,8 @@ static uint32_t MassStore_Tag = 1;   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum   */ -static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr) +static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* const SCSICommandBlock, +                                     void* BufferPtr)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -178,7 +179,8 @@ static uint8_t MassStore_WaitForDataReceived(void)   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum   */ -static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr) +static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* const SCSICommandBlock, +                                         void* BufferPtr)  {  	uint8_t  ErrorCode = PIPE_RWSTREAM_NoError;  	uint16_t BytesRem  = SCSICommandBlock->DataTransferLength; @@ -233,7 +235,7 @@ static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* SCSICommandBlock   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* SCSICommandStatus) +static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* const SCSICommandStatus)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -334,7 +336,8 @@ uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex)   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -uint8_t MassStore_Inquiry(const uint8_t LUNIndex, SCSI_Inquiry_Response_t* const InquiryPtr) +uint8_t MassStore_Inquiry(const uint8_t LUNIndex, +                          SCSI_Inquiry_Response_t* const InquiryPtr)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -384,7 +387,8 @@ uint8_t MassStore_Inquiry(const uint8_t LUNIndex, SCSI_Inquiry_Response_t* const   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -uint8_t MassStore_RequestSense(const uint8_t LUNIndex, SCSI_Request_Sense_Response_t* const SensePtr) +uint8_t MassStore_RequestSense(const uint8_t LUNIndex, +                               SCSI_Request_Sense_Response_t* const SensePtr)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -437,8 +441,11 @@ uint8_t MassStore_RequestSense(const uint8_t LUNIndex, SCSI_Request_Sense_Respon   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress, -                                  const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) +uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, +                                  const uint32_t BlockAddress, +                                  const uint8_t Blocks, +                                  const uint16_t BlockSize, +                                  void* BufferPtr)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -495,8 +502,11 @@ uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAd   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress, -                                   const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) +uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex, +                                   const uint32_t BlockAddress, +                                   const uint8_t Blocks, +                                   const uint16_t BlockSize, +                                   void* BufferPtr)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -599,7 +609,8 @@ uint8_t MassStore_TestUnitReady(const uint8_t LUNIndex)   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, SCSI_Capacity_t* const CapacityPtr) +uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, +                               SCSI_Capacity_t* const CapacityPtr)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; @@ -658,7 +669,8 @@ uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, SCSI_Capacity_t* const Ca   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum, or MASS_STORE_SCSI_COMMAND_FAILED if the SCSI command fails   */ -uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex, const bool PreventRemoval) +uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex, +                                            const bool PreventRemoval)  {  	uint8_t ErrorCode = PIPE_RWSTREAM_NoError; diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h index aa349946c6..5c1e80b514 100644 --- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h +++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h @@ -185,25 +185,34 @@  	/* Function Prototypes: */  		#if defined(INCLUDE_FROM_MASSSTORE_COMMANDS_C) -			static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr); +			static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* const SCSICommandBlock, +			                                     void* BufferPtr);  			static uint8_t MassStore_WaitForDataReceived(void); -			static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1); -			static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* SCSICommandStatus) ATTR_NON_NULL_PTR_ARG(1); +			static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* const SCSICommandBlock, +			                                         void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1); +			static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* const SCSICommandStatus) ATTR_NON_NULL_PTR_ARG(1);  		#endif  		uint8_t MassStore_MassStorageReset(void);  		uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex); -		uint8_t MassStore_RequestSense(const uint8_t LUNIndex, SCSI_Request_Sense_Response_t* const SensePtr) -		                               ATTR_NON_NULL_PTR_ARG(2); -		uint8_t MassStore_Inquiry(const uint8_t LUNIndex, SCSI_Inquiry_Response_t* const InquiryPtr) -		                               ATTR_NON_NULL_PTR_ARG(2); -		uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress, -		                                  const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5); -		uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress, -                                           const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5); -		uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, SCSI_Capacity_t* const CapacityPtr) -		                               ATTR_NON_NULL_PTR_ARG(2); +		uint8_t MassStore_RequestSense(const uint8_t LUNIndex, +		                               SCSI_Request_Sense_Response_t* const SensePtr) ATTR_NON_NULL_PTR_ARG(2); +		uint8_t MassStore_Inquiry(const uint8_t LUNIndex, +		                          SCSI_Inquiry_Response_t* const InquiryPtr) ATTR_NON_NULL_PTR_ARG(2); +		uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, +		                                  const uint32_t BlockAddress, +		                                  const uint8_t Blocks, +		                                  const uint16_t BlockSize, +		                                  void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5); +		uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex, +		                                   const uint32_t BlockAddress, +                                           const uint8_t Blocks, +		                                   const uint16_t BlockSize, +		                                   void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5); +		uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, +		                               SCSI_Capacity_t* const CapacityPtr) ATTR_NON_NULL_PTR_ARG(2);  		uint8_t MassStore_TestUnitReady(const uint8_t LUNIndex); -		uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex, const bool PreventRemoval); +		uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex, +		                                            const bool PreventRemoval);  #endif diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c index 2739fc99aa..985aeeb08d 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.c @@ -117,7 +117,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" @@ -373,7 +374,8 @@ void MassStorage_Task(void)   *  \param[in] CommandString  ASCII string located in PROGMEM space indicating what operation failed   *  \param[in] ErrorCode      Error code of the function which failed to complete successfully   */ -void ShowDiskReadError(char* CommandString, uint8_t ErrorCode) +void ShowDiskReadError(char* CommandString, +                       const uint8_t ErrorCode)  {  	if (ErrorCode == MASS_STORE_SCSI_COMMAND_FAILED)  	{ diff --git a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h index 14d8d9734e..7aabe9f7db 100644 --- a/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h +++ b/Demos/Host/LowLevel/MassStorageHost/MassStorageHost.h @@ -80,9 +80,11 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void); -		void ShowDiskReadError(char* CommandString, uint8_t ErrorCode); +		void ShowDiskReadError(char* CommandString, +		                       const uint8_t ErrorCode);  #endif diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.c b/Demos/Host/LowLevel/MouseHost/MouseHost.c index 6e7b284dff..bf20bca52e 100644 --- a/Demos/Host/LowLevel/MouseHost/MouseHost.c +++ b/Demos/Host/LowLevel/MouseHost/MouseHost.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.h b/Demos/Host/LowLevel/MouseHost/MouseHost.h index f196dadcbf..b9c5aeda10 100644 --- a/Demos/Host/LowLevel/MouseHost/MouseHost.h +++ b/Demos/Host/LowLevel/MouseHost/MouseHost.h @@ -87,7 +87,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void ReadNextReport(void); diff --git a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c index f551f2f4cf..327ae45ecb 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c +++ b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.c @@ -79,7 +79,7 @@ uint8_t GetHIDReportData(void)   *   *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded   */ -bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem) +bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)  {  	bool IsMouse = false; diff --git a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h index 684c74319e..bd12a39c17 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h +++ b/Demos/Host/LowLevel/MouseHostWithParser/HIDReport.h @@ -92,6 +92,6 @@  	/* Function Prototypes: */  		uint8_t GetHIDReportData(void); -		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem); +		bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);  #endif diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c index efe1421a28..1b9c12aa9d 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c +++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h index 2c11f110ce..3a80c8e60c 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h +++ b/Demos/Host/LowLevel/MouseHostWithParser/MouseHostWithParser.h @@ -76,7 +76,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void ProcessMouseReport(uint8_t* MouseReport); diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c index 5f3effa7bf..024895991e 100644 --- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c +++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.c @@ -44,7 +44,8 @@   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum   */ -uint8_t Printer_SendData(const void* const PrinterCommands, const uint16_t CommandSize) +uint8_t Printer_SendData(const void* const PrinterCommands, +                         const uint16_t CommandSize)  {  	uint8_t ErrorCode; @@ -74,7 +75,8 @@ uint8_t Printer_SendData(const void* const PrinterCommands, const uint16_t Comma   *   *  \return A value from the USB_Host_SendControlErrorCodes_t enum   */ -uint8_t Printer_GetDeviceID(char* DeviceIDString, const uint16_t BufferSize) +uint8_t Printer_GetDeviceID(char* DeviceIDString, +                            const uint16_t BufferSize)  {  	uint8_t  ErrorCode = HOST_SENDCONTROL_Successful;  	uint16_t DeviceIDStringLength = 0; diff --git a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h index cbc54564c3..8c3bd33168 100644 --- a/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h +++ b/Demos/Host/LowLevel/PrinterHost/Lib/PrinterCommands.h @@ -59,9 +59,11 @@  		#define PRINTER_DATA_OUT_PIPE        2  	/* Function Prototypes: */ -		uint8_t Printer_SendData(const void* const PrinterCommands, const uint16_t CommandSize); -		uint8_t Printer_GetDeviceID(char* DeviceIDString, const uint16_t BufferSize); -		uint8_t Printer_GetPortStatus(uint8_t* PortStatus); +		uint8_t Printer_SendData(const void* const PrinterCommands, +		                         const uint16_t CommandSize); +		uint8_t Printer_GetDeviceID(char* DeviceIDString, +		                            const uint16_t BufferSize); +		uint8_t Printer_GetPortStatus(uint8_t* const PortStatus);  		uint8_t Printer_SoftReset(void);  #endif diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c index b6f3efae32..f12c95ef94 100644 --- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.c +++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.c @@ -98,7 +98,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)  }  /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */ -void EVENT_USB_Host_HostError(uint8_t ErrorCode) +void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  {  	USB_ShutDown(); @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/PrinterHost/PrinterHost.h b/Demos/Host/LowLevel/PrinterHost/PrinterHost.h index 99bbd4a667..78583f0e45 100644 --- a/Demos/Host/LowLevel/PrinterHost/PrinterHost.h +++ b/Demos/Host/LowLevel/PrinterHost/PrinterHost.h @@ -74,8 +74,9 @@  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void);  		void EVENT_USB_Host_DeviceEnumerationComplete(void); -		void EVENT_USB_Host_HostError(uint8_t ErrorCode); -		void EVENT_USB_Host_DeviceEnumerationFailed(uint8_t ErrorCode, uint8_t SubErrorCode); +		void EVENT_USB_Host_HostError(const uint8_t ErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void SetupHardware(void); diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.c b/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.c index 5200372e96..cd142ef553 100644 --- a/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.c +++ b/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.c @@ -47,7 +47,8 @@ uint32_t RequestID = 0;   *   *  \return A value from the USB_Host_SendControlErrorCodes_t enum   */ -uint8_t RNDIS_SendEncapsulatedCommand(void* const Buffer, const uint16_t Length) +uint8_t RNDIS_SendEncapsulatedCommand(void* const Buffer, +                                      const uint16_t Length)  {  	USB_ControlRequest = (USB_Request_Header_t)  		{ @@ -71,7 +72,8 @@ uint8_t RNDIS_SendEncapsulatedCommand(void* const Buffer, const uint16_t Length)   *   *  \return A value from the USB_Host_SendControlErrorCodes_t enum   */ -uint8_t RNDIS_GetEncapsulatedResponse(void* const Buffer, const uint16_t Length) +uint8_t RNDIS_GetEncapsulatedResponse(void* const Buffer, +                                      const uint16_t Length)  {  	USB_ControlRequest = (USB_Request_Header_t)  		{ @@ -128,7 +130,8 @@ uint8_t RNDIS_SendKeepAlive(void)   *  \return A value from the USB_Host_SendControlErrorCodes_t enum or RNDIS_COMMAND_FAILED if the device returned a   *          logical command failure   */ -uint8_t RNDIS_InitializeDevice(const uint16_t HostMaxPacketSize, uint16_t* const DeviceMaxPacketSize) +uint8_t RNDIS_InitializeDevice(const uint16_t HostMaxPacketSize, +                               uint16_t* const DeviceMaxPacketSize)  {  	uint8_t ErrorCode; @@ -172,7 +175,9 @@ uint8_t RNDIS_InitializeDevice(const uint16_t HostMaxPacketSize, uint16_t* const   *  \return A value from the USB_Host_SendControlErrorCodes_t enum or RNDIS_COMMAND_FAILED if the device returned a   *          logical command failure   */ -uint8_t RNDIS_SetRNDISProperty(const uint32_t Oid, void* Buffer, const uint16_t Length) +uint8_t RNDIS_SetRNDISProperty(const uint32_t Oid, +                               void* Buffer, +                               const uint16_t Length)  {  	uint8_t ErrorCode; @@ -222,7 +227,9 @@ uint8_t RNDIS_SetRNDISProperty(const uint32_t Oid, void* Buffer, const uint16_t   *  \return A value from the USB_Host_SendControlErrorCodes_t enum or RNDIS_COMMAND_FAILED if the device returned a   *          logical command failure   */ -uint8_t RNDIS_QueryRNDISProperty(const uint32_t Oid, void* Buffer, const uint16_t MaxLength) +uint8_t RNDIS_QueryRNDISProperty(const uint32_t Oid, +                                 void* Buffer, +                                 const uint16_t MaxLength)  {  	uint8_t ErrorCode; diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.h b/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.h index a2f15c5a7f..960d538233 100644 --- a/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.h +++ b/Demos/Host/LowLevel/RNDISEthernetHost/Lib/RNDISCommands.h @@ -200,13 +200,20 @@  		#define RNDIS_COMMAND_FAILED                  0xC0  	/* Function Prototypes: */ -		uint8_t RNDIS_SendEncapsulatedCommand(void* const Buffer, const uint16_t Length); -		uint8_t RNDIS_GetEncapsulatedResponse(void* const Buffer, const uint16_t Length); +		uint8_t RNDIS_SendEncapsulatedCommand(void* const Buffer, +		                                      const uint16_t Length); +		uint8_t RNDIS_GetEncapsulatedResponse(void* const Buffer, +		                                      const uint16_t Length);  		uint8_t RNDIS_SendKeepAlive(void); -		uint8_t RNDIS_InitializeDevice(const uint16_t HostMaxPacketSize, uint16_t* const DeviceMaxPacketSize); -		uint8_t RNDIS_SetRNDISProperty(const uint32_t Oid, void* Buffer, const uint16_t Length); -		uint8_t RNDIS_QueryRNDISProperty(const uint32_t Oid, void* Buffer, const uint16_t MaxLength); +		uint8_t RNDIS_InitializeDevice(const uint16_t HostMaxPacketSize, +		                               uint16_t* const DeviceMaxPacketSize); +		uint8_t RNDIS_SetRNDISProperty(const uint32_t Oid, +		                               void* Buffer, +		                               const uint16_t Length); +		uint8_t RNDIS_QueryRNDISProperty(const uint32_t Oid, +		                                 void* Buffer, +		                                 const uint16_t MaxLength);  		uint8_t RNDIS_GetPacketLength(uint16_t* const PacketLength);  #endif diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c index 1d18f11e64..1da5b4dbf7 100644 --- a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c +++ b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.h b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.h index 46b47f95c4..08187f9fa4 100644 --- a/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.h +++ b/Demos/Host/LowLevel/RNDISEthernetHost/RNDISEthernetHost.h @@ -91,7 +91,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c index 5304509885..a99a95680b 100644 --- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c +++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.c @@ -198,7 +198,8 @@ uint8_t SImage_ReceiveBlockHeader(void)   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum   */ -uint8_t SImage_SendData(void* const Buffer, const uint16_t Bytes) +uint8_t SImage_SendData(void* const Buffer, +                        const uint16_t Bytes)  {  	uint8_t ErrorCode; @@ -225,7 +226,8 @@ uint8_t SImage_SendData(void* const Buffer, const uint16_t Bytes)   *   *  \return A value from the Pipe_Stream_RW_ErrorCodes_t enum   */ -uint8_t SImage_ReadData(void* const Buffer, const uint16_t Bytes) +uint8_t SImage_ReadData(void* const Buffer, +                        const uint16_t Bytes)  {  	uint8_t ErrorCode; diff --git a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h index a57ddaf2c5..c91a801223 100644 --- a/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h +++ b/Demos/Host/LowLevel/StillImageHost/Lib/StillImageCommands.h @@ -108,8 +108,10 @@  		void    SImage_SendBlockHeader(void);  		uint8_t SImage_ReceiveBlockHeader(void);  		uint8_t SImage_ReceiveEventHeader(void); -		uint8_t SImage_SendData(void* const Buffer, const uint16_t Bytes); -		uint8_t SImage_ReadData(void* const Buffer, const uint16_t Bytes); +		uint8_t SImage_SendData(void* const Buffer, +		                        const uint16_t Bytes); +		uint8_t SImage_ReadData(void* const Buffer, +		                        const uint16_t Bytes);  		bool    SImage_IsEventReceived(void);  #endif diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c index 686eb5ff45..73f0c2c765 100644 --- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c +++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c @@ -113,7 +113,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" @@ -339,7 +340,8 @@ void StillImage_Task(void)   *  \param[in] UnicodeString  Pointer to a Unicode encoded input string   *  \param[out] Buffer        Pointer to a buffer where the converted ASCII string should be stored   */ -void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer) +void UnicodeToASCII(uint8_t* UnicodeString, +                    char* Buffer)  {  	/* Get the number of characters in the string, skip to the start of the string data */  	uint8_t CharactersRemaining = *(UnicodeString++); @@ -363,7 +365,8 @@ void UnicodeToASCII(uint8_t* UnicodeString, char* Buffer)   *  \param[in] ErrorCode          Error code of the function which failed to complete successfully   *  \param[in] ResponseCodeError  Indicates if the error is due to a command failed indication from the device, or a communication failure   */ -void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError) +void ShowCommandError(uint8_t ErrorCode, +                      bool ResponseCodeError)  {  	char* FailureType = ((ResponseCodeError) ? PSTR("Response Code != OK") : PSTR("Transaction Fail")); diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h index d7b893ee25..61e5eb5b53 100644 --- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.h +++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.h @@ -76,10 +76,13 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void); -		void UnicodeToASCII(uint8_t* restrict UnicodeString, char* restrict Buffer); -		void ShowCommandError(uint8_t ErrorCode, bool ResponseCodeError); +		void UnicodeToASCII(uint8_t* UnicodeString, +		                    char* Buffer); +		void ShowCommandError(uint8_t ErrorCode, +		                      bool ResponseCodeError);  #endif diff --git a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c index 8bec8e5627..4c250cd482 100644 --- a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c +++ b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c @@ -112,7 +112,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"  	                         " -- Error Code %d\r\n" diff --git a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h index 4227b5383d..cf785e3203 100644 --- a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h +++ b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.h @@ -81,7 +81,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Projects/AVRISP-MKII/Descriptors.c b/Projects/AVRISP-MKII/Descriptors.c index 95a41f18a5..243c570203 100644 --- a/Projects/AVRISP-MKII/Descriptors.c +++ b/Projects/AVRISP-MKII/Descriptors.c @@ -172,7 +172,9 @@ USB_Descriptor_String_t PROGMEM SerialString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h index f946899760..f991aa0226 100644 --- a/Projects/AVRISP-MKII/Descriptors.h +++ b/Projects/AVRISP-MKII/Descriptors.h @@ -73,7 +73,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index 430c9158a9..2df8710eb4 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -109,8 +109,11 @@ void ISPTarget_ChangeTargetResetLine(const bool ResetTarget)   *  \return V2 Protocol status \ref STATUS_CMD_OK if the no timeout occurred, \ref STATUS_RDY_BSY_TOUT or   *          \ref STATUS_CMD_TOUT otherwise   */ -uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint16_t PollAddress, const uint8_t PollValue, -                                      const uint8_t DelayMS, const uint8_t ReadMemCommand) +uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, +                                      const uint16_t PollAddress, +                                      const uint8_t PollValue, +                                      const uint8_t DelayMS, +                                      const uint8_t ReadMemCommand)  {  	uint8_t ProgrammingStatus  = STATUS_CMD_OK; diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h index 34d623ed70..869e0e58b4 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h @@ -65,8 +65,10 @@  	/* Function Prototypes: */  		uint8_t ISPTarget_GetSPIPrescalerMask(void);  		void    ISPTarget_ChangeTargetResetLine(const bool ResetTarget); -		uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint16_t PollAddress, -		                                      const uint8_t PollValue, const uint8_t DelayMS, +		uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, +		                                      const uint16_t PollAddress, +		                                      const uint8_t PollValue, +		                                      const uint8_t DelayMS,  		                                      const uint8_t ReadMemCommand);  		uint8_t ISPTarget_WaitWhileTargetBusy(void);  		void    ISPTarget_LoadExtendedAddress(void); diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c index bc3ed18e09..56b18f60ac 100644 --- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c +++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c @@ -151,7 +151,8 @@ uint8_t V2Params_GetParameterValue(const uint8_t ParamID)   *   *  \return Pointer to the associated parameter information from the parameter table if found, NULL otherwise   */ -void V2Params_SetParameterValue(const uint8_t ParamID, const uint8_t Value) +void V2Params_SetParameterValue(const uint8_t ParamID, +                                const uint8_t Value)  {  	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID); diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h index d93aaddbf8..4b7e189133 100644 --- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h +++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h @@ -75,7 +75,8 @@  		uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID);  		uint8_t V2Params_GetParameterValue(const uint8_t ParamID); -		void    V2Params_SetParameterValue(const uint8_t ParamID, const uint8_t Value); +		void    V2Params_SetParameterValue(const uint8_t ParamID, +		                                   const uint8_t Value);  		#if defined(INCLUDE_FROM_V2PROTOCOL_PARAMS_C)  			static ParameterItem_t* V2Params_GetParamFromTable(const uint8_t ParamID); diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c index 150f64244d..d45e42a1a9 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c +++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c @@ -127,7 +127,9 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)   *   *  \return Boolean true if the command sequence complete successfully   */ -bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadSize) +bool TINYNVM_ReadMemory(const uint16_t ReadAddress, +                        uint8_t* ReadBuffer, +                        uint16_t ReadSize)  {  	/* Wait until the NVM controller is no longer busy */  	if (!(TINYNVM_WaitWhileNVMControllerBusy())) @@ -158,7 +160,9 @@ bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_   *   *  \return Boolean true if the command sequence complete successfully   */ -bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint16_t WriteLength) +bool TINYNVM_WriteMemory(const uint16_t WriteAddress, +                         uint8_t* WriteBuffer, +                         uint16_t WriteLength)  {  	/* Wait until the NVM controller is no longer busy */  	if (!(TINYNVM_WaitWhileNVMControllerBusy())) @@ -203,7 +207,8 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint   *   *  \return Boolean true if the command sequence complete successfully   */ -bool TINYNVM_EraseMemory(const uint8_t EraseCommand, const uint16_t Address) +bool TINYNVM_EraseMemory(const uint8_t EraseCommand, +                         const uint16_t Address)  {  	/* Wait until the NVM controller is no longer busy */  	if (!(TINYNVM_WaitWhileNVMControllerBusy())) diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h index 2daca16fcf..cbb2c27aac 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h @@ -64,9 +64,14 @@  	/* Function Prototypes: */		  		bool TINYNVM_WaitWhileNVMBusBusy(void);  		bool TINYNVM_WaitWhileNVMControllerBusy(void); -		bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadLength); -		bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint16_t WriteLength); -		bool TINYNVM_EraseMemory(const uint8_t EraseCommand, const uint16_t Address); +		bool TINYNVM_ReadMemory(const uint16_t ReadAddress, +		                        uint8_t* ReadBuffer, +		                        uint16_t ReadLength); +		bool TINYNVM_WriteMemory(const uint16_t WriteAddress, +		                         uint8_t* WriteBuffer, +		                         uint16_t WriteLength); +		bool TINYNVM_EraseMemory(const uint8_t EraseCommand, +		                         const uint16_t Address);  		#if (defined(INCLUDE_FROM_TINYNVM_C) && defined(ENABLE_XPROG_PROTOCOL))  			static void TINYNVM_SendReadNVMRegister(const uint8_t Address); diff --git a/Projects/Benito/Descriptors.c b/Projects/Benito/Descriptors.c index 3ca9dd9f45..6a9e791bbf 100644 --- a/Projects/Benito/Descriptors.c +++ b/Projects/Benito/Descriptors.c @@ -212,7 +212,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/Benito/Descriptors.h b/Projects/Benito/Descriptors.h index 07a361385f..8012ebdde9 100644 --- a/Projects/Benito/Descriptors.h +++ b/Projects/Benito/Descriptors.h @@ -77,7 +77,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/Benito/Lib/LightweightRingBuff.h b/Projects/Benito/Lib/LightweightRingBuff.h index 0ffe792dcc..1d6e07fded 100644 --- a/Projects/Benito/Lib/LightweightRingBuff.h +++ b/Projects/Benito/Lib/LightweightRingBuff.h @@ -100,7 +100,8 @@  		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into  		 *  \param[in]     Data    Data element to insert into the buffer  		 */ -		static inline void RingBuffer_AtomicInsert(RingBuff_t* const Buffer, RingBuff_Data_t Data) +		static inline void RingBuffer_AtomicInsert(RingBuff_t* const Buffer, +		                                           const RingBuff_Data_t Data)  		{  			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)  			{ @@ -141,7 +142,8 @@  		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into  		 *  \param[in]     Data    Data element to insert into the buffer  		 */ -		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data) +		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, +		                                     const RingBuff_Data_t Data)  		{  			*Buffer->In = Data; diff --git a/Projects/Incomplete/MIDIToneGenerator/Descriptors.c b/Projects/Incomplete/MIDIToneGenerator/Descriptors.c index 640c832244..9ce300afc5 100644 --- a/Projects/Incomplete/MIDIToneGenerator/Descriptors.c +++ b/Projects/Incomplete/MIDIToneGenerator/Descriptors.c @@ -283,7 +283,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/Incomplete/MIDIToneGenerator/Descriptors.h b/Projects/Incomplete/MIDIToneGenerator/Descriptors.h index 9933d060e5..fc648de4b2 100644 --- a/Projects/Incomplete/MIDIToneGenerator/Descriptors.h +++ b/Projects/Incomplete/MIDIToneGenerator/Descriptors.h @@ -75,7 +75,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.c b/Projects/Incomplete/StandaloneProgrammer/Descriptors.c index d6ffde8045..cd2b0d3b89 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.c +++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.c @@ -176,7 +176,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h index 440259341e..d78bbba207 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h +++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h @@ -82,7 +82,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c index f54b25be45..b274a10835 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.c @@ -48,7 +48,9 @@   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write   */ -void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                  const uint32_t BlockAddress, +                                  uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -182,7 +184,9 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read   */ -void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                 const uint32_t BlockAddress, +                                 uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -290,7 +294,9 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf   *  \param[in] TotalBlocks   Number of blocks of data to write   *  \param[in] BufferPtr     Pointer to the data source RAM buffer   */ -void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, const uint8_t* BufferPtr) +void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +                                      uint16_t TotalBlocks, +                                      const uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -389,7 +395,9 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota   *  \param[in] TotalBlocks   Number of blocks of data to read   *  \param[out] BufferPtr    Pointer to the data destination RAM buffer   */ -void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +                                     uint16_t TotalBlocks, +                                     uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h index 8f62219ca7..406ae62afe 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/DataflashManager.h @@ -67,13 +67,17 @@  	/* Function Prototypes: */  		#if defined(USB_CAN_BE_DEVICE) -			void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +			void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +			                                  const uint32_t BlockAddress,  											  uint16_t TotalBlocks); -			void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +			void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +			                                 const uint32_t BlockAddress,  											 uint16_t TotalBlocks); -			void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +			void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +			                                      uint16_t TotalBlocks,  												  const uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3); -			void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +			void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +			                                     uint16_t TotalBlocks,  												 uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);  			void DataflashManager_ResetDataflashProtections(void);  			bool DataflashManager_CheckDataflashOperation(void); diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c index 74f6811ad5..0bf6abdf71 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c @@ -248,7 +248,8 @@ static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInte   *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with   *  \param[in] IsDataRead  Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)   */ -static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead) +static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                      const bool IsDataRead)  {  	uint32_t BlockAddress = SwapEndian_32(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[2]);  	uint16_t TotalBlocks  = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[7]); diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h index 3927a4fda3..22c3a1d449 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.h @@ -80,7 +80,8 @@  				static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  				static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  				static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -				static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead); +				static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +				                                      const bool IsDataRead);  			#endif  		#endif diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h index dff45fcb2b..dfb8a9f3a6 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.h @@ -72,7 +72,7 @@  		#define LEDMASK_USB_BUSY          LEDS_LED2  	/* External Variables: */ -		extern FILE DiskStream; +		extern FILE  DiskStream;  		extern FATFS DiskFATState;  	/* Function Prototypes: */ diff --git a/Projects/LEDNotifier/Board/LEDs.h b/Projects/LEDNotifier/Board/LEDs.h index decd2b0549..c43cfc8bcc 100644 --- a/Projects/LEDNotifier/Board/LEDs.h +++ b/Projects/LEDNotifier/Board/LEDs.h @@ -87,7 +87,8 @@  				PORTC = (PORTC & ~LEDS_ALL_LEDS) | LEDMask;  			} -			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) +			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, +			                                   const uint8_t ActiveMask)  			{  				PORTC = (PORTC & ~LEDMask) | ActiveMask;  			} diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c index 67d0deb8b7..316ad45eb7 100644 --- a/Projects/LEDNotifier/Descriptors.c +++ b/Projects/LEDNotifier/Descriptors.c @@ -224,7 +224,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h index 017e3fe1ef..387034f11d 100644 --- a/Projects/LEDNotifier/Descriptors.h +++ b/Projects/LEDNotifier/Descriptors.h @@ -77,7 +77,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c index c544ba6357..219ead1e71 100644 --- a/Projects/Magstripe/Descriptors.c +++ b/Projects/Magstripe/Descriptors.c @@ -196,7 +196,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h index 02a14b4007..85d0737806 100644 --- a/Projects/Magstripe/Descriptors.h +++ b/Projects/Magstripe/Descriptors.h @@ -64,7 +64,8 @@  		#define KEYBOARD_EPSIZE              8  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/Magstripe/Lib/CircularBitBuffer.c b/Projects/Magstripe/Lib/CircularBitBuffer.c index 8be527b4db..c1b21039c6 100644 --- a/Projects/Magstripe/Lib/CircularBitBuffer.c +++ b/Projects/Magstripe/Lib/CircularBitBuffer.c @@ -50,7 +50,8 @@ void BitBuffer_Init(BitBuffer_t* const Buffer)  }  /** Function to store the given bit into the given bit buffer. */ -void BitBuffer_StoreNextBit(BitBuffer_t* const Buffer, const bool Bit) +void BitBuffer_StoreNextBit(BitBuffer_t* const Buffer, +                            const bool Bit)  {  	/* If the bit to store is true, set the next bit in the buffer */  	if (Bit) diff --git a/Projects/Magstripe/Lib/CircularBitBuffer.h b/Projects/Magstripe/Lib/CircularBitBuffer.h index dff4d2e5d9..973c7c26cc 100644 --- a/Projects/Magstripe/Lib/CircularBitBuffer.h +++ b/Projects/Magstripe/Lib/CircularBitBuffer.h @@ -82,7 +82,8 @@  		 *  \param[in,out] Buffer  Bit buffer to store a bit into  		 *  \param[in] Bit  Bit to store into the buffer  		 */ -		void BitBuffer_StoreNextBit(BitBuffer_t* const Buffer, const bool Bit) ATTR_NON_NULL_PTR_ARG(1); +		void BitBuffer_StoreNextBit(BitBuffer_t* const Buffer, +		                            const bool Bit) ATTR_NON_NULL_PTR_ARG(1);  		/** Retrieves a bit from the next location inside a given bit buffer.  		 * diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index e404eaf0e1..4c0d7a191a 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -171,8 +171,11 @@ void EVENT_USB_Device_StartOfFrame(void)   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData; @@ -210,8 +213,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData        Pointer to the report buffer where the received report is stored   *  \param[in] ReportSize        Size in bytes of the report received from the host   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	// Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports  } diff --git a/Projects/Magstripe/Magstripe.h b/Projects/Magstripe/Magstripe.h index 4922b7be68..946ef2ebfb 100644 --- a/Projects/Magstripe/Magstripe.h +++ b/Projects/Magstripe/Magstripe.h @@ -75,9 +75,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		void EVENT_USB_Device_StartOfFrame(void); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c index dcc6e732f6..c76dc52f4a 100644 --- a/Projects/MissileLauncher/MissileLauncher.c +++ b/Projects/MissileLauncher/MissileLauncher.c @@ -151,7 +151,8 @@ void Read_Joystick_Status(void)   *  \param[in] Report  Report data to send.   *  \param[in] ReportSize  Report length in bytes.   */ -void Send_Command_Report(uint8_t* const Report, const uint16_t ReportSize) +void Send_Command_Report(uint8_t* const Report, +                         const uint16_t ReportSize)  {  	memcpy(CmdBuffer, Report, 8);  	WriteNextReport(CmdBuffer, ReportSize); @@ -212,7 +213,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)  /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while   *  enumerating an attached USB device.   */ -void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode) +void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +                                            const uint8_t SubErrorCode)  {  	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);  } @@ -245,7 +247,8 @@ void DiscardNextReport(void)   *  \param[in] ReportOUTData  Buffer containing the report to send to the device   *  \param[in] ReportLength  Length of the report to send   */ -void WriteNextReport(uint8_t* const ReportOUTData, const uint16_t ReportLength) +void WriteNextReport(uint8_t* const ReportOUTData, +                     const uint16_t ReportLength)  {  	/* Select and unfreeze HID data OUT pipe */  	Pipe_SelectPipe(HID_DATA_OUT_PIPE); diff --git a/Projects/MissileLauncher/MissileLauncher.h b/Projects/MissileLauncher/MissileLauncher.h index aba261611d..57aae09922 100644 --- a/Projects/MissileLauncher/MissileLauncher.h +++ b/Projects/MissileLauncher/MissileLauncher.h @@ -82,7 +82,8 @@  		void SetupHardware(void);  		void Read_Joystick_Status(void); -        void Send_Command_Report(uint8_t* const Report, const uint16_t ReportSize); +        void Send_Command_Report(uint8_t* const Report, +		                         const uint16_t ReportSize);          void Send_Command(uint8_t* const Command);  		void HID_Host_Task(void); @@ -90,10 +91,12 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  		void DiscardNextReport(void); -		void WriteNextReport(uint8_t* const ReportOUTData, const uint16_t ReportLength); +		void WriteNextReport(uint8_t* const ReportOUTData, +		                     const uint16_t ReportLength);  #endif diff --git a/Projects/RelayBoard/Descriptors.c b/Projects/RelayBoard/Descriptors.c index ca353d51ff..e792aec7eb 100644 --- a/Projects/RelayBoard/Descriptors.c +++ b/Projects/RelayBoard/Descriptors.c @@ -153,7 +153,9 @@ USB_Descriptor_String_t PROGMEM RelayBoard_SerialString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/RelayBoard/Descriptors.h b/Projects/RelayBoard/Descriptors.h index 7b217fbcf1..f6357f8212 100644 --- a/Projects/RelayBoard/Descriptors.h +++ b/Projects/RelayBoard/Descriptors.h @@ -54,6 +54,8 @@  		} RelayBoard_USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress);  #endif diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c index 00a4d70fe2..564d5ee83c 100644 --- a/Projects/TempDataLogger/Descriptors.c +++ b/Projects/TempDataLogger/Descriptors.c @@ -237,7 +237,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/TempDataLogger/Descriptors.h b/Projects/TempDataLogger/Descriptors.h index a2ab5852e4..ff0d25cff6 100644 --- a/Projects/TempDataLogger/Descriptors.h +++ b/Projects/TempDataLogger/Descriptors.h @@ -54,7 +54,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/TempDataLogger/Lib/DS1307.c b/Projects/TempDataLogger/Lib/DS1307.c index 003160fe2b..a85aa6176d 100644 --- a/Projects/TempDataLogger/Lib/DS1307.c +++ b/Projects/TempDataLogger/Lib/DS1307.c @@ -7,7 +7,9 @@  #include "DS1307.h" -void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year) +void DS1307_SetDate(const uint8_t Day, +                    const uint8_t Month, +                    const uint8_t Year)  {  #if defined(DUMMY_RTC)  	return; @@ -32,7 +34,9 @@ void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)  	}  } -void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second) +void DS1307_SetTime(const uint8_t Hour, +                    const uint8_t Minute, +                    const uint8_t Second)  {  #if defined(DUMMY_RTC)  	return; @@ -59,7 +63,9 @@ void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second)  	}  } -void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year) +void DS1307_GetDate(uint8_t* const Day, +                    uint8_t* const Month, +                    uint8_t* const Year)  {  #if defined(DUMMY_RTC)  	*Day   = 1; @@ -91,7 +97,9 @@ void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)  	*Year   = (CurrentRTCDate.Byte3.Fields.TenYear  * 10) + CurrentRTCDate.Byte3.Fields.Year;  } -void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second) +void DS1307_GetTime(uint8_t* const Hour, +                    uint8_t* const Minute, +                    uint8_t* const Second)  {  #if defined(DUMMY_RTC)  	*Hour   = 1; diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h index 58eac8e5c9..d07bff4396 100644 --- a/Projects/TempDataLogger/Lib/DS1307.h +++ b/Projects/TempDataLogger/Lib/DS1307.h @@ -100,10 +100,17 @@  		#define DS1307_ADDRESS_WRITE  0b11010000  	/* Function Prototypes: */ -		void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year); -		void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second); -		 -		void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year); -		void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second); +		void DS1307_SetDate(const uint8_t Day, +		                    const uint8_t Month, +		                    const uint8_t Year); +		void DS1307_SetTime(const uint8_t Hour, +		                    const uint8_t Minute, +		                    const uint8_t Second); +		void DS1307_GetDate(uint8_t* const Day, +		                    uint8_t* const Month, +		                    uint8_t* const Year); +		void DS1307_GetTime(uint8_t* const Hour, +		                    uint8_t* const Minute, +		                    uint8_t* const Second);  #endif diff --git a/Projects/TempDataLogger/Lib/DataflashManager.c b/Projects/TempDataLogger/Lib/DataflashManager.c index 48c4fa7e6a..1750e15b3e 100644 --- a/Projects/TempDataLogger/Lib/DataflashManager.c +++ b/Projects/TempDataLogger/Lib/DataflashManager.c @@ -47,7 +47,9 @@   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write   */ -void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                  const uint32_t BlockAddress, +                                  uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -181,7 +183,9 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read   */ -void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                 const uint32_t BlockAddress, +                                 uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -289,7 +293,9 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf   *  \param[in] TotalBlocks   Number of blocks of data to write   *  \param[in] BufferPtr     Pointer to the data source RAM buffer   */ -void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, const uint8_t* BufferPtr) +void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +                                      uint16_t TotalBlocks, +                                      const uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -388,7 +394,9 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota   *  \param[in] TotalBlocks   Number of blocks of data to read   *  \param[out] BufferPtr    Pointer to the data destination RAM buffer   */ -void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +                                     uint16_t TotalBlocks, +                                     uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); diff --git a/Projects/TempDataLogger/Lib/DataflashManager.h b/Projects/TempDataLogger/Lib/DataflashManager.h index 3c75c4c757..70dd88d21e 100644 --- a/Projects/TempDataLogger/Lib/DataflashManager.h +++ b/Projects/TempDataLogger/Lib/DataflashManager.h @@ -67,13 +67,17 @@  		#define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)  	/* Function Prototypes: */ -		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                  const uint32_t BlockAddress,  		                                  uint16_t TotalBlocks); -		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                 const uint32_t BlockAddress,  		                                 uint16_t TotalBlocks); -		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +		                                      uint16_t TotalBlocks,  		                                      const uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3); -		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +		                                     uint16_t TotalBlocks,  		                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);  		void DataflashManager_ResetDataflashProtections(void);  		bool DataflashManager_CheckDataflashOperation(void); diff --git a/Projects/TempDataLogger/Lib/SCSI.c b/Projects/TempDataLogger/Lib/SCSI.c index fb841e34bc..390441aa11 100644 --- a/Projects/TempDataLogger/Lib/SCSI.c +++ b/Projects/TempDataLogger/Lib/SCSI.c @@ -247,7 +247,8 @@ static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInte   *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with   *  \param[in] IsDataRead  Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)   */ -static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead) +static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                      const bool IsDataRead)  {  	uint32_t BlockAddress = SwapEndian_32(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[2]);  	uint16_t TotalBlocks  = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[7]); diff --git a/Projects/TempDataLogger/Lib/SCSI.h b/Projects/TempDataLogger/Lib/SCSI.h index fd739182eb..c5504b7133 100644 --- a/Projects/TempDataLogger/Lib/SCSI.h +++ b/Projects/TempDataLogger/Lib/SCSI.h @@ -80,7 +80,8 @@  			static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -			static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead); +			static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +			                                      const bool IsDataRead);  		#endif  #endif diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index e7c7c763e7..dd707bc085 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -279,8 +279,11 @@ bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSI   *   *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent   */ -bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                         const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize) +bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                         uint8_t* const ReportID, +                                         const uint8_t ReportType, +                                         void* ReportData, +                                         uint16_t* const ReportSize)  {  	Device_Report_t* ReportParams = (Device_Report_t*)ReportData; @@ -301,8 +304,11 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn   *  \param[in] ReportData  Pointer to a buffer where the created report has been stored   *  \param[in] ReportSize  Size in bytes of the received HID report   */ -void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID, -                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize) +void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +                                          const uint8_t ReportID, +                                          const uint8_t ReportType, +                                          const void* ReportData, +                                          const uint16_t ReportSize)  {  	Device_Report_t* ReportParams = (Device_Report_t*)ReportData; diff --git a/Projects/TempDataLogger/TempDataLogger.h b/Projects/TempDataLogger/TempDataLogger.h index 48a051f0a1..45cb3bec1b 100644 --- a/Projects/TempDataLogger/TempDataLogger.h +++ b/Projects/TempDataLogger/TempDataLogger.h @@ -105,9 +105,15 @@  		void EVENT_USB_Device_UnhandledControlRequest(void);  		bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID, -                                                 const uint8_t ReportType, void* ReportData, uint16_t* const ReportSize); -		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,  -		                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize); +		bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                         uint8_t* const ReportID, +                                                 const uint8_t ReportType, +		                                         void* ReportData, +		                                         uint16_t* const ReportSize); +		void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, +		                                          const uint8_t ReportID,  +		                                          const uint8_t ReportType, +		                                          const void* ReportData, +		                                          const uint16_t ReportSize);  #endif diff --git a/Projects/USBtoSerial/Descriptors.c b/Projects/USBtoSerial/Descriptors.c index c60da313ef..16d3429d4f 100644 --- a/Projects/USBtoSerial/Descriptors.c +++ b/Projects/USBtoSerial/Descriptors.c @@ -224,7 +224,9 @@ USB_Descriptor_String_t PROGMEM ProductString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/USBtoSerial/Descriptors.h b/Projects/USBtoSerial/Descriptors.h index 07a361385f..8012ebdde9 100644 --- a/Projects/USBtoSerial/Descriptors.h +++ b/Projects/USBtoSerial/Descriptors.h @@ -77,7 +77,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/USBtoSerial/Lib/LightweightRingBuff.h b/Projects/USBtoSerial/Lib/LightweightRingBuff.h index 0ffe792dcc..1d6e07fded 100644 --- a/Projects/USBtoSerial/Lib/LightweightRingBuff.h +++ b/Projects/USBtoSerial/Lib/LightweightRingBuff.h @@ -100,7 +100,8 @@  		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into  		 *  \param[in]     Data    Data element to insert into the buffer  		 */ -		static inline void RingBuffer_AtomicInsert(RingBuff_t* const Buffer, RingBuff_Data_t Data) +		static inline void RingBuffer_AtomicInsert(RingBuff_t* const Buffer, +		                                           const RingBuff_Data_t Data)  		{  			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)  			{ @@ -141,7 +142,8 @@  		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into  		 *  \param[in]     Data    Data element to insert into the buffer  		 */ -		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data) +		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, +		                                     const RingBuff_Data_t Data)  		{  			*Buffer->In = Data; diff --git a/Projects/Webserver/Descriptors.h b/Projects/Webserver/Descriptors.h index a13ee013f5..b7d15e48fe 100644 --- a/Projects/Webserver/Descriptors.h +++ b/Projects/Webserver/Descriptors.h @@ -66,7 +66,8 @@  		} USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) -											ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif diff --git a/Projects/Webserver/Lib/DHCPClientApp.c b/Projects/Webserver/Lib/DHCPClientApp.c index 7f822538ec..2260b5089b 100644 --- a/Projects/Webserver/Lib/DHCPClientApp.c +++ b/Projects/Webserver/Lib/DHCPClientApp.c @@ -170,13 +170,15 @@ void DHCPClientApp_Callback(void)  /** Fills the DHCP packet response with the appropriate BOOTP header for DHCP. This fills out all the required   *  fields, leaving only the additional DHCP options to be added to the packet before it is sent to the DHCP server.   * - *  \param[out] DHCPHeader  Location in the packet buffer where the BOOTP header should be written to + *  \param[out] DHCPHeader       Location in the packet buffer where the BOOTP header should be written to   *  \param[in]  DHCPMessageType  DHCP Message type, such as DHCP_DISCOVER - *  \param[in]  AppState    Application state of the current UDP connection + *  \param[in]  AppState         Application state of the current UDP connection   *   *  \return Size in bytes of the created DHCP packet   */ -static uint16_t DHCPClientApp_FillDHCPHeader(DHCP_Header_t* const DHCPHeader, const uint8_t DHCPMessageType, uip_udp_appstate_t* AppState) +static uint16_t DHCPClientApp_FillDHCPHeader(DHCP_Header_t* const DHCPHeader, +                                             const uint8_t DHCPMessageType, +                                             uip_udp_appstate_t* const AppState)  {  	/* Erase existing packet data so that we start will all 0x00 DHCP header data */   	memset(DHCPHeader, 0, sizeof(DHCP_Header_t)); @@ -215,7 +217,10 @@ static uint16_t DHCPClientApp_FillDHCPHeader(DHCP_Header_t* const DHCPHeader, co   *   *  \return Number of bytes added to the DHCP packet   */ -static uint8_t DHCPClientApp_SetOption(uint8_t* DHCPOptionList, uint8_t Option, uint8_t DataLen, void* OptionData) +static uint8_t DHCPClientApp_SetOption(uint8_t* DHCPOptionList, +                                       const uint8_t Option, +                                       const uint8_t DataLen, +                                       void* const OptionData)  {  	/* Skip through the DHCP options list until the terminator option is found */  	while (*DHCPOptionList != DHCP_OPTION_END) @@ -239,7 +244,9 @@ static uint8_t DHCPClientApp_SetOption(uint8_t* DHCPOptionList, uint8_t Option,   *   *  \return Boolean true if the option was found in the DHCP packet's options list, false otherwise   */ -static bool DHCPClientApp_GetOption(const uint8_t* DHCPOptionList, const uint8_t Option, void* const Destination) +static bool DHCPClientApp_GetOption(const uint8_t* DHCPOptionList, +                                    const uint8_t Option, +                                    void* const Destination)  {  	/* Look through the incoming DHCP packet's options list for the requested option */  	while (*DHCPOptionList != DHCP_OPTION_END) diff --git a/Projects/Webserver/Lib/DHCPClientApp.h b/Projects/Webserver/Lib/DHCPClientApp.h index 02d30c8bc0..710f4b61ac 100644 --- a/Projects/Webserver/Lib/DHCPClientApp.h +++ b/Projects/Webserver/Lib/DHCPClientApp.h @@ -160,10 +160,15 @@  		void DHCPClientApp_Callback(void);  		#if defined(INCLUDE_FROM_DHCPCLIENTAPP_C) -			static uint16_t DHCPClientApp_FillDHCPHeader(DHCP_Header_t* const DHCPHeader, const uint8_t DHCPMessageType, -			                                             uip_udp_appstate_t* AppState); -			static uint8_t  DHCPClientApp_SetOption(uint8_t* DHCPOptionList, uint8_t Option, uint8_t DataLen, -			                                        void* OptionData); -			static bool     DHCPClientApp_GetOption(const uint8_t* DHCPOptionList, const uint8_t Option, void* const Destination); +			static uint16_t DHCPClientApp_FillDHCPHeader(DHCP_Header_t* const DHCPHeader, +			                                             const uint8_t DHCPMessageType, +			                                             uip_udp_appstate_t* const AppState); +			static uint8_t  DHCPClientApp_SetOption(uint8_t* DHCPOptionList, +			                                        const uint8_t Option, +			                                        const uint8_t DataLen, +			                                        void* const OptionData); +			static bool     DHCPClientApp_GetOption(const uint8_t* DHCPOptionList, +			                                        const uint8_t Option, +			                                        void* const Destination);  		#endif  #endif diff --git a/Projects/Webserver/Lib/DataflashManager.c b/Projects/Webserver/Lib/DataflashManager.c index 48c4fa7e6a..1750e15b3e 100644 --- a/Projects/Webserver/Lib/DataflashManager.c +++ b/Projects/Webserver/Lib/DataflashManager.c @@ -47,7 +47,9 @@   *  \param[in] BlockAddress  Data block starting address for the write sequence   *  \param[in] TotalBlocks   Number of blocks of data to write   */ -void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                  const uint32_t BlockAddress, +                                  uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -181,7 +183,9 @@ void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceIn   *  \param[in] BlockAddress  Data block starting address for the read sequence   *  \param[in] TotalBlocks   Number of blocks of data to read   */ -void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, uint16_t TotalBlocks) +void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                 const uint32_t BlockAddress, +                                 uint16_t TotalBlocks)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -289,7 +293,9 @@ void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInf   *  \param[in] TotalBlocks   Number of blocks of data to write   *  \param[in] BufferPtr     Pointer to the data source RAM buffer   */ -void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, const uint8_t* BufferPtr) +void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +                                      uint16_t TotalBlocks, +                                      const uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); @@ -388,7 +394,9 @@ void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t Tota   *  \param[in] TotalBlocks   Number of blocks of data to read   *  \param[out] BufferPtr    Pointer to the data destination RAM buffer   */ -void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, uint8_t* BufferPtr) +void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +                                     uint16_t TotalBlocks, +                                     uint8_t* BufferPtr)  {  	uint16_t CurrDFPage          = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) / DATAFLASH_PAGE_SIZE);  	uint16_t CurrDFPageByte      = ((BlockAddress * VIRTUAL_MEMORY_BLOCK_SIZE) % DATAFLASH_PAGE_SIZE); diff --git a/Projects/Webserver/Lib/DataflashManager.h b/Projects/Webserver/Lib/DataflashManager.h index ebf0bd3293..20f21c65d7 100644 --- a/Projects/Webserver/Lib/DataflashManager.h +++ b/Projects/Webserver/Lib/DataflashManager.h @@ -66,13 +66,17 @@  		#define VIRTUAL_MEMORY_BLOCKS               (VIRTUAL_MEMORY_BYTES / VIRTUAL_MEMORY_BLOCK_SIZE)  	/* Function Prototypes: */ -		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_WriteBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                  const uint32_t BlockAddress,  		                                  uint16_t TotalBlocks); -		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const uint32_t BlockAddress, +		void DataflashManager_ReadBlocks(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +		                                 const uint32_t BlockAddress,  		                                 uint16_t TotalBlocks); -		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_WriteBlocks_RAM(const uint32_t BlockAddress, +		                                      uint16_t TotalBlocks,  		                                      const uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3); -		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, uint16_t TotalBlocks, +		void DataflashManager_ReadBlocks_RAM(const uint32_t BlockAddress, +		                                     uint16_t TotalBlocks,  		                                     uint8_t* BufferPtr) ATTR_NON_NULL_PTR_ARG(3);  		void DataflashManager_ResetDataflashProtections(void);  		bool DataflashManager_CheckDataflashOperation(void); diff --git a/Projects/Webserver/Lib/SCSI.c b/Projects/Webserver/Lib/SCSI.c index cdc37c9366..7c40a3db7c 100644 --- a/Projects/Webserver/Lib/SCSI.c +++ b/Projects/Webserver/Lib/SCSI.c @@ -247,7 +247,8 @@ static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInte   *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface structure that the command is associated with   *  \param[in] IsDataRead  Indicates if the command is a READ (10) command or WRITE (10) command (DATA_READ or DATA_WRITE)   */ -static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead) +static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +                                      const bool IsDataRead)  {  	uint32_t BlockAddress = SwapEndian_32(*(uint32_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[2]);  	uint16_t TotalBlocks  = SwapEndian_16(*(uint16_t*)&MSInterfaceInfo->State.CommandBlock.SCSICommandData[7]); diff --git a/Projects/Webserver/Lib/SCSI.h b/Projects/Webserver/Lib/SCSI.h index d0c485bd93..3171c48991 100644 --- a/Projects/Webserver/Lib/SCSI.h +++ b/Projects/Webserver/Lib/SCSI.h @@ -79,7 +79,8 @@  			static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo);  			static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo); -			static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, const bool IsDataRead); +			static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo, +			                                      const bool IsDataRead);  		#endif  #endif diff --git a/Projects/Webserver/USBHostMode.h b/Projects/Webserver/USBHostMode.h index 1b30f6ad67..ab2be12177 100644 --- a/Projects/Webserver/USBHostMode.h +++ b/Projects/Webserver/USBHostMode.h @@ -52,7 +52,8 @@  		void EVENT_USB_Host_HostError(const uint8_t ErrorCode);  		void EVENT_USB_Host_DeviceAttached(void);  		void EVENT_USB_Host_DeviceUnattached(void); -		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode); +		void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, +		                                            const uint8_t SubErrorCode);  		void EVENT_USB_Host_DeviceEnumerationComplete(void);  #endif diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.c b/Projects/XPLAINBridge/AVRISPDescriptors.c index 397cb56ca5..c85f4561b1 100644 --- a/Projects/XPLAINBridge/AVRISPDescriptors.c +++ b/Projects/XPLAINBridge/AVRISPDescriptors.c @@ -172,7 +172,9 @@ USB_Descriptor_String_t PROGMEM AVRISP_SerialString =   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host.   */ -uint16_t AVRISP_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t AVRISP_GetDescriptor(const uint16_t wValue, +                              const uint8_t wIndex, +                              void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h index 7731aca0d7..970035138d 100644 --- a/Projects/XPLAINBridge/AVRISPDescriptors.h +++ b/Projects/XPLAINBridge/AVRISPDescriptors.h @@ -73,6 +73,8 @@  		} AVRISP_USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t AVRISP_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress); +		uint16_t AVRISP_GetDescriptor(const uint16_t wValue, +		                              const uint8_t wIndex, +		                              void** const DescriptorAddress);  #endif diff --git a/Projects/XPLAINBridge/Lib/LightweightRingBuff.h b/Projects/XPLAINBridge/Lib/LightweightRingBuff.h index 0ffe792dcc..1d6e07fded 100644 --- a/Projects/XPLAINBridge/Lib/LightweightRingBuff.h +++ b/Projects/XPLAINBridge/Lib/LightweightRingBuff.h @@ -100,7 +100,8 @@  		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into  		 *  \param[in]     Data    Data element to insert into the buffer  		 */ -		static inline void RingBuffer_AtomicInsert(RingBuff_t* const Buffer, RingBuff_Data_t Data) +		static inline void RingBuffer_AtomicInsert(RingBuff_t* const Buffer, +		                                           const RingBuff_Data_t Data)  		{  			ATOMIC_BLOCK(ATOMIC_RESTORESTATE)  			{ @@ -141,7 +142,8 @@  		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into  		 *  \param[in]     Data    Data element to insert into the buffer  		 */ -		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, RingBuff_Data_t Data) +		static inline void RingBuffer_Insert(RingBuff_t* const Buffer, +		                                     const RingBuff_Data_t Data)  		{  			*Buffer->In = Data; diff --git a/Projects/XPLAINBridge/Lib/SoftUART.h b/Projects/XPLAINBridge/Lib/SoftUART.h index d0b03c04b3..7203b3a0df 100644 --- a/Projects/XPLAINBridge/Lib/SoftUART.h +++ b/Projects/XPLAINBridge/Lib/SoftUART.h @@ -60,6 +60,6 @@  		}  	/* Function Prototypes: */ -		void    SoftUART_Init(void); +		void SoftUART_Init(void);  #endif
\ No newline at end of file diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index 159f38609a..9871305b0e 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.c +++ b/Projects/XPLAINBridge/USARTDescriptors.c @@ -221,7 +221,9 @@ USB_Descriptor_String_t PROGMEM USART_ProductString =  /** Descriptor retrieval function for the USART Bridge descriptors. This function is in turn called by the GetDescriptor   *  callback function in the main source file, to retrieve the device's descriptors when in USART bridge mode.   */ -uint16_t USART_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t USART_GetDescriptor(const uint16_t wValue, +                             const uint8_t wIndex, +                             void** const DescriptorAddress)  {  	const uint8_t  DescriptorType   = (wValue >> 8);  	const uint8_t  DescriptorNumber = (wValue & 0xFF); diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index 5654a3bbd5..194dbe70ac 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -77,6 +77,8 @@  		} USART_USB_Descriptor_Configuration_t;  	/* Function Prototypes: */ -		uint16_t USART_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress); +		uint16_t USART_GetDescriptor(const uint16_t wValue, +		                             const uint8_t wIndex, +		                             void** const DescriptorAddress);  #endif diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 2e8e6a89ec..28354812f5 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -240,8 +240,16 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI   *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function   *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the   *  USB host. + * + *  \param[in]  wValue  Descriptor type and index to retrieve + *  \param[in]  wIndex  Sub-index to retrieve (such as a localized string language) + *  \param[out] DescriptorAddress  Address of the retrieved descriptor + * + *  \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found   */ -uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress) +uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +                                    const uint8_t wIndex, +                                    void** const DescriptorAddress)  {  	/* Return the correct descriptors based on the selected mode */  	if (CurrentFirmwareMode == MODE_USART_BRIDGE) diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h index fcb1776330..ee747ee1a9 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.h +++ b/Projects/XPLAINBridge/XPLAINBridge.h @@ -93,6 +93,8 @@  		void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo); -		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress); +		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, +		                                    const uint8_t wIndex, +		                                    void** const DescriptorAddress) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);  #endif | 
