From d76df5400379495d0eb6c6a8301a84042681ea12 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 11 Jan 2013 16:55:47 +0700 Subject: add external configure file: tusb_config.h rename the internal/default configure from tusb_cfg.h to tusb_option.h --- tinyusb/common/common.h | 2 +- tinyusb/common/errors.h | 2 +- tinyusb/device/romdriver/mw_usbd_core.h | 2 +- tinyusb/device/romdriver/mw_usbd_mscuser.h | 2 +- tinyusb/tusb_cfg.h | 115 ----------------------------- tinyusb/tusb_option.h | 102 +++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 119 deletions(-) delete mode 100644 tinyusb/tusb_cfg.h create mode 100644 tinyusb/tusb_option.h (limited to 'tinyusb') diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h index e63747d68..abd0743d0 100644 --- a/tinyusb/common/common.h +++ b/tinyusb/common/common.h @@ -62,7 +62,7 @@ #include #include "compiler/compiler.h" -#include "tusb_cfg.h" +#include "tusb_option.h" #include "errors.h" #include "mcu/mcu.h" diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h index 469034e72..ae3d4a7cb 100644 --- a/tinyusb/common/errors.h +++ b/tinyusb/common/errors.h @@ -49,7 +49,7 @@ #ifndef _TUSB_ERRORS_H_ #define _TUSB_ERRORS_H_ -#include "../tusb_cfg.h" +#include "../tusb_option.h" #ifdef __cplusplus extern "C" { diff --git a/tinyusb/device/romdriver/mw_usbd_core.h b/tinyusb/device/romdriver/mw_usbd_core.h index 068eecf23..fa1995bcb 100644 --- a/tinyusb/device/romdriver/mw_usbd_core.h +++ b/tinyusb/device/romdriver/mw_usbd_core.h @@ -26,7 +26,7 @@ #include "error.h" #include "mw_usbd.h" -#include "tusb_cfg.h" +#include "tusb_option.h" /** \file * \brief ROM API for USB device stack. diff --git a/tinyusb/device/romdriver/mw_usbd_mscuser.h b/tinyusb/device/romdriver/mw_usbd_mscuser.h index cce102525..62ca2ee9d 100644 --- a/tinyusb/device/romdriver/mw_usbd_mscuser.h +++ b/tinyusb/device/romdriver/mw_usbd_mscuser.h @@ -28,7 +28,7 @@ #include "mw_usbd.h" #include "mw_usbd_msc.h" #include "mw_usbd_core.h" -#include "tusb_cfg.h" +#include "tusb_option.h" /** \file * \brief Mass Storage Class (MSC) API structures and function prototypes. diff --git a/tinyusb/tusb_cfg.h b/tinyusb/tusb_cfg.h deleted file mode 100644 index c3841d3d8..000000000 --- a/tinyusb/tusb_cfg.h +++ /dev/null @@ -1,115 +0,0 @@ -/* - * tusb_cfg.h - * - * Created on: Nov 26, 2012 - * Author: hathach - */ - -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.net) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the tinyUSB stack. - */ - -/** \file - * \brief Configure File - * - * \note TBD - */ - -/** - * \defgroup Group_TinyUSB_Configure Configuration tusb_cfg.h - * @{ - */ - -#ifndef _TUSB_TUSB_CFG_H_ -#define _TUSB_TUSB_CFG_H_ - -#ifdef __cplusplus - extern "C" { -#endif - -/// define this symbol will make tinyusb look for external configure file -#ifdef TUSB_USE_CONFIG_FILE -#include "tusb_config.h" -#endif - -/// 0: no debug infor 3: most debug infor provided -#ifndef TUSB_CFG_DEBUG -#define TUSB_CFG_DEBUG 3 -#endif - -/// Enable Host Support -//#define TUSB_CFG_HOST - -/// Enable Device Support -#define TUSB_CFG_DEVICE - -/// Enable CDC Support -#define TUSB_CFG_DEVICE_CDC - -/// Enable HID Keyboard support -#define TUSB_CFG_DEVICE_HID_KEYBOARD - -/// Enable HID Mouse support -#define TUSB_CFG_DEVICE_HID_MOUSE - -#define DEVICE_CLASS_HID ( (defined TUSB_CFG_DEVICE_HID_KEYBOARD) || (defined TUSB_CFG_DEVICE_HID_MOUSE) ) -#define HOST_EHCI - - - -// TODO APP -#define USB_MAX_IF_NUM 8 -#define USB_MAX_EP_NUM 5 - -#define USB_FS_MAX_BULK_PACKET 64 -#define USB_HS_MAX_BULK_PACKET USB_FS_MAX_BULK_PACKET /* Full speed device only */ - -// Control Endpoint -#define USB_MAX_PACKET0 64 - -/* HID In/Out Endpoint Address */ -#define HID_KEYBOARD_EP_IN USB_ENDPOINT_IN(1) -//#define HID_KEYBOARD_EP_OUT USB_ENDPOINT_OUT(1) -#define HID_MOUSE_EP_IN USB_ENDPOINT_IN(4) - -/* CDC Endpoint Address */ -#define CDC_NOTIFICATION_EP USB_ENDPOINT_IN(2) -#define CDC_DATA_EP_OUT USB_ENDPOINT_OUT(3) -#define CDC_DATA_EP_IN USB_ENDPOINT_IN(3) - -#define CDC_NOTIFICATION_EP_MAXPACKETSIZE 8 -#define CDC_DATA_EP_MAXPACKET_SIZE 16 - -#ifdef __cplusplus - } -#endif - -#endif /* _TUSB_TUSB_CFG_H_ */ - -/** @} */ diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h new file mode 100644 index 000000000..d29574da4 --- /dev/null +++ b/tinyusb/tusb_option.h @@ -0,0 +1,102 @@ +/* + * tusb_option.h + * + * Created on: Nov 26, 2012 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the tinyUSB stack. + */ + +/** \file + * \brief Configure File + * + * \note TBD + */ + +/** + * \defgroup Group_TinyUSB_Configure Configuration tusb_option.h + * @{ + */ + +#ifndef _TUSB_TUSB_OPTION_H_ +#define _TUSB_TUSB_OPTION_H_ + +#ifdef __cplusplus + extern "C" { +#endif + +/// define this symbol will make tinyusb look for external configure file +#include "tusb_config.h" + +/// 0: no debug infor 3: most debug infor provided +#ifndef TUSB_CFG_DEBUG +#define TUSB_CFG_DEBUG 3 +#endif + +/// Enable Host Support +//#define TUSB_CFG_HOST + +/// Enable Device Support +//#define TUSB_CFG_DEVICE + +#define DEVICE_CLASS_HID ( (defined TUSB_CFG_DEVICE_HID_KEYBOARD) || (defined TUSB_CFG_DEVICE_HID_MOUSE) ) +#define HOST_EHCI + +// TODO APP +#define USB_MAX_IF_NUM 8 +#define USB_MAX_EP_NUM 5 + +#define USB_FS_MAX_BULK_PACKET 64 +#define USB_HS_MAX_BULK_PACKET USB_FS_MAX_BULK_PACKET /* Full speed device only */ + +// Control Endpoint +#define USB_MAX_PACKET0 64 + +/* HID In/Out Endpoint Address */ +#define HID_KEYBOARD_EP_IN USB_ENDPOINT_IN(1) +//#define HID_KEYBOARD_EP_OUT USB_ENDPOINT_OUT(1) +#define HID_MOUSE_EP_IN USB_ENDPOINT_IN(4) + +/* CDC Endpoint Address */ +#define CDC_NOTIFICATION_EP USB_ENDPOINT_IN(2) +#define CDC_DATA_EP_OUT USB_ENDPOINT_OUT(3) +#define CDC_DATA_EP_IN USB_ENDPOINT_IN(3) + +#define CDC_NOTIFICATION_EP_MAXPACKETSIZE 8 +#define CDC_DATA_EP_MAXPACKET_SIZE 16 + +#ifdef __cplusplus + } +#endif + +#endif /* _TUSB_TUSB_OPTION_H_ */ + +/** @} */ -- cgit v1.3.1