aboutsummaryrefslogtreecommitdiff
path: root/src/platforms/stm32
diff options
context:
space:
mode:
Diffstat (limited to 'src/platforms/stm32')
-rw-r--r--src/platforms/stm32/cdcacm.c5
-rw-r--r--src/platforms/stm32/cdcacm.h45
-rw-r--r--src/platforms/stm32/gdb_if.c3
-rw-r--r--src/platforms/stm32/traceswo.c3
-rw-r--r--src/platforms/stm32/traceswo.h28
-rw-r--r--src/platforms/stm32/usbuart.c3
-rw-r--r--src/platforms/stm32/usbuart.h33
7 files changed, 113 insertions, 7 deletions
diff --git a/src/platforms/stm32/cdcacm.c b/src/platforms/stm32/cdcacm.c
index 9694cf0..074b534 100644
--- a/src/platforms/stm32/cdcacm.c
+++ b/src/platforms/stm32/cdcacm.c
@@ -35,10 +35,11 @@
#include "platform.h"
#include "gdb_if.h"
+#include "cdcacm.h"
#if defined(PLATFORM_HAS_TRACESWO)
-#include <traceswo.h>
+#include "traceswo.h"
#endif
-#include <usbuart.h>
+#include "usbuart.h"
#define DFU_IF_NO 4
diff --git a/src/platforms/stm32/cdcacm.h b/src/platforms/stm32/cdcacm.h
new file mode 100644
index 0000000..f64399d
--- /dev/null
+++ b/src/platforms/stm32/cdcacm.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the Black Magic Debug project.
+ *
+ * Copyright (C) 2015 Black Sphere Technologies Ltd.
+ * Written by 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/>.
+ */
+
+/* This file implements a the USB Communications Device Class - Abstract
+ * Control Model (CDC-ACM) as defined in CDC PSTN subclass 1.2.
+ * A Device Firmware Upgrade (DFU 1.1) class interface is provided for
+ * field firmware upgrade.
+ *
+ * The device's unique id is used as the USB serial number string.
+ */
+#ifndef __CDCACM_H
+#define __CDCACM_H
+
+#include <libopencm3/usb/usbd.h>
+
+#define CDCACM_PACKET_SIZE 64
+
+#define CDCACM_GDB_ENDPOINT 1
+#define CDCACM_UART_ENDPOINT 3
+
+extern usbd_device *usbdev;
+
+void cdcacm_init(void);
+/* Returns current usb configuration, or 0 if not configured. */
+int cdcacm_get_config(void);
+int cdcacm_get_dtr(void);
+
+#endif
diff --git a/src/platforms/stm32/gdb_if.c b/src/platforms/stm32/gdb_if.c
index c8208b3..6cc9084 100644
--- a/src/platforms/stm32/gdb_if.c
+++ b/src/platforms/stm32/gdb_if.c
@@ -23,8 +23,7 @@
* uses the USB CDC-ACM device bulk endpoints to implement the channel.
*/
#include "platform.h"
-#include <libopencm3/usb/usbd.h>
-
+#include "cdcacm.h"
#include "gdb_if.h"
static uint32_t count_out;
diff --git a/src/platforms/stm32/traceswo.c b/src/platforms/stm32/traceswo.c
index 01ad728..29bae8f 100644
--- a/src/platforms/stm32/traceswo.c
+++ b/src/platforms/stm32/traceswo.c
@@ -37,10 +37,9 @@
#include <libopencm3/stm32/timer.h>
#include <libopencm3/stm32/f1/rcc.h>
-#include <libopencm3/usb/usbd.h>
-
#include <string.h>
#include "platform.h"
+#include "cdcacm.h"
void traceswo_init(void)
{
diff --git a/src/platforms/stm32/traceswo.h b/src/platforms/stm32/traceswo.h
new file mode 100644
index 0000000..5566f94
--- /dev/null
+++ b/src/platforms/stm32/traceswo.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the Black Magic Debug project.
+ *
+ * Copyright (C) 2012 Black Sphere Technologies Ltd.
+ * Written by 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/>.
+ */
+#ifndef __TRACESWO_H
+#define __TRACESWO_H
+
+#include <libopencm3/usb/usbd.h>
+
+void traceswo_init(void);
+void trace_buf_drain(usbd_device *dev, uint8_t ep);
+
+#endif
diff --git a/src/platforms/stm32/usbuart.c b/src/platforms/stm32/usbuart.c
index f8f56bf..970a609 100644
--- a/src/platforms/stm32/usbuart.c
+++ b/src/platforms/stm32/usbuart.c
@@ -27,7 +27,8 @@
#include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/cdc.h>
-#include <platform.h>
+#include "platform.h"
+#include "cdcacm.h"
#define USBUART_TIMER_FREQ_HZ 1000000U /* 1us per tick */
#define USBUART_RUN_FREQ_HZ 5000U /* 200us (or 100 characters at 2Mbps) */
diff --git a/src/platforms/stm32/usbuart.h b/src/platforms/stm32/usbuart.h
new file mode 100644
index 0000000..39f7dcd
--- /dev/null
+++ b/src/platforms/stm32/usbuart.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the Black Magic Debug project.
+ *
+ * Copyright (C) 2012 Black Sphere Technologies Ltd.
+ * Written by 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/>.
+ */
+#ifndef __USBUART_H
+#define __USBUART_H
+
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/cdc.h>
+#include "general.h"
+
+void usbuart_init(void);
+
+void usbuart_set_line_coding(struct usb_cdc_line_coding *coding);
+void usbuart_usb_out_cb(usbd_device *dev, uint8_t ep);
+void usbuart_usb_in_cb(usbd_device *dev, uint8_t ep);
+
+#endif