kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation error

This commit is contained in:
hathach 2013-07-01 10:43:55 +07:00
parent a4f7dc1105
commit e94ce81b04
4 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/host/src/tusb_config.h
View File

@ -78,7 +78,7 @@
#define TUSB_CFG_HOST_HID_GENERIC 0 #define TUSB_CFG_HOST_HID_GENERIC 0
#define TUSB_CFG_HOST_MSC 0 #define TUSB_CFG_HOST_MSC 0
#define TUSB_CFG_HOST_CDC 1 #define TUSB_CFG_HOST_CDC 1
#define TUSB_CFG_HOST_CDC_RNDIS 1 #define TUSB_CFG_HOST_CDC_RNDIS 0
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// DEVICE CONFIGURATION // DEVICE CONFIGURATION

2
tinyusb/class/cdc_host.c
View File

@ -55,7 +55,7 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION // INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
STATIC_ cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX]; /*STATIC_*/ cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX];
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// USBH-CLASS DRIVER API // USBH-CLASS DRIVER API

2
tinyusb/class/cdc_host_rndis.c
View File

@ -88,3 +88,5 @@ static tusb_error_t rndis_body_subtask(void)
OSAL_SUBTASK_END OSAL_SUBTASK_END
} }
#endif

73
tinyusb/tusb_option.h
View File

@ -1,39 +1,40 @@
/* /**************************************************************************/
* tusb_option.h /*!
* @file tusb_option.h
* Created on: Nov 26, 2012 @author hathach (tinyusb.org)
* Author: hathach
*/
/* @section LICENSE
* Software License Agreement (BSD License)
* Copyright (c) 2013, hathach (tinyusb.org) Software License Agreement (BSD License)
* All rights reserved.
* Copyright (c) 2013, hathach (tinyusb.org)
* Redistribution and use in source and binary forms, with or without modification, All rights reserved.
* are permitted provided that the following conditions are met:
* Redistribution and use in source and binary forms, with or without
* 1. Redistributions of source code must retain the above copyright notice, modification, are permitted provided that the following conditions are met:
* this list of conditions and the following disclaimer. 1. Redistributions of source code must retain the above copyright
* 2. Redistributions in binary form must reproduce the above copyright notice, notice, this list of conditions and the following disclaimer.
* this list of conditions and the following disclaimer in the documentation 2. Redistributions in binary form must reproduce the above copyright
* and/or other materials provided with the distribution. notice, this list of conditions and the following disclaimer in the
* 3. The name of the author may not be used to endorse or promote products documentation and/or other materials provided with the distribution.
* derived from this software without specific prior written permission. 3. Neither the name of the copyright holders nor the
* names of its contributors may be used to endorse or promote products
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED derived from this software without specific prior written permission.
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
* SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND
* OF SUCH DAMAGE. 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
* This file is part of the tinyUSB stack. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
This file is part of the tinyusb stack.
*/
/**************************************************************************/
/** \file /** \file
* \brief Configure File * \brief Configure File
@ -160,7 +161,7 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// DEVICE OPTIONS // DEVICE OPTIONS
//------------------------- -------------------------------------------+ //--------------------------------------------------------------------+
#if MODE_DEVICE_SUPPORTED #if MODE_DEVICE_SUPPORTED
#if defined(CAP_DEVICE_ROMDRIVER) && !TUSB_CFG_DEVICE_USE_ROM_DRIVER #if defined(CAP_DEVICE_ROMDRIVER) && !TUSB_CFG_DEVICE_USE_ROM_DRIVER