aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32-h103/usb_hid
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/stm32-h103/usb_hid
parentf06277793007a3ba32f73c188c8c807ed3651e02 (diff)
Move generic USB stuff to a subdir, dedupe .h files.
Adapt examples and the lib code accordingly.
Diffstat (limited to 'examples/stm32-h103/usb_hid')
-rw-r--r--examples/stm32-h103/usb_hid/hid.h38
-rw-r--r--examples/stm32-h103/usb_hid/usbhid.c12
2 files changed, 5 insertions, 45 deletions
diff --git a/examples/stm32-h103/usb_hid/hid.h b/examples/stm32-h103/usb_hid/hid.h
deleted file mode 100644
index 6804cab..0000000
--- a/examples/stm32-h103/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/stm32-h103/usb_hid/usbhid.c b/examples/stm32-h103/usb_hid/usbhid.c
index f98448c..457bb04 100644
--- a/examples/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32-h103/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 = {