aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorUwe Hermann2011-03-07 13:37:30 +0100
committerUwe Hermann2011-03-07 13:37:30 +0100
commitef766da46811b7cbc7202ce01aa0fb51e785dfee (patch)
treef857013d2fb1708d15faf3ab4245b643b85bd13c /lib
parent6694f3dc0c0cde00a4f5723dc602de731c63fd84 (diff)
parent554feb7f274d853fc024165b3c3074d38a01e0c0 (diff)
Merge remote-tracking branch 'gsmcmullin/master'
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32/Makefile2
-rw-r--r--lib/usb/usb.c2
-rw-r--r--lib/usb/usb_f103.c6
-rw-r--r--lib/usb/usb_f107.c323
-rw-r--r--lib/usb/usb_private.h14
5 files changed, 335 insertions, 12 deletions
diff --git a/lib/stm32/Makefile b/lib/stm32/Makefile
index 966cb03..6ffcc4a 100644
--- a/lib/stm32/Makefile
+++ b/lib/stm32/Makefile
@@ -31,7 +31,7 @@ ARFLAGS = rcs
OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o \
rtc.o i2c.o dma.o systick.o exti.o scb.o ethernet.o \
usb_f103.o usb.o usb_control.o usb_standard.o can.o \
- timer.o
+ timer.o usb_f107.o
VPATH += ../usb
diff --git a/lib/usb/usb.c b/lib/usb/usb.c
index dbdb822..eb8e6d8 100644
--- a/lib/usb/usb.c
+++ b/lib/usb/usb.c
@@ -46,7 +46,7 @@ int usbd_init(const usbd_driver *driver,
const struct usb_device_descriptor *dev,
const struct usb_config_descriptor *conf, const char **strings)
{
- _usbd_device.driver = (usbd_driver *)driver;
+ _usbd_device.driver = driver;
_usbd_device.desc = dev;
_usbd_device.config = conf;
_usbd_device.strings = strings;
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index a587978..ef97670 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -35,10 +35,10 @@ static u16 stm32f103_ep_read_packet(u8 addr, void *buf, u16 len);
static void stm32f103_poll(void);
const struct _usbd_driver stm32f103_usb_driver = {
- ._init = stm32f103_usbd_init,
- ._set_address = stm32f103_set_address,
+ .init = stm32f103_usbd_init,
+ .set_address = stm32f103_set_address,
.ep_setup = stm32f103_ep_setup,
- ._ep_reset = stm32f103_endpoints_reset,
+ .ep_reset = stm32f103_endpoints_reset,
.ep_stall_set = stm32f103_ep_stall_set,
.ep_stall_get = stm32f103_ep_stall_get,
.ep_write_packet = stm32f103_ep_write_packet,
diff --git a/lib/usb/usb_f107.c b/lib/usb/usb_f107.c
new file mode 100644
index 0000000..a681b60
--- /dev/null
+++ b/lib/usb/usb_f107.c
@@ -0,0 +1,323 @@
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2011 Gareth McMullin <gareth@blacksphere.co.nz>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/tools.h>
+#include <libopencm3/stm32/otg_fs.h>
+#include <libopencm3/usb/usbd.h>
+#include "usb_private.h"
+
+#include <string.h>
+
+static void stm32f107_usbd_init(void);
+static void stm32f107_set_address(u8 addr);
+static void stm32f107_ep_setup(u8 addr, u8 type, u16 max_size,
+ void (*callback) (u8 ep));
+static void stm32f107_endpoints_reset(void);
+static void stm32f107_ep_stall_set(u8 addr, u8 stall);
+static u8 stm32f107_ep_stall_get(u8 addr);
+static u16 stm32f107_ep_write_packet(u8 addr, const void *buf, u16 len);
+static u16 stm32f107_ep_read_packet(u8 addr, void *buf, u16 len);
+static void stm32f107_poll(void);
+
+/* We keep a backup copy of the out endpoint size registers to restore them
+ * after a transaction */
+static u32 doeptsiz[4];
+
+const struct _usbd_driver stm32f107_usb_driver = {
+ .init = stm32f107_usbd_init,
+ .set_address = stm32f107_set_address,
+ .ep_setup = stm32f107_ep_setup,
+ .ep_reset = stm32f107_endpoints_reset,
+ .ep_stall_set = stm32f107_ep_stall_set,
+ .ep_stall_get = stm32f107_ep_stall_get,
+ .ep_write_packet = stm32f107_ep_write_packet,
+ .ep_read_packet = stm32f107_ep_read_packet,
+ .poll = stm32f107_poll,
+};
+
+/** Initialize the USB device controller hardware of the STM32. */
+static void stm32f107_usbd_init(void)
+{
+ int i;
+ /* TODO: Enable interrupts on Reset, Transfer, Suspend and Resume */
+
+ /* WARNING: Undocumented! Select internal PHY */
+ OTG_FS_GUSBCFG |= OTG_FS_GUSBCFG_PHYSEL;
+ /* Enable VBUS sensing in device mode and power down the phy */
+ OTG_FS_GCCFG |= OTG_FS_GCCFG_VBUSBSEN | OTG_FS_GCCFG_PWRDWN;
+
+ for(i = 0; i < 800000; i++) __asm__("nop");
+
+ /* Wait for AHB idle */
+ while(!(OTG_FS_GRSTCTL & OTG_FS_GRSTCTL_AHBIDL));
+ /* Do core soft reset */
+ OTG_FS_GRSTCTL |= OTG_FS_GRSTCTL_CSRST;
+ while(OTG_FS_GRSTCTL & OTG_FS_GRSTCTL_CSRST);
+
+ for(i = 0; i < 800000; i++) __asm__("nop");
+
+ /* Force peripheral only mode. */
+ OTG_FS_GUSBCFG |= OTG_FS_GUSBCFG_FDMOD;
+
+ /* Full speed device */
+ OTG_FS_DCFG |= OTG_FS_DCFG_DSPD;
+
+ /* Restart the phy clock */
+ OTG_FS_PCGCCTL = 0;
+
+
+ /* Unmask interrupts for TX and RX */
+ OTG_FS_GINTMSK &= OTG_FS_GINTMSK_RXFLVLM;
+}
+
+static void stm32f107_set_address(u8 addr)
+{
+ /* There is something badly wrong gere! */
+
+ /* TODO: Set device address and enable. */
+
+ /* This I think is correct, but doesn't work at all... */
+ //OTG_FS_DCFG = (OTG_FS_DCFG & ~OTG_FS_DCFG_DAD) | (addr << 4);
+
+ /* This is obviously incorrect, but sometimes works... */
+ OTG_FS_DCFG |= addr << 4;
+}
+
+static void stm32f107_ep_setup(u8 addr, u8 type, u16 max_size,
+ void (*callback) (u8 ep))
+{
+ /* TODO: Configure endpoint address and type.
+ * Allocate FIFO memory for endpoint.
+ * Install callback funciton.
+ */
+ u8 dir = addr & 0x80;
+ addr &= 0x7f;
+
+ if(addr == 0) { /* For the default control endpoint */
+ /* Configure IN part */
+ if(max_size >= 64) {
+ OTG_FS_DIEPCTL0 = OTG_FS_DIEPCTL0_MPSIZ_64;
+ } else if(max_size >= 32) {
+ OTG_FS_DIEPCTL0 = OTG_FS_DIEPCTL0_MPSIZ_32;
+ } else if(max_size >= 16) {
+ OTG_FS_DIEPCTL0 = OTG_FS_DIEPCTL0_MPSIZ_16;
+ } else {
+ OTG_FS_DIEPCTL0 = OTG_FS_DIEPCTL0_MPSIZ_8;
+ }
+ OTG_FS_DIEPTSIZ0 = (max_size & OTG_FS_DIEPSIZ0_XFRSIZ_MASK);
+ OTG_FS_DIEPCTL0 |= OTG_FS_DIEPCTL0_EPENA | OTG_FS_DIEPCTL0_SNAK;
+
+ /* Configure OUT part */
+ doeptsiz[0] = OTG_FS_DIEPSIZ0_STUPCNT_1 | (1 << 19) |
+ (max_size & OTG_FS_DIEPSIZ0_XFRSIZ_MASK);
+ OTG_FS_DOEPTSIZ(0) = doeptsiz[0];
+ OTG_FS_DOEPCTL(0) |= OTG_FS_DOEPCTL0_EPENA | OTG_FS_DIEPCTL0_SNAK;
+
+ return;
+ }
+
+ /* TODO: Configuration for other endpoints */
+ if (dir) {
+ OTG_FS_DIEPTSIZ(addr) = (max_size & OTG_FS_DIEPSIZ0_XFRSIZ_MASK);
+ OTG_FS_DIEPCTL(addr) |= OTG_FS_DIEPCTL0_EPENA |
+ OTG_FS_DIEPCTL0_SNAK | (type << 18) |
+ (addr << 22) | max_size;
+
+ if (callback) {
+ _usbd_device.
+ user_callback_ctr[addr][USB_TRANSACTION_IN] =
+ (void *)callback;
+ }
+ }
+
+ if (!dir) {
+ doeptsiz[addr] = (1 << 19) |
+ (max_size & OTG_FS_DIEPSIZ0_XFRSIZ_MASK);
+ OTG_FS_DOEPTSIZ(addr) = doeptsiz[addr];
+ OTG_FS_DOEPCTL(addr) |= OTG_FS_DOEPCTL0_EPENA |
+ OTG_FS_DIEPCTL0_CNAK | (type << 18) | max_size;
+
+ if (callback) {
+ _usbd_device.
+ user_callback_ctr[addr][USB_TRANSACTION_OUT] =
+ (void *)callback;
+ }
+ }
+}
+
+static void stm32f107_endpoints_reset(void)
+{
+ /* TODO: Reset all endpoints. */
+}
+
+static void stm32f107_ep_stall_set(u8 addr, u8 stall)
+{
+ if(addr == 0) {
+ if(stall)
+ OTG_FS_DOEPCTL(addr) |= OTG_FS_DOEPCTL0_STALL;
+ else
+ OTG_FS_DOEPCTL(addr) &= ~OTG_FS_DOEPCTL0_STALL;
+ }
+
+ if(addr & 0x80) {
+ addr &= 0x7F;
+
+ if(stall)
+ OTG_FS_DIEPCTL(addr) |= OTG_FS_DIEPCTL0_STALL;
+ else
+ OTG_FS_DIEPCTL(addr) &= ~OTG_FS_DIEPCTL0_STALL;
+ /* TODO: Reset to DATA0 */
+ } else {
+ if(stall)
+ OTG_FS_DOEPCTL(addr) |= OTG_FS_DOEPCTL0_STALL;
+ else
+ OTG_FS_DOEPCTL(addr) &= ~OTG_FS_DOEPCTL0_STALL;
+ /* TODO: Reset to DATA0 */
+ }
+}
+
+static u8 stm32f107_ep_stall_get(u8 addr)
+{
+ /* TODO: return 1 if STALL set. */
+ (void)addr;
+
+ return 0;
+}
+
+static u16 stm32f107_ep_write_packet(u8 addr, const void *buf, u16 len)
+{
+ const u32 *buf32 = buf;
+ int i;
+
+ addr &= 0x7F;
+
+ /* Enable endpoint for transmission */
+ OTG_FS_DIEPTSIZ(addr) = (1 << 19) | len;
+ OTG_FS_DIEPCTL(addr) |= OTG_FS_DIEPCTL0_EPENA | OTG_FS_DIEPCTL0_CNAK;
+
+ /* Copy buffer to endpoint FIFO */
+ u32 *fifo = OTG_FS_FIFO(addr);
+ for(i = len; i > 0; i -= 4) {
+ *fifo++ = *buf32++;
+ }
+
+ return len;
+}
+
+/* Received packet size for each endpoint. This is assigned in
+ * stm32f107_poll() which reads the packet status push register GRXSTSP
+ * for use in stm32f107_ep_read_packet().
+ */
+static uint16_t rxbcnt[4];
+
+static u16 stm32f107_ep_read_packet(u8 addr, void *buf, u16 len)
+{
+ int i;
+ u32 *buf32 = buf;
+ u32 extra;
+
+ len = MIN(len, rxbcnt[addr]);
+ rxbcnt[addr] = 0;
+
+ u32 *fifo = OTG_FS_FIFO(addr);
+ for(i = len; i >= 4; i -= 4) {
+ *buf32++ = *fifo++;
+ }
+
+ if(i) {
+ extra = *fifo;
+ memcpy(buf32, &extra, i);
+ }
+
+ OTG_FS_DOEPTSIZ(addr) = doeptsiz[addr];
+ OTG_FS_DOEPCTL(addr) |= OTG_FS_DOEPCTL0_EPENA | OTG_FS_DOEPCTL0_CNAK;
+
+ return len;
+}
+
+static void stm32f107_poll(void)
+{
+ /* TODO: Read interrupt status register */
+ u32 intsts = OTG_FS_GINTSTS;
+
+ if (intsts & OTG_FS_GINTSTS_ENUMDNE) {
+ /* TODO: Handle USB RESET condition */
+ OTG_FS_GINTSTS = OTG_FS_GINTSTS_ENUMDNE;
+ _usbd_reset();
+ return;
+ }
+
+ /* TODO: Handle transfer complete condition */
+ /* Note: RX and TX handled differently in this device. */
+ if (intsts & OTG_FS_GINTSTS_RXFLVL) {
+ /* Receive FIFO non-empty */
+ u32 rxstsp = OTG_FS_GRXSTSP;
+ u32 pktsts = rxstsp & OTG_FS_GRXSTSP_PKTSTS_MASK;
+ if((pktsts != OTG_FS_GRXSTSP_PKTSTS_OUT) &&
+ (pktsts != OTG_FS_GRXSTSP_PKTSTS_SETUP)) return;
+
+ u8 ep = rxstsp & OTG_FS_GRXSTSP_EPNUM_MASK;
+ u8 type;
+ if(pktsts == OTG_FS_GRXSTSP_PKTSTS_SETUP)
+ type = USB_TRANSACTION_SETUP;
+ else
+ type = USB_TRANSACTION_OUT;
+
+ /* Save packet size for stm32f107_ep_read_packet() */
+ rxbcnt[ep] = (rxstsp & OTG_FS_GRXSTSP_BCNT_MASK) >> 4;
+
+ if (_usbd_device.user_callback_ctr[ep][type])
+ _usbd_device.user_callback_ctr[ep][type] (ep);
+ /* TODO: clear any interrupt flag */
+ }
+
+ /* There is no global interrupt flag for transmit complete.
+ * the XFRC bit must be checked in each OTG_FS_DIEPINT(x)
+ */
+ /* TODO: Check on endpoint interrupt... */
+ {
+ int i;
+ for (i = 0; i < 4; i++) { /* Iterate over endpoints */
+ if(OTG_FS_DIEPINT(i) & OTG_FS_DIEPINTX_XFRC) {
+ /* Transfer complete */
+ if (_usbd_device.user_callback_ctr[i][USB_TRANSACTION_IN])
+ _usbd_device.user_callback_ctr[i][USB_TRANSACTION_IN] (i);
+ OTG_FS_DIEPINT(i) = OTG_FS_DIEPINTX_XFRC;
+ }
+ }
+ }
+
+ /* TODO: Handle suspend condition */
+ if (0) {
+ /* TODO: Clear suspend interrupt flag */
+ if (_usbd_device.user_callback_suspend)
+ _usbd_device.user_callback_suspend();
+ }
+
+ /* TODO: Handle wakeup condition */
+ if (0) {
+ /* TODO: Clear wakeup interrupt flag */
+ if (_usbd_device.user_callback_resume)
+ _usbd_device.user_callback_resume();
+ }
+
+ /* TODO: Handle SOF condition */
+}
+
diff --git a/lib/usb/usb_private.h b/lib/usb/usb_private.h
index bef225d..1bc6b3f 100644
--- a/lib/usb/usb_private.h
+++ b/lib/usb/usb_private.h
@@ -54,7 +54,7 @@ extern struct _usbd_device {
/* User callback function for some standard USB function hooks */
void (*user_callback_set_config)(u16 wValue);
- struct _usbd_driver *driver;
+ const struct _usbd_driver *driver;
} _usbd_device;
enum _usbd_transaction {
@@ -73,10 +73,10 @@ void _usbd_reset(void);
/* Functions provided by the hardware abstraction. */
struct _usbd_driver {
- void (*_init)(void);
- void (*_set_address)(u8 addr);
+ void (*init)(void);
+ void (*set_address)(u8 addr);
void (*ep_setup)(u8 addr, u8 type, u16 max_size, void (*cb)(u8 ep));
- void (*_ep_reset)(void);
+ void (*ep_reset)(void);
void (*ep_stall_set)(u8 addr, u8 stall);
u8 (*ep_stall_get)(u8 addr);
u16 (*ep_write_packet)(u8 addr, const void *buf, u16 len);
@@ -84,8 +84,8 @@ struct _usbd_driver {
void (*poll)(void);
};
-#define _usbd_hw_init() _usbd_device.driver->_init()
-#define _usbd_hw_set_address(addr) _usbd_device.driver->_set_address(addr)
-#define _usbd_hw_endpoints_reset() _usbd_device.driver->_ep_reset()
+#define _usbd_hw_init() _usbd_device.driver->init()
+#define _usbd_hw_set_address(addr) _usbd_device.driver->set_address(addr)
+#define _usbd_hw_endpoints_reset() _usbd_device.driver->ep_reset()
#endif