Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix compilation warnings (#1516)

Browse Source 
Co-authored-by: gullradriel <gullradriel@no-mail.com>
This commit is contained in:
gullradriel
2024-12-16 20:28:16 +01:00
committed by GitHub
parent db884152dc
commit 46f43c3a9e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/common/usb.c
View File

@ -89,7 +89,7 @@ static void usb_clear_pending_interrupts(const uint32_t mask)
USB0_ENDPTCOMPLETE = USB0_ENDPTCOMPLETE & mask; USB0_ENDPTCOMPLETE = USB0_ENDPTCOMPLETE & mask;
} }
static void usb_clear_all_pending_interrupts() static void usb_clear_all_pending_interrupts(void)
{ {
usb_clear_pending_interrupts(0xFFFFFFFF); usb_clear_pending_interrupts(0xFFFFFFFF);
} }
@ -122,7 +122,7 @@ static void usb_flush_primed_endpoints(const uint32_t mask)
usb_wait_for_endpoint_flushing_to_finish(mask); usb_wait_for_endpoint_flushing_to_finish(mask);
} }
static void usb_flush_all_primed_endpoints() static void usb_flush_all_primed_endpoints(void)
{ {
usb_flush_primed_endpoints(0xFFFFFFFF); usb_flush_primed_endpoints(0xFFFFFFFF);
} }
@ -315,22 +315,22 @@ void usb_endpoint_reset_data_toggle(const usb_endpoint_t* const endpoint)
} }
} }
static void usb_controller_run() static void usb_controller_run(void)
{ {
USB0_USBCMD_D |= USB0_USBCMD_D_RS; USB0_USBCMD_D |= USB0_USBCMD_D_RS;
} }
static void usb_controller_stop() static void usb_controller_stop(void)
{ {
USB0_USBCMD_D &= ~USB0_USBCMD_D_RS; USB0_USBCMD_D &= ~USB0_USBCMD_D_RS;
} }
static uint_fast8_t usb_controller_is_resetting() static uint_fast8_t usb_controller_is_resetting(void)
{ {
return (USB0_USBCMD_D & USB0_USBCMD_D_RST) != 0; return (USB0_USBCMD_D & USB0_USBCMD_D_RST) != 0;
} }
static void usb_controller_set_device_mode() static void usb_controller_set_device_mode(void)
{ {
// Set USB0 peripheral mode // Set USB0 peripheral mode
USB0_USBMODE_D = USB0_USBMODE_D_CM1_0(2); USB0_USBMODE_D = USB0_USBMODE_D_CM1_0(2);
@ -366,7 +366,7 @@ static void usb_clear_status(const uint32_t status)
USB0_USBSTS_D = status; USB0_USBSTS_D = status;
} }
static uint32_t usb_get_status() static uint32_t usb_get_status(void)
{ {
// Mask status flags with enabled flag interrupts. // Mask status flags with enabled flag interrupts.
const uint32_t status = USB0_USBSTS_D & USB0_USBINTR_D; const uint32_t status = USB0_USBSTS_D & USB0_USBINTR_D;
@ -384,7 +384,7 @@ static void usb_clear_endpoint_setup_status(const uint32_t endpoint_setup_status
USB0_ENDPTSETUPSTAT = endpoint_setup_status; USB0_ENDPTSETUPSTAT = endpoint_setup_status;
} }
static uint32_t usb_get_endpoint_setup_status() static uint32_t usb_get_endpoint_setup_status(void)
{ {
return USB0_ENDPTSETUPSTAT; return USB0_ENDPTSETUPSTAT;
} }
@ -394,12 +394,12 @@ static void usb_clear_endpoint_complete(const uint32_t endpoint_complete)
USB0_ENDPTCOMPLETE = endpoint_complete; USB0_ENDPTCOMPLETE = endpoint_complete;
} }
static uint32_t usb_get_endpoint_complete() static uint32_t usb_get_endpoint_complete(void)
{ {
return USB0_ENDPTCOMPLETE; return USB0_ENDPTCOMPLETE;
} }
static void usb_disable_all_endpoints() static void usb_disable_all_endpoints(void)
{ {
// Endpoint 0 is always enabled. TODO: So why set ENDPTCTRL0? // Endpoint 0 is always enabled. TODO: So why set ENDPTCTRL0?
USB0_ENDPTCTRL0 &= ~(USB0_ENDPTCTRL0_RXE | USB0_ENDPTCTRL0_TXE); USB0_ENDPTCTRL0 &= ~(USB0_ENDPTCTRL0_RXE | USB0_ENDPTCTRL0_TXE);
@ -427,14 +427,14 @@ void usb_set_address_deferred(const usb_device_t* const device, const uint_fast8
} }
} }
static void usb_reset_all_endpoints() static void usb_reset_all_endpoints(void)
{ {
usb_disable_all_endpoints(); usb_disable_all_endpoints();
usb_clear_all_pending_interrupts(); usb_clear_all_pending_interrupts();
usb_flush_all_primed_endpoints(); usb_flush_all_primed_endpoints();
} }
static void usb_controller_reset() static void usb_controller_reset(void)
{ {
// TODO: Good to disable some USB interrupts to avoid priming new // TODO: Good to disable some USB interrupts to avoid priming new
// new endpoints before the controller is reset? // new endpoints before the controller is reset?
@ -505,7 +505,7 @@ void usb_device_init(const uint_fast8_t device_ordinal, usb_device_t* const devi
void usb_run(usb_device_t* const device) void usb_run(usb_device_t* const device)
{ {
usb_interrupt_enable(device); usb_interrupt_enable(device);
usb_controller_run(device); usb_controller_run();
} }
static void copy_setup(usb_setup_t* const dst, const volatile uint8_t* const src) static void copy_setup(usb_setup_t* const dst, const volatile uint8_t* const src)
@ -562,7 +562,7 @@ void usb_endpoint_init(const usb_endpoint_t* const endpoint)
usb_endpoint_enable(endpoint); usb_endpoint_enable(endpoint);
} }
static void usb_check_for_setup_events() static void usb_check_for_setup_events(void)
{ {
const uint32_t endptsetupstat = usb_get_endpoint_setup_status(); const uint32_t endptsetupstat = usb_get_endpoint_setup_status();
if (endptsetupstat) { if (endptsetupstat) {
@ -595,7 +595,7 @@ static void usb_check_for_setup_events()
} }
} }
static void usb_check_for_transfer_events() static void usb_check_for_transfer_events(void)
{ {
const uint32_t endptcomplete = usb_get_endpoint_complete(); const uint32_t endptcomplete = usb_get_endpoint_complete();
if (endptcomplete) { if (endptcomplete) {

4
firmware/common/usb.h
View File

@ -29,8 +29,8 @@
#include "usb_type.h" #include "usb_type.h"
void usb_peripheral_reset(); void usb_peripheral_reset(void);
void usb_phy_enable(); void usb_phy_enable(void);
void usb_device_init(const uint_fast8_t device_ordinal, usb_device_t* const device); void usb_device_init(const uint_fast8_t device_ordinal, usb_device_t* const device);