From 80fd23580aa9916193bc12de241d7d589a8d6c92 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Tue, 26 Feb 2013 17:14:31 -0800 Subject: Fix all warnings for stm32f1 lib. --- lib/usb/usb_f103.c | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'lib/usb/usb_f103.c') diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c index aa323d9..ec98f35 100644 --- a/lib/usb/usb_f103.c +++ b/lib/usb/usb_f103.c @@ -69,9 +69,9 @@ static usbd_device *stm32f103_usbd_init(void) return &usbd_dev; } -static void stm32f103_set_address(usbd_device *usbd_dev, u8 addr) +static void stm32f103_set_address(usbd_device *dev, u8 addr) { - (void)usbd_dev; + (void)dev; /* Set device address and enable. */ SET_REG(USB_DADDR_REG, (addr & USB_DADDR_ADDR) | USB_DADDR_ENABLE); } @@ -82,9 +82,9 @@ static void stm32f103_set_address(usbd_device *usbd_dev, u8 addr) * @param ep Index of endpoint to configure. * @param size Size in bytes of the RX buffer. */ -static void usb_set_ep_rx_bufsize(usbd_device *usbd_dev, u8 ep, u32 size) +static void usb_set_ep_rx_bufsize(usbd_device *dev, u8 ep, u32 size) { - (void)usbd_dev; + (void)dev; if (size > 62) { if (size & 0x1f) size -= 32; @@ -96,7 +96,7 @@ static void usb_set_ep_rx_bufsize(usbd_device *usbd_dev, u8 ep, u32 size) } } -static void stm32f103_ep_setup(usbd_device *usbd_dev, u8 addr, u8 type, +static void stm32f103_ep_setup(usbd_device *dev, u8 addr, u8 type, u16 max_size, void (*callback) (usbd_device *usbd_dev, u8 ep)) { @@ -115,30 +115,30 @@ static void stm32f103_ep_setup(usbd_device *usbd_dev, u8 addr, u8 type, USB_SET_EP_TYPE(addr, typelookup[type]); if (dir || (addr == 0)) { - USB_SET_EP_TX_ADDR(addr, usbd_dev->pm_top); + USB_SET_EP_TX_ADDR(addr, dev->pm_top); if (callback) { - usbd_dev->user_callback_ctr[addr][USB_TRANSACTION_IN] = + dev->user_callback_ctr[addr][USB_TRANSACTION_IN] = (void *)callback; } USB_CLR_EP_TX_DTOG(addr); USB_SET_EP_TX_STAT(addr, USB_EP_TX_STAT_NAK); - usbd_dev->pm_top += max_size; + dev->pm_top += max_size; } if (!dir) { - USB_SET_EP_RX_ADDR(addr, usbd_dev->pm_top); - usb_set_ep_rx_bufsize(usbd_dev, addr, max_size); + USB_SET_EP_RX_ADDR(addr, dev->pm_top); + usb_set_ep_rx_bufsize(dev, addr, max_size); if (callback) { - usbd_dev->user_callback_ctr[addr][USB_TRANSACTION_OUT] = + dev->user_callback_ctr[addr][USB_TRANSACTION_OUT] = (void *)callback; } USB_CLR_EP_RX_DTOG(addr); USB_SET_EP_RX_STAT(addr, USB_EP_RX_STAT_VALID); - usbd_dev->pm_top += max_size; + dev->pm_top += max_size; } } -static void stm32f103_endpoints_reset(usbd_device *usbd_dev) +static void stm32f103_endpoints_reset(usbd_device *dev) { int i; @@ -147,12 +147,12 @@ static void stm32f103_endpoints_reset(usbd_device *usbd_dev) USB_SET_EP_TX_STAT(i, USB_EP_TX_STAT_DISABLED); USB_SET_EP_RX_STAT(i, USB_EP_RX_STAT_DISABLED); } - usbd_dev->pm_top = 0x40 + (2 * usbd_dev->desc->bMaxPacketSize0); + dev->pm_top = 0x40 + (2 * dev->desc->bMaxPacketSize0); } -static void stm32f103_ep_stall_set(usbd_device *usbd_dev, u8 addr, u8 stall) +static void stm32f103_ep_stall_set(usbd_device *dev, u8 addr, u8 stall) { - (void)usbd_dev; + (void)dev; if (addr == 0) USB_SET_EP_TX_STAT(addr, stall ? USB_EP_TX_STAT_STALL : USB_EP_TX_STAT_NAK); @@ -176,9 +176,9 @@ static void stm32f103_ep_stall_set(usbd_device *usbd_dev, u8 addr, u8 stall) } } -static u8 stm32f103_ep_stall_get(usbd_device *usbd_dev, u8 addr) +static u8 stm32f103_ep_stall_get(usbd_device *dev, u8 addr) { - (void)usbd_dev; + (void)dev; if (addr & 0x80) { if ((*USB_EP_REG(addr & 0x7F) & USB_EP_TX_STAT) == USB_EP_TX_STAT_STALL) @@ -191,9 +191,9 @@ static u8 stm32f103_ep_stall_get(usbd_device *usbd_dev, u8 addr) return 0; } -static void stm32f103_ep_nak_set(usbd_device *usbd_dev, u8 addr, u8 nak) +static void stm32f103_ep_nak_set(usbd_device *dev, u8 addr, u8 nak) { - (void)usbd_dev; + (void)dev; /* It does not make sence to force NAK on IN endpoints. */ if (addr & 0x80) return; @@ -222,10 +222,10 @@ static void usb_copy_to_pm(volatile void *vPM, const void *buf, u16 len) *PM = *lbuf; } -static u16 stm32f103_ep_write_packet(usbd_device *usbd_dev, u8 addr, +static u16 stm32f103_ep_write_packet(usbd_device *dev, u8 addr, const void *buf, u16 len) { - (void)usbd_dev; + (void)dev; addr &= 0x7F; if ((*USB_EP_REG(addr) & USB_EP_TX_STAT) == USB_EP_TX_STAT_VALID) @@ -258,10 +258,10 @@ static void usb_copy_from_pm(void *buf, const volatile void *vPM, u16 len) *(u8 *) lbuf = *(u8 *) PM; } -static u16 stm32f103_ep_read_packet(usbd_device *usbd_dev, u8 addr, void *buf, +static u16 stm32f103_ep_read_packet(usbd_device *dev, u8 addr, void *buf, u16 len) { - (void)usbd_dev; + (void)dev; if ((*USB_EP_REG(addr) & USB_EP_RX_STAT) == USB_EP_RX_STAT_VALID) return 0; @@ -275,13 +275,13 @@ static u16 stm32f103_ep_read_packet(usbd_device *usbd_dev, u8 addr, void *buf, return len; } -static void stm32f103_poll(usbd_device *usbd_dev) +static void stm32f103_poll(usbd_device *dev) { u16 istr = *USB_ISTR_REG; if (istr & USB_ISTR_RESET) { - usbd_dev->pm_top = 0x40; - _usbd_reset(usbd_dev); + dev->pm_top = 0x40; + _usbd_reset(dev); USB_CLR_ISTR_RESET(); return; } @@ -295,27 +295,27 @@ static void stm32f103_poll(usbd_device *usbd_dev) else /* IN transaction */ USB_CLR_EP_TX_CTR(ep); - if (usbd_dev->user_callback_ctr[ep][type]) - usbd_dev->user_callback_ctr[ep][type] (usbd_dev, ep); + if (dev->user_callback_ctr[ep][type]) + dev->user_callback_ctr[ep][type] (dev, ep); else USB_CLR_EP_RX_CTR(ep); } if (istr & USB_ISTR_SUSP) { USB_CLR_ISTR_SUSP(); - if (usbd_dev->user_callback_suspend) - usbd_dev->user_callback_suspend(); + if (dev->user_callback_suspend) + dev->user_callback_suspend(); } if (istr & USB_ISTR_WKUP) { USB_CLR_ISTR_WKUP(); - if (usbd_dev->user_callback_resume) - usbd_dev->user_callback_resume(); + if (dev->user_callback_resume) + dev->user_callback_resume(); } if (istr & USB_ISTR_SOF) { - if (usbd_dev->user_callback_sof) - usbd_dev->user_callback_sof(); + if (dev->user_callback_sof) + dev->user_callback_sof(); USB_CLR_ISTR_SOF(); } } -- cgit v1.2.3