aboutsummaryrefslogtreecommitdiff
path: root/examples/lisa-m
diff options
context:
space:
mode:
authorUwe Hermann2010-12-29 17:02:36 +0100
committerUwe Hermann2010-12-29 17:02:36 +0100
commit34fd228bf9158b0df47b4ec04b20db682963d5b0 (patch)
tree16d127ad47b30f9f743a9bb736c6b3a7e9f44e21 /examples/lisa-m
parentf06277793007a3ba32f73c188c8c807ed3651e02 (diff)
Move generic USB stuff to a subdir, dedupe .h files.
Adapt examples and the lib code accordingly.
Diffstat (limited to 'examples/lisa-m')
-rw-r--r--examples/lisa-m/usb_dfu/dfu.h81
-rw-r--r--examples/lisa-m/usb_dfu/usbdfu.c8
-rw-r--r--examples/lisa-m/usb_hid/hid.h38
-rw-r--r--examples/lisa-m/usb_hid/usbhid.c12
4 files changed, 8 insertions, 131 deletions
diff --git a/examples/lisa-m/usb_dfu/dfu.h b/examples/lisa-m/usb_dfu/dfu.h
deleted file mode 100644
index cca07cb..0000000
--- a/examples/lisa-m/usb_dfu/dfu.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file is part of the libopenstm32 project.
- *
- * Copyright (C) 2010 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 __DFU_H
-#define __DFU_H
-
-enum dfu_req {
- DFU_DETACH,
- DFU_DNLOAD,
- DFU_UPLOAD,
- DFU_GETSTATUS,
- DFU_CLRSTATUS,
- DFU_GETSTATE,
- DFU_ABORT
-};
-
-enum dfu_status {
- DFU_STATUS_OK,
- DFU_STATUS_ERR_TARGET,
- DFU_STATUS_ERR_FILE,
- DFU_STATUS_ERR_WRITE,
- DFU_STATUS_ERR_ERASE,
- DFU_STATUS_ERR_CHECK_ERASED,
- DFU_STATUS_ERR_PROG,
- DFU_STATUS_ERR_VERIFY,
- DFU_STATUS_ERR_ADDRESS,
- DFU_STATUS_ERR_NOTDONE,
- DFU_STATUS_ERR_FIRMWARE,
- DFU_STATUS_ERR_VENDOR,
- DFU_STATUS_ERR_USBR,
- DFU_STATUS_ERR_POR,
- DFU_STATUS_ERR_UNKNOWN,
- DFU_STATUS_ERR_STALLEDPKT,
-};
-
-enum dfu_state {
- STATE_APP_IDLE,
- STATE_APP_DETACH,
- STATE_DFU_IDLE,
- STATE_DFU_DNLOAD_SYNC,
- STATE_DFU_DNBUSY,
- STATE_DFU_DNLOAD_IDLE,
- STATE_DFU_MANIFEST_SYNC,
- STATE_DFU_MANIFEST,
- STATE_DFU_MANIFEST_WAIT_RESET,
- STATE_DFU_UPLOAD_IDLE,
- STATE_DFU_ERROR,
-};
-
-#define DFU_FUNCTIONAL 0x21
-struct usb_dfu_descriptor {
- uint8_t bLength;
- uint8_t bDescriptorType;
- uint8_t bmAttributes;
-#define USB_DFU_CAN_DOWNLOAD 0x01
-#define USB_DFU_CAN_UPLOAD 0x02
-#define USB_DFU_MANIFEST_TOLERANT 0x04
-#define USB_DFU_WILL_DETACH 0x08
-
- uint16_t wDetachTimeout;
- uint16_t wTransferSize;
- uint16_t bcdDFUVersion;
-} __attribute__((packed));
-
-#endif
diff --git a/examples/lisa-m/usb_dfu/usbdfu.c b/examples/lisa-m/usb_dfu/usbdfu.c
index 7f17ec8..0a6789d 100644
--- a/examples/lisa-m/usb_dfu/usbdfu.c
+++ b/examples/lisa-m/usb_dfu/usbdfu.c
@@ -17,15 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <string.h>
#include <libopenstm32/rcc.h>
#include <libopenstm32/gpio.h>
#include <libopenstm32/flash.h>
#include <libopenstm32/scb.h>
-#include <usbd.h>
-
-#include <string.h>
-
-#include "dfu.h"
+#include <usb/usbd.h>
+#include <usb/dfu.h>
#define APP_ADDRESS 0x08002000
diff --git a/examples/lisa-m/usb_hid/hid.h b/examples/lisa-m/usb_hid/hid.h
deleted file mode 100644
index 6804cab..0000000
--- a/examples/lisa-m/usb_hid/hid.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the libopenstm32 project.
- *
- * Copyright (C) 2010 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 __HID_H
-#define __HID_H
-
-#include <stdint.h>
-
-#define USB_CLASS_HID 3
-
-#define USB_DT_HID 0x21
-#define USB_DT_REPORT 0x22
-
-struct usb_hid_descriptor {
- uint8_t bLength;
- uint8_t bDescriptorType;
- uint16_t bcdHID;
- uint8_t bCountryCode;
- uint8_t bNumDescriptors;
-} __attribute__((packed));
-
-#endif
diff --git a/examples/lisa-m/usb_hid/usbhid.c b/examples/lisa-m/usb_hid/usbhid.c
index cf3b543..6adef1e 100644
--- a/examples/lisa-m/usb_hid/usbhid.c
+++ b/examples/lisa-m/usb_hid/usbhid.c
@@ -17,21 +17,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <stdlib.h>
#include <libopenstm32/rcc.h>
#include <libopenstm32/gpio.h>
#include <libopenstm32/systick.h>
-#include <usbd.h>
-
-#include <stdlib.h>
-
-#include "hid.h"
+#include <usb/usbd.h>
+#include <usb/hid.h>
/* Define this to include the DFU APP interface. */
#define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE
-# include <libopenstm32/scb.h>
-# include "../usb_dfu/dfu.h"
+#include <libopenstm32/scb.h>
+#include <usb/dfu.h>
#endif
const struct usb_device_descriptor dev = {