mirror of
https://github.com/hathach/tinyusb.git
synced 2025-01-31 05:52:55 +08:00
fixed building errors with device example
This commit is contained in:
parent
921561be60
commit
8f00307986
@ -422,6 +422,7 @@
|
|||||||
</profile>
|
</profile>
|
||||||
</scannerConfigBuildInfo>
|
</scannerConfigBuildInfo>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
|
||||||
</cconfiguration>
|
</cconfiguration>
|
||||||
<cconfiguration id="com.crt.advproject.config.exe.release.2127212492">
|
<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">
|
<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>
|
</profile>
|
||||||
</scannerConfigBuildInfo>
|
</scannerConfigBuildInfo>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
|
||||||
</cconfiguration>
|
</cconfiguration>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
@ -173,7 +173,7 @@ ATTR_ALIGNED(4) const USB_FS_CONFIGURATION_DESCRIPTOR USB_FsConfigDescriptor =
|
|||||||
// IAD points to CDC Interfaces
|
// IAD points to CDC Interfaces
|
||||||
.CDC_IAD =
|
.CDC_IAD =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(USB_INTERFACE_ASSOCIATION_DESCRIPTOR),
|
.bLength = sizeof(USB_Descriptor_InterfaceAssociation_t),
|
||||||
.bDescriptorType = USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE,
|
.bDescriptorType = USB_INTERFACE_ASSOCIATION_DESCRIPTOR_TYPE,
|
||||||
|
|
||||||
.bFirstInterface = 0,
|
.bFirstInterface = 0,
|
||||||
|
@ -118,7 +118,7 @@ typedef struct
|
|||||||
USB_CONFIGURATION_DESCRIPTOR Config;
|
USB_CONFIGURATION_DESCRIPTOR Config;
|
||||||
|
|
||||||
#if IAD_DESC_REQUIRED
|
#if IAD_DESC_REQUIRED
|
||||||
USB_INTERFACE_ASSOCIATION_DESCRIPTOR CDC_IAD;
|
USB_Descriptor_InterfaceAssociation_t CDC_IAD;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CFG_CLASS_CDC
|
#ifdef CFG_CLASS_CDC
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
|
|
||||||
#include "hid.h"
|
#include "hid.h"
|
||||||
|
|
||||||
#ifdef CLASS_HID
|
#ifdef TUSB_CLASS_HID
|
||||||
|
|
||||||
#ifdef CFG_CLASS_HID_KEYBOARD
|
#ifdef CFG_CLASS_HID_KEYBOARD
|
||||||
USB_HID_KeyboardReport_t hid_keyboard_report;
|
USB_HID_KeyboardReport_t hid_keyboard_report;
|
||||||
|
@ -67,6 +67,7 @@
|
|||||||
#include "compiler/compiler.h"
|
#include "compiler/compiler.h"
|
||||||
#include "errors.h"
|
#include "errors.h"
|
||||||
#include "core/tusb_types.h"
|
#include "core/tusb_types.h"
|
||||||
|
#include "core/std_descriptors.h"
|
||||||
|
|
||||||
/// min value
|
/// min value
|
||||||
#ifndef MIN
|
#ifndef MIN
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
|
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
#include "compiler_gcc.h"
|
#include "compiler_gcc.h"
|
||||||
#elif deinfed __ICCARM__ // IAR compiler
|
#elif defined __ICCARM__ // IAR compiler
|
||||||
#include "compiler_iar.h"
|
#include "compiler_iar.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ ErrorCode_t USB_Configure_Event (USBD_HANDLE_T hUsb)
|
|||||||
USB_CORE_CTRL_T* pCtrl = (USB_CORE_CTRL_T*)hUsb;
|
USB_CORE_CTRL_T* pCtrl = (USB_CORE_CTRL_T*)hUsb;
|
||||||
if (pCtrl->config_value)
|
if (pCtrl->config_value)
|
||||||
{
|
{
|
||||||
#if defined(CLASS_HID)
|
#if defined(TUSB_CLASS_HID)
|
||||||
ASSERT( tERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED );
|
ASSERT( tERROR_NONE == tusb_hid_configured(hUsb), ERR_FAILED );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -68,10 +68,10 @@
|
|||||||
|
|
||||||
TUSB_Error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
|
TUSB_Error_t hcd_init(uint8_t hostid) ATTR_WARN_UNUSED_RESULT;
|
||||||
|
|
||||||
TUSB_Error_t hcd_pipe_open(
|
//TUSB_Error_t hcd_pipe_open(
|
||||||
uint8_t hostid, uint8_t device_address,
|
// uint8_t hostid, uint8_t device_address,
|
||||||
|
//
|
||||||
)ATTR_WARN_UNUSED_RESULT;
|
// )ATTR_WARN_UNUSED_RESULT;
|
||||||
TUSB_Error_t hcd_pipe_close()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_transfer()ATTR_WARN_UNUSED_RESULT;
|
||||||
TUSB_Error_t hcd_pipe_cancel()ATTR_WARN_UNUSED_RESULT;
|
TUSB_Error_t hcd_pipe_cancel()ATTR_WARN_UNUSED_RESULT;
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
#include "device/dcd.h"
|
#include "device/dcd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CLASS_HID
|
#if TUSB_CLASS_HID
|
||||||
#include "class/hid.h"
|
#include "class/hid.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user