jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Add an interface for soft disconnection, and hook it up in the F107 driver.

Browse Source
This commit is contained in:
Mike Smith 2012-01-02 21:06:48 -08:00 committed by Piotr Esden-Tempski
parent 5310cd1b57
commit 7da1967056
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libopencm3/usb/usbd.h
View File

@ -56,6 +56,7 @@ extern void usbd_register_set_config_callback(void (*callback)(u16 wValue));
/* Functions to be provided by the hardware abstraction layer */ /* Functions to be provided by the hardware abstraction layer */
extern void usbd_poll(void); extern void usbd_poll(void);
extern void usbd_disconnect(bool disconnected);
extern void usbd_ep_setup(u8 addr, u8 type, u16 max_size, extern void usbd_ep_setup(u8 addr, u8 type, u16 max_size,
void (*callback)(u8 ep)); void (*callback)(u8 ep));

7
lib/usb/usb.c
View File

@ -108,6 +108,13 @@ void usbd_poll(void)
_usbd_device.driver->poll(); _usbd_device.driver->poll();
} }
void usbd_disconnect(bool disconnected)
{
/* not all drivers support disconnection */
if (_usbd_device.driver->disconnect)
_usbd_device.driver->disconnect(disconnected);
}
void usbd_ep_setup(u8 addr, u8 type, u16 max_size, void (*callback)(u8 ep)) void usbd_ep_setup(u8 addr, u8 type, u16 max_size, void (*callback)(u8 ep))
{ {
_usbd_device.driver->ep_setup(addr, type, max_size, callback); _usbd_device.driver->ep_setup(addr, type, max_size, callback);

11
lib/usb/usb_f107.c
View File

@ -42,6 +42,7 @@ static void stm32f107_ep_nak_set(u8 addr, u8 nak);
static u16 stm32f107_ep_write_packet(u8 addr, const void *buf, u16 len); 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 u16 stm32f107_ep_read_packet(u8 addr, void *buf, u16 len);
static void stm32f107_poll(void); static void stm32f107_poll(void);
static void stm32f107_disconnect(bool disconnected);
/* /*
* We keep a backup copy of the out endpoint size registers to restore them * We keep a backup copy of the out endpoint size registers to restore them
@ -60,6 +61,7 @@ const struct _usbd_driver stm32f107_usb_driver = {
.ep_write_packet = stm32f107_ep_write_packet, .ep_write_packet = stm32f107_ep_write_packet,
.ep_read_packet = stm32f107_ep_read_packet, .ep_read_packet = stm32f107_ep_read_packet,
.poll = stm32f107_poll, .poll = stm32f107_poll,
.disconnect = stm32f107_disconnect,
}; };
/** Initialize the USB device controller hardware of the STM32. */ /** Initialize the USB device controller hardware of the STM32. */
@ -376,3 +378,12 @@ static void stm32f107_poll(void)
OTG_FS_GINTSTS = OTG_FS_GINTSTS_SOF; OTG_FS_GINTSTS = OTG_FS_GINTSTS_SOF;
} }
} }
static void stm32f107_disconnect(bool disconnected)
{
if (disconnected) {
OTG_FS_DCTL |= OTG_FS_DCTL_SDIS;
} else {
OTG_FS_DCTL &= ~OTG_FS_DCTL_SDIS;
}
}

1
lib/usb/usb_private.h
View File

@ -84,6 +84,7 @@ struct _usbd_driver {
u16 (*ep_write_packet)(u8 addr, const void *buf, u16 len); u16 (*ep_write_packet)(u8 addr, const void *buf, u16 len);
u16 (*ep_read_packet)(u8 addr, void *buf, u16 len); u16 (*ep_read_packet)(u8 addr, void *buf, u16 len);
void (*poll)(void); void (*poll)(void);
void (*disconnect)(bool disconnected);
}; };
#define _usbd_hw_init() _usbd_device.driver->init() #define _usbd_hw_init() _usbd_device.driver->init()