From 34fd228bf9158b0df47b4ec04b20db682963d5b0 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 29 Dec 2010 17:02:36 +0100 Subject: Move generic USB stuff to a subdir, dedupe .h files. Adapt examples and the lib code accordingly. --- examples/lisa-m/usb_dfu/dfu.h | 81 ---------------------------------------- examples/lisa-m/usb_dfu/usbdfu.c | 8 ++-- examples/lisa-m/usb_hid/hid.h | 38 ------------------- examples/lisa-m/usb_hid/usbhid.c | 12 +++--- 4 files changed, 8 insertions(+), 131 deletions(-) delete mode 100644 examples/lisa-m/usb_dfu/dfu.h delete mode 100644 examples/lisa-m/usb_hid/hid.h (limited to 'examples/lisa-m') 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 - * - * 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 . - */ - -#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 . */ +#include #include #include #include #include -#include - -#include - -#include "dfu.h" +#include +#include #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 - * - * 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 . - */ - -#ifndef __HID_H -#define __HID_H - -#include - -#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 . */ +#include #include #include #include -#include - -#include - -#include "hid.h" +#include +#include /* Define this to include the DFU APP interface. */ #define INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE -# include -# include "../usb_dfu/dfu.h" +#include +#include #endif const struct usb_device_descriptor dev = { -- cgit v1.2.3