Embedded/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-01-31 05:52:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed building errors with device example

Browse Source
This commit is contained in:
hathach 2012-12-04 11:30:34 +07:00
parent 921561be60
commit 8f00307986
9 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/device/keyboard/.cproject
View File

@ -422,6 +422,7 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
</cconfiguration>
<cconfiguration id="com.crt.advproject.config.exe.release.2127212492">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.exe.release.2127212492" moduleId="org.eclipse.cdt.core.settings" name="Release">
@ -825,6 +826,7 @@
</profile>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">

2
demos/device/keyboard/descriptors.c
View File

@ -173,7 +173,7 @@ ATTR_ALIGNED(4) const USB_FS_CONFIGURATION_DESCRIPTOR USB_FsConfigDescriptor =
// IAD points to CDC Interfaces
.CDC_IAD =
{
.bLength = sizeof(USB_INTERFACE_ASSOCIATION_DESCRIPTOR),
.bLength = sizeof(USB_Descriptor_InterfaceAssociation_t),
.bDescriptorType = USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE,
.bFirstInterface = 0,

2
demos/device/keyboard/descriptors.h
View File

@ -118,7 +118,7 @@ typedef struct
USB_CONFIGURATION_DESCRIPTOR Config;
#if IAD_DESC_REQUIRED
USB_INTERFACE_ASSOCIATION_DESCRIPTOR CDC_IAD;
USB_Descriptor_InterfaceAssociation_t CDC_IAD;
#endif
#ifdef CFG_CLASS_CDC

2
tinyusb/class/hid.c
View File

@ -37,7 +37,7 @@
#include "hid.h"
#ifdef CLASS_HID
#ifdef TUSB_CLASS_HID
#ifdef CFG_CLASS_HID_KEYBOARD
USB_HID_KeyboardReport_t hid_keyboard_report;

1
tinyusb/common/common.h
View File

@ -67,6 +67,7 @@
#include "compiler/compiler.h"
#include "errors.h"
#include "core/tusb_types.h"
#include "core/std_descriptors.h"
/// min value
#ifndef MIN

2
tinyusb/common/compiler/compiler.h
View File

@ -53,7 +53,7 @@
#if defined(__GNUC__)
#include "compiler_gcc.h"
#elif deinfed __ICCARM__ // IAR compiler
#elif defined __ICCARM__ // IAR compiler
#include "compiler_iar.h"
#endif

2
tinyusb/device/dcd.c
View File

@ -59,7 +59,7 @@ ErrorCode_t USB_Configure_Event (USBD_HANDLE_T hUsb)
USB_CORE_CTRL_T* pCtrl = (USB_CORE_CTRL_T*)hUsb;
if (pCtrl->config_value)
{
#if defined(CLASS_HID)
#if defined(TUSB_CLASS_HID)
ASSERT( tERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED );
#endif

8
tinyusb/host/hcd.h
View File

@ -68,10 +68,10 @@
TUSB_Error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
TUSB_Error_t hcd_pipe_open(
uint8_t hostid, uint8_t device_address,
)ATTR_WARN_UNUSED_RESULT;
//TUSB_Error_t hcd_pipe_open(
// uint8_t hostid, uint8_t device_address,
//
// )ATTR_WARN_UNUSED_RESULT;
TUSB_Error_t hcd_pipe_close()ATTR_WARN_UNUSED_RESULT;
TUSB_Error_t hcd_pipe_transfer()ATTR_WARN_UNUSED_RESULT;
TUSB_Error_t hcd_pipe_cancel()ATTR_WARN_UNUSED_RESULT;

2
tinyusb/tusb.h
View File

@ -58,7 +58,7 @@
#include "device/dcd.h"
#endif
#if CLASS_HID
#if TUSB_CLASS_HID
#include "class/hid.h"
#endif