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

add external configure file: tusb_config.h 

rename the internal/default configure from tusb_cfg.h to tusb_option.h
This commit is contained in:
hathach 2013-01-11 16:55:47 +07:00
parent a6e5197b58
commit d76df54003
8 changed files with 89 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -27,7 +27,7 @@
<inputType id="com.crt.advproject.compiler.input.2103556147" superClass="com.crt.advproject.compiler.input"/>
</tool>
<tool id="com.crt.advproject.gas.exe.debug.11272906" name="MCU Assembler" superClass="com.crt.advproject.gas.exe.debug">
<option id="gnu.both.asm.option.include.paths.2001474673" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<option id="gnu.both.asm.option.include.paths.2001474673" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;C:\nxp\LPCXpresso_4.3.0_1023\lpcxpresso\Tools\lib\gcc\arm-none-eabi\4.5.1\include&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\nxp\LPCXpresso_4.3.0_1023\lpcxpresso\Tools\lib\gcc\arm-none-eabi\4.5.1\include-fixed&quot;"/>
<listOptionValue builtIn="false" value="&quot;C:\nxp\LPCXpresso_4.3.0_1023\lpcxpresso\Tools\arm-none-eabi\include&quot;"/>

2
demos/device/keyboard/.cproject
View File

@ -665,7 +665,7 @@
</extensions>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="axf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="lpc11uxx from microbuilder" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser" id="com.crt.advproject.config.exe.debug.856400198.534940316" name="Board at86rf2xx" parent="com.crt.advproject.config.exe.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size &quot;${BuildArtifactFileName}&quot;; arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileName}&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; ; checksum -p ${TargetChip} -d &quot;${BuildArtifactFileBaseName}.bin&quot;; " preannouncebuildStep="" prebuildStep="">
<configuration artifactExtension="axf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="lpc11uxx from microbuilder" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser" id="com.crt.advproject.config.exe.debug.856400198.534940316" name="Board at86rf2xx" parent="com.crt.advproject.config.exe.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size &quot;${BuildArtifactFileName}&quot;; #arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileName}&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; ; checksum -p ${TargetChip} -d &quot;${BuildArtifactFileBaseName}.bin&quot;; " preannouncebuildStep="" prebuildStep="">
<folderInfo id="com.crt.advproject.config.exe.debug.856400198.534940316." name="/" resourcePath="">
<toolChain errorParsers="" id="com.crt.advproject.toolchain.exe.debug.1347871780" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug">
<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug.1543738985" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/>

77
demos/device/keyboard/tusb_config.h Normal file
View File

@ -0,0 +1,77 @@
/*
* tusb_config.h
*
* Created on: Jan 11, 2013
* 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 tiny usb stack.
*/
/** \file
* \brief TBD
*
* \note TBD
*/
/** \ingroup TBD
* \defgroup TBD
* \brief TBD
*
* @{
*/
#ifndef _TUSB_TUSB_CONFIG_H_
#define _TUSB_TUSB_CONFIG_H_
#ifdef __cplusplus
extern "C" {
#endif
/// 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
#ifdef __cplusplus
}
#endif
#endif /* _TUSB_TUSB_CONFIG_H_ */
/** @} */

2
tinyusb/common/common.h
View File

@ -62,7 +62,7 @@
#include <stdio.h>
#include "compiler/compiler.h"
#include "tusb_cfg.h"
#include "tusb_option.h"
#include "errors.h"
#include "mcu/mcu.h"

2
tinyusb/common/errors.h
View File

@ -49,7 +49,7 @@
#ifndef _TUSB_ERRORS_H_
#define _TUSB_ERRORS_H_
#include "../tusb_cfg.h"
#include "../tusb_option.h"
#ifdef __cplusplus
extern "C" {

2
tinyusb/device/romdriver/mw_usbd_core.h
View File

@ -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.

2
tinyusb/device/romdriver/mw_usbd_mscuser.h
View File

@ -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.

25
tinyusb/tusb_cfg.h → tinyusb/tusb_option.h
View File

@ -1,5 +1,5 @@
/*
* tusb_cfg.h
* tusb_option.h
*
* Created on: Nov 26, 2012
* Author: hathach
@ -42,21 +42,19 @@
*/
/**
* \defgroup Group_TinyUSB_Configure Configuration tusb_cfg.h
* \defgroup Group_TinyUSB_Configure Configuration tusb_option.h
* @{
*/
#ifndef _TUSB_TUSB_CFG_H_
#define _TUSB_TUSB_CFG_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
#ifdef TUSB_USE_CONFIG_FILE
#include "tusb_config.h"
#endif
/// 0: no debug infor 3: most debug infor provided
#ifndef TUSB_CFG_DEBUG
@ -67,22 +65,11 @@
//#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 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
@ -110,6 +97,6 @@
}
#endif
#endif /* _TUSB_TUSB_CFG_H_ */
#endif /* _TUSB_TUSB_OPTION_H_ */
/** @} */