summaryrefslogtreecommitdiff
path: root/components/drivers/usb
diff options
context:
space:
mode:
authorguo <[email protected]>2021-09-28 10:36:54 +0800
committerGitHub <[email protected]>2021-09-28 10:36:54 +0800
commit55a302cd092758a44b589d65470a69d9e8ae4ced (patch)
treee60fc53994c426007e9eb4877e5bd123f124ef39 /components/drivers/usb
parent00727d6b6db92dc1cf98f028f26fd6168594b905 (diff)
parent00d42ef73cff61ecda7ff006b077a73e1a4ff669 (diff)
Merge branch 'master' into usbh_construct
Diffstat (limited to 'components/drivers/usb')
-rw-r--r--components/drivers/usb/usbdevice/class/audio.h676
-rw-r--r--components/drivers/usb/usbdevice/class/audio_mic.c75
-rw-r--r--components/drivers/usb/usbdevice/class/audio_speaker.c69
-rw-r--r--components/drivers/usb/usbdevice/class/cdc.h16
-rw-r--r--components/drivers/usb/usbdevice/class/cdc_vcom.c84
-rw-r--r--components/drivers/usb/usbdevice/class/ecm.c36
-rw-r--r--components/drivers/usb/usbdevice/class/hid.c35
-rw-r--r--components/drivers/usb/usbdevice/class/hid.h2
-rw-r--r--components/drivers/usb/usbdevice/class/mstorage.c258
-rw-r--r--components/drivers/usb/usbdevice/class/mstorage.h6
-rw-r--r--components/drivers/usb/usbdevice/class/ndis.h84
-rw-r--r--components/drivers/usb/usbdevice/class/rndis.c31
-rw-r--r--components/drivers/usb/usbdevice/class/rndis.h196
-rw-r--r--components/drivers/usb/usbdevice/class/uaudioreg.h418
-rw-r--r--components/drivers/usb/usbdevice/class/winusb.c26
-rw-r--r--components/drivers/usb/usbdevice/class/winusb.h2
-rw-r--r--components/drivers/usb/usbdevice/core/usbdevice.c6
-rw-r--r--components/drivers/usb/usbdevice/core/usbdevice_core.c182
-rw-r--r--components/drivers/usb/usbhost/class/adk.c2
-rw-r--r--components/drivers/usb/usbhost/class/adk.h4
-rw-r--r--components/drivers/usb/usbhost/class/hid.c233
-rw-r--r--components/drivers/usb/usbhost/class/hid.h16
-rw-r--r--components/drivers/usb/usbhost/class/mass.c178
-rw-r--r--components/drivers/usb/usbhost/class/mass.h10
-rw-r--r--components/drivers/usb/usbhost/class/udisk.c2
-rw-r--r--components/drivers/usb/usbhost/class/ukbd.c20
-rw-r--r--components/drivers/usb/usbhost/class/umouse.c27
-rw-r--r--components/drivers/usb/usbhost/core/driver.c22
-rw-r--r--components/drivers/usb/usbhost/core/hub.c187
-rw-r--r--components/drivers/usb/usbhost/core/usbhost.c6
-rw-r--r--components/drivers/usb/usbhost/core/usbhost_core.c126
31 files changed, 1450 insertions, 1585 deletions
diff --git a/components/drivers/usb/usbdevice/class/audio.h b/components/drivers/usb/usbdevice/class/audio.h
deleted file mode 100644
index 4bb8994b47..0000000000
--- a/components/drivers/usb/usbdevice/class/audio.h
+++ /dev/null
@@ -1,676 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * <linux/usb/audio.h> -- USB Audio definitions.
- *
- * Copyright (C) 2006 Thumtronics Pty Ltd.
- * Developed for Thumtronics by Grey Innovation
- * Ben Williamson <[email protected]>
- *
- * This software is distributed under the terms of the GNU General Public
- * License ("GPL") version 2, as published by the Free Software Foundation.
- *
- * This file holds USB constants and structures defined
- * by the USB Device Class Definition for Audio Devices.
- * Comments below reference relevant sections of that document:
- *
- * http://www.usb.org/developers/devclass_docs/audio10.pdf
- *
- * Types and defines in this file are either specific to version 1.0 of
- * this standard or common for newer versions.
- */
-
-#ifndef _UAPI__LINUX_USB_AUDIO_H
-#define _UAPI__LINUX_USB_AUDIO_H
-
-//#include <linux/types.h>
-#include <rtthread.h>
-
-typedef int8_t __s8;
-typedef uint8_t __u8;
-typedef int16_t __s16;
-typedef uint16_t __u16;
-typedef int32_t __s32;
-typedef uint32_t __u32;
-typedef int64_t __s64;
-typedef uint64_t __u64;
-
-#define UAC_USE_FEATURE_UNIT 0 /* Feature unit does not support */
-
-/*
- * Below are truly Linux-specific types that should never collide with
- * any application/library that wants linux/types.h.
- */
-
-#ifdef __CHECKER__
-#define __bitwise__ __attribute__((bitwise))
-#else
-#define __bitwise__
-#endif
-#ifdef __CHECK_ENDIAN__
-#define __bitwise __bitwise__
-#else
-#define __bitwise
-#endif
-
-typedef __u16 __bitwise __le16;
-typedef __u16 __bitwise __be16;
-typedef __u32 __bitwise __le32;
-typedef __u32 __bitwise __be32;
-typedef __u64 __bitwise __le64;
-typedef __u64 __bitwise __be64;
-
-typedef __u16 __bitwise __sum16;
-typedef __u32 __bitwise __wsum;
-
-/* bInterfaceProtocol values to denote the version of the standard used */
-#define UAC_VERSION_1 0x00
-#define UAC_VERSION_2 0x20
-#define UAC_VERSION_3 0x30
-
-/* A.2 Audio Interface Subclass Codes */
-#define USB_SUBCLASS_AUDIOCONTROL 0x01
-#define USB_SUBCLASS_AUDIOSTREAMING 0x02
-#define USB_SUBCLASS_MIDISTREAMING 0x03
-
-/* A.5 Audio Class-Specific AC Interface Descriptor Subtypes */
-#define UAC_HEADER 0x01
-#define UAC_INPUT_TERMINAL 0x02
-#define UAC_OUTPUT_TERMINAL 0x03
-#define UAC_MIXER_UNIT 0x04
-#define UAC_SELECTOR_UNIT 0x05
-#define UAC_FEATURE_UNIT 0x06
-#define UAC1_PROCESSING_UNIT 0x07
-#define UAC1_EXTENSION_UNIT 0x08
-
-/* A.6 Audio Class-Specific AS Interface Descriptor Subtypes */
-#define UAC_AS_GENERAL 0x01
-#define UAC_FORMAT_TYPE 0x02
-#define UAC_FORMAT_SPECIFIC 0x03
-
-/* A.7 Processing Unit Process Types */
-#define UAC_PROCESS_UNDEFINED 0x00
-#define UAC_PROCESS_UP_DOWNMIX 0x01
-#define UAC_PROCESS_DOLBY_PROLOGIC 0x02
-#define UAC_PROCESS_STEREO_EXTENDER 0x03
-#define UAC_PROCESS_REVERB 0x04
-#define UAC_PROCESS_CHORUS 0x05
-#define UAC_PROCESS_DYN_RANGE_COMP 0x06
-
-/* A.8 Audio Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_EP_GENERAL 0x01
-
-/* A.9 Audio Class-Specific Request Codes */
-#define UAC_SET_ 0x00
-#define UAC_GET_ 0x80
-
-#define UAC__CUR 0x1
-#define UAC__MIN 0x2
-#define UAC__MAX 0x3
-#define UAC__RES 0x4
-#define UAC__MEM 0x5
-
-#define UAC_SET_CUR (UAC_SET_ | UAC__CUR)
-#define UAC_GET_CUR (UAC_GET_ | UAC__CUR)
-#define UAC_SET_MIN (UAC_SET_ | UAC__MIN)
-#define UAC_GET_MIN (UAC_GET_ | UAC__MIN)
-#define UAC_SET_MAX (UAC_SET_ | UAC__MAX)
-#define UAC_GET_MAX (UAC_GET_ | UAC__MAX)
-#define UAC_SET_RES (UAC_SET_ | UAC__RES)
-#define UAC_GET_RES (UAC_GET_ | UAC__RES)
-#define UAC_SET_MEM (UAC_SET_ | UAC__MEM)
-#define UAC_GET_MEM (UAC_GET_ | UAC__MEM)
-
-#define UAC_GET_STAT 0xff
-
-/* A.10 Control Selector Codes */
-
-/* A.10.1 Terminal Control Selectors */
-#define UAC_TERM_COPY_PROTECT 0x01
-
-/* A.10.2 Feature Unit Control Selectors */
-#define UAC_FU_MUTE 0x01
-#define UAC_FU_VOLUME 0x02
-#define UAC_FU_BASS 0x03
-#define UAC_FU_MID 0x04
-#define UAC_FU_TREBLE 0x05
-#define UAC_FU_GRAPHIC_EQUALIZER 0x06
-#define UAC_FU_AUTOMATIC_GAIN 0x07
-#define UAC_FU_DELAY 0x08
-#define UAC_FU_BASS_BOOST 0x09
-#define UAC_FU_LOUDNESS 0x0a
-
-#define UAC_CONTROL_BIT(CS) (1 << ((CS) - 1))
-
-/* A.10.3.1 Up/Down-mix Processing Unit Controls Selectors */
-#define UAC_UD_ENABLE 0x01
-#define UAC_UD_MODE_SELECT 0x02
-
-/* A.10.3.2 Dolby Prologic (tm) Processing Unit Controls Selectors */
-#define UAC_DP_ENABLE 0x01
-#define UAC_DP_MODE_SELECT 0x02
-
-/* A.10.3.3 3D Stereo Extender Processing Unit Control Selectors */
-#define UAC_3D_ENABLE 0x01
-#define UAC_3D_SPACE 0x02
-
-/* A.10.3.4 Reverberation Processing Unit Control Selectors */
-#define UAC_REVERB_ENABLE 0x01
-#define UAC_REVERB_LEVEL 0x02
-#define UAC_REVERB_TIME 0x03
-#define UAC_REVERB_FEEDBACK 0x04
-
-/* A.10.3.5 Chorus Processing Unit Control Selectors */
-#define UAC_CHORUS_ENABLE 0x01
-#define UAC_CHORUS_LEVEL 0x02
-#define UAC_CHORUS_RATE 0x03
-#define UAC_CHORUS_DEPTH 0x04
-
-/* A.10.3.6 Dynamic Range Compressor Unit Control Selectors */
-#define UAC_DCR_ENABLE 0x01
-#define UAC_DCR_RATE 0x02
-#define UAC_DCR_MAXAMPL 0x03
-#define UAC_DCR_THRESHOLD 0x04
-#define UAC_DCR_ATTACK_TIME 0x05
-#define UAC_DCR_RELEASE_TIME 0x06
-
-/* A.10.4 Extension Unit Control Selectors */
-#define UAC_XU_ENABLE 0x01
-
-/* MIDI - A.1 MS Class-Specific Interface Descriptor Subtypes */
-#define UAC_MS_HEADER 0x01
-#define UAC_MIDI_IN_JACK 0x02
-#define UAC_MIDI_OUT_JACK 0x03
-
-/* MIDI - A.1 MS Class-Specific Endpoint Descriptor Subtypes */
-#define UAC_MS_GENERAL 0x01
-
-/* Terminals - 2.1 USB Terminal Types */
-#define UAC_TERMINAL_UNDEFINED 0x100
-#define UAC_TERMINAL_STREAMING 0x101
-#define UAC_TERMINAL_VENDOR_SPEC 0x1FF
-
-/* Terminal Control Selectors */
-/* 4.3.2 Class-Specific AC Interface Descriptor */
-struct uac1_ac_header_descriptor {
- __u8 bLength; /* 8 + n */
- __u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
- __u8 bDescriptorSubtype; /* UAC_MS_HEADER */
- __le16 bcdADC; /* 0x0100 */
- __le16 wTotalLength; /* includes Unit and Terminal desc. */
- __u8 bInCollection; /* n */
- __u8 baInterfaceNr[]; /* [n] */
-} __attribute__ ((packed));
-
-#define UAC_DT_AC_HEADER_SIZE(n) (8 + (n))
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_AC_HEADER_DESCRIPTOR(n) \
-struct uac1_ac_header_descriptor_##n { \
- __u8 bLength; \
- __u8 bDescriptorType; \
- __u8 bDescriptorSubtype; \
- __le16 bcdADC; \
- __le16 wTotalLength; \
- __u8 bInCollection; \
- __u8 baInterfaceNr[n]; \
-} __attribute__ ((packed))
-
-/* 4.3.2.1 Input Terminal Descriptor */
-struct uac_input_terminal_descriptor {
- __u8 bLength; /* in bytes: 12 */
- __u8 bDescriptorType; /* CS_INTERFACE descriptor type */
- __u8 bDescriptorSubtype; /* INPUT_TERMINAL descriptor subtype */
- __u8 bTerminalID; /* Constant uniquely terminal ID */
- __le16 wTerminalType; /* USB Audio Terminal Types */
- __u8 bAssocTerminal; /* ID of the Output Terminal associated */
- __u8 bNrChannels; /* Number of logical output channels */
- __le16 wChannelConfig;
- __u8 iChannelNames;
- __u8 iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_INPUT_TERMINAL_SIZE 12
-
-/* Terminals - 2.2 Input Terminal Types */
-#define UAC_INPUT_TERMINAL_UNDEFINED 0x200
-#define UAC_INPUT_TERMINAL_MICROPHONE 0x201
-#define UAC_INPUT_TERMINAL_DESKTOP_MICROPHONE 0x202
-#define UAC_INPUT_TERMINAL_PERSONAL_MICROPHONE 0x203
-#define UAC_INPUT_TERMINAL_OMNI_DIR_MICROPHONE 0x204
-#define UAC_INPUT_TERMINAL_MICROPHONE_ARRAY 0x205
-#define UAC_INPUT_TERMINAL_PROC_MICROPHONE_ARRAY 0x206
-
-/* Terminals - control selectors */
-
-#define UAC_TERMINAL_CS_COPY_PROTECT_CONTROL 0x01
-
-/* 4.3.2.2 Output Terminal Descriptor */
-struct uac1_output_terminal_descriptor {
- __u8 bLength; /* in bytes: 9 */
- __u8 bDescriptorType; /* CS_INTERFACE descriptor type */
- __u8 bDescriptorSubtype; /* OUTPUT_TERMINAL descriptor subtype */
- __u8 bTerminalID; /* Constant uniquely terminal ID */
- __le16 wTerminalType; /* USB Audio Terminal Types */
- __u8 bAssocTerminal; /* ID of the Input Terminal associated */
- __u8 bSourceID; /* ID of the connected Unit or Terminal*/
- __u8 iTerminal;
-} __attribute__ ((packed));
-
-#define UAC_DT_OUTPUT_TERMINAL_SIZE 9
-
-/* Terminals - 2.3 Output Terminal Types */
-#define UAC_OUTPUT_TERMINAL_UNDEFINED 0x300
-#define UAC_OUTPUT_TERMINAL_SPEAKER 0x301
-#define UAC_OUTPUT_TERMINAL_HEADPHONES 0x302
-#define UAC_OUTPUT_TERMINAL_HEAD_MOUNTED_DISPLAY_AUDIO 0x303
-#define UAC_OUTPUT_TERMINAL_DESKTOP_SPEAKER 0x304
-#define UAC_OUTPUT_TERMINAL_ROOM_SPEAKER 0x305
-#define UAC_OUTPUT_TERMINAL_COMMUNICATION_SPEAKER 0x306
-#define UAC_OUTPUT_TERMINAL_LOW_FREQ_EFFECTS_SPEAKER 0x307
-
-/* Terminals - 2.4 Bi-directional Terminal Types */
-#define UAC_BIDIR_TERMINAL_UNDEFINED 0x400
-#define UAC_BIDIR_TERMINAL_HANDSET 0x401
-#define UAC_BIDIR_TERMINAL_HEADSET 0x402
-#define UAC_BIDIR_TERMINAL_SPEAKER_PHONE 0x403
-#define UAC_BIDIR_TERMINAL_ECHO_SUPPRESSING 0x404
-#define UAC_BIDIR_TERMINAL_ECHO_CANCELING 0x405
-
-/* Set bControlSize = 2 as default setting */
-#define UAC_DT_FEATURE_UNIT_SIZE(ch) (7 + ((ch) + 1) * 2)
-
-/* As above, but more useful for defining your own descriptors: */
-#define DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(ch) \
-struct uac_feature_unit_descriptor_##ch { \
- __u8 bLength; \
- __u8 bDescriptorType; \
- __u8 bDescriptorSubtype; \
- __u8 bUnitID; \
- __u8 bSourceID; \
- __u8 bControlSize; \
- __le16 bmaControls[ch + 1]; \
- __u8 iFeature; \
-} __attribute__ ((packed))
-
-/* 4.3.2.3 Mixer Unit Descriptor */
-struct uac_mixer_unit_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bUnitID;
- __u8 bNrInPins;
- __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
-{
- return desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,
- int protocol)
-{
- if (protocol == UAC_VERSION_1)
- return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
- desc->baSourceID[desc->bNrInPins + 1];
- else
- return (desc->baSourceID[desc->bNrInPins + 4] << 24) |
- (desc->baSourceID[desc->bNrInPins + 3] << 16) |
- (desc->baSourceID[desc->bNrInPins + 2] << 8) |
- (desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static inline __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,
- int protocol)
-{
- return (protocol == UAC_VERSION_1) ?
- desc->baSourceID[desc->bNrInPins + 3] :
- desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static inline __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc,
- int protocol)
-{
- switch (protocol) {
- case UAC_VERSION_1:
- return &desc->baSourceID[desc->bNrInPins + 4];
- case UAC_VERSION_2:
- return &desc->baSourceID[desc->bNrInPins + 6];
- case UAC_VERSION_3:
- return &desc->baSourceID[desc->bNrInPins + 2];
- default:
- return NULL;
- }
-}
-
-static inline __u16 uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
-{
- return (desc->baSourceID[desc->bNrInPins + 1] << 8) |
- desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
-{
- __u8 *raw = (__u8 *) desc;
- return raw[desc->bLength - 1];
-}
-
-/* 4.3.2.4 Selector Unit Descriptor */
-struct uac_selector_unit_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bUintID;
- __u8 bNrInPins;
- __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
-{
- __u8 *raw = (__u8 *) desc;
- return raw[desc->bLength - 1];
-}
-#if UAC_USE_FEATURE_UNIT
-/* 4.3.2.5 Feature Unit Descriptor */
-struct uac_feature_unit_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bUnitID;
- __u8 bSourceID;
- __u8 bControlSize;
- __u8 bmaControls[0]; /* variable length */
-} __attribute__((packed));
-
-static inline __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
-{
- __u8 *raw = (__u8 *) desc;
- return raw[desc->bLength - 1];
-}
-#endif
-/* 4.3.2.6 Processing Unit Descriptors */
-struct uac_processing_unit_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bUnitID;
- __le16 wProcessType;
- __u8 bNrInPins;
- __u8 baSourceID[];
-} __attribute__ ((packed));
-
-static inline __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
-{
- return desc->baSourceID[desc->bNrInPins];
-}
-
-static inline __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- if (protocol == UAC_VERSION_1)
- return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
- desc->baSourceID[desc->bNrInPins + 1];
- else
- return (desc->baSourceID[desc->bNrInPins + 4] << 24) |
- (desc->baSourceID[desc->bNrInPins + 3] << 16) |
- (desc->baSourceID[desc->bNrInPins + 2] << 8) |
- (desc->baSourceID[desc->bNrInPins + 1]);
-}
-
-static inline __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- return (protocol == UAC_VERSION_1) ?
- desc->baSourceID[desc->bNrInPins + 3] :
- desc->baSourceID[desc->bNrInPins + 5];
-}
-
-static inline __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- switch (protocol) {
- case UAC_VERSION_1:
- return desc->baSourceID[desc->bNrInPins + 4];
- case UAC_VERSION_2:
- return 2; /* in UAC2, this value is constant */
- case UAC_VERSION_3:
- return 4; /* in UAC3, this value is constant */
- default:
- return 1;
- }
-}
-
-static inline __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- switch (protocol) {
- case UAC_VERSION_1:
- return &desc->baSourceID[desc->bNrInPins + 5];
- case UAC_VERSION_2:
- return &desc->baSourceID[desc->bNrInPins + 6];
- case UAC_VERSION_3:
- return &desc->baSourceID[desc->bNrInPins + 2];
- default:
- return NULL;
- }
-}
-
-static inline __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-
- switch (protocol) {
- case UAC_VERSION_1:
- case UAC_VERSION_2:
- default:
- return *(uac_processing_unit_bmControls(desc, protocol)
- + control_size);
- case UAC_VERSION_3:
- return 0; /* UAC3 does not have this field */
- }
-}
-
-static inline __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- __u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
-
- switch (protocol) {
- case UAC_VERSION_1:
- case UAC_VERSION_2:
- default:
- return uac_processing_unit_bmControls(desc, protocol)
- + control_size + 1;
- case UAC_VERSION_3:
- return uac_processing_unit_bmControls(desc, protocol)
- + control_size;
- }
-}
-
-/*
- * Extension Unit (XU) has almost compatible layout with Processing Unit, but
- * on UAC2, it has a different bmControls size (bControlSize); it's 1 byte for
- * XU while 2 bytes for PU. The last iExtension field is a one-byte index as
- * well as iProcessing field of PU.
- */
-static inline __u8 uac_extension_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- switch (protocol) {
- case UAC_VERSION_1:
- return desc->baSourceID[desc->bNrInPins + 4];
- case UAC_VERSION_2:
- return 1; /* in UAC2, this value is constant */
- case UAC_VERSION_3:
- return 4; /* in UAC3, this value is constant */
- default:
- return 1;
- }
-}
-
-static inline __u8 uac_extension_unit_iExtension(struct uac_processing_unit_descriptor *desc,
- int protocol)
-{
- __u8 control_size = uac_extension_unit_bControlSize(desc, protocol);
-
- switch (protocol) {
- case UAC_VERSION_1:
- case UAC_VERSION_2:
- default:
- return *(uac_processing_unit_bmControls(desc, protocol)
- + control_size);
- case UAC_VERSION_3:
- return 0; /* UAC3 does not have this field */
- }
-}
-
-/* 4.5.2 Class-Specific AS Interface Descriptor */
-struct uac1_as_header_descriptor {
- __u8 bLength; /* in bytes: 7 */
- __u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
- __u8 bDescriptorSubtype; /* AS_GENERAL */
- __u8 bTerminalLink; /* Terminal ID of connected Terminal */
- __u8 bDelay; /* Delay introduced by the data path */
- __le16 wFormatTag; /* The Audio Data Format */
-} __attribute__ ((packed));
-
-#define UAC_DT_AS_HEADER_SIZE 7
-
-/* Formats - A.1.1 Audio Data Format Type I Codes */
-#define UAC_FORMAT_TYPE_I_UNDEFINED 0x0
-#define UAC_FORMAT_TYPE_I_PCM 0x1
-#define UAC_FORMAT_TYPE_I_PCM8 0x2
-#define UAC_FORMAT_TYPE_I_IEEE_FLOAT 0x3
-#define UAC_FORMAT_TYPE_I_ALAW 0x4
-#define UAC_FORMAT_TYPE_I_MULAW 0x5
-
-struct uac_format_type_i_continuous_descriptor {
- __u8 bLength; /* in bytes: 8 + (ns * 3) */
- __u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
- __u8 bDescriptorSubtype; /* FORMAT_TYPE */
- __u8 bFormatType; /* FORMAT_TYPE_1 */
- __u8 bNrChannels; /* physical channels in the stream */
- __u8 bSubframeSize; /* */
- __u8 bBitResolution;
- __u8 bSamFreqType;
- __u8 tLowerSamFreq[3];
- __u8 tUpperSamFreq[3];
-} __attribute__ ((packed));
-
-#define UAC_FORMAT_TYPE_I_CONTINUOUS_DESC_SIZE 14
-
-struct uac_format_type_i_discrete_descriptor {
- __u8 bLength; /* in bytes: 8 + (ns * 3) */
- __u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
- __u8 bDescriptorSubtype; /* FORMAT_TYPE */
- __u8 bFormatType; /* FORMAT_TYPE_1 */
- __u8 bNrChannels; /* physical channels in the stream */
- __u8 bSubframeSize; /* */
- __u8 bBitResolution;
- __u8 bSamFreqType;
- __u8 tSamFreq[][3];
-} __attribute__ ((packed));
-
-#define DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(n) \
-struct uac_format_type_i_discrete_descriptor_##n { \
- __u8 bLength; \
- __u8 bDescriptorType; \
- __u8 bDescriptorSubtype; \
- __u8 bFormatType; \
- __u8 bNrChannels; \
- __u8 bSubframeSize; \
- __u8 bBitResolution; \
- __u8 bSamFreqType; \
- __u8 tSamFreq[n][3]; \
-} __attribute__ ((packed))
-
-#define UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(n) (8 + (n * 3))
-
-struct uac_format_type_i_ext_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bFormatType;
- __u8 bSubslotSize;
- __u8 bBitResolution;
- __u8 bHeaderLength;
- __u8 bControlSize;
- __u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* Formats - Audio Data Format Type I Codes */
-
-#define UAC_FORMAT_TYPE_II_MPEG 0x1001
-#define UAC_FORMAT_TYPE_II_AC3 0x1002
-
-struct uac_format_type_ii_discrete_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bFormatType;
- __le16 wMaxBitRate;
- __le16 wSamplesPerFrame;
- __u8 bSamFreqType;
- __u8 tSamFreq[][3];
-} __attribute__((packed));
-
-struct uac_format_type_ii_ext_descriptor {
- __u8 bLength;
- __u8 bDescriptorType;
- __u8 bDescriptorSubtype;
- __u8 bFormatType;
- __le16 wMaxBitRate;
- __le16 wSamplesPerFrame;
- __u8 bHeaderLength;
- __u8 bSideBandProtocol;
-} __attribute__((packed));
-
-/* type III */
-#define UAC_FORMAT_TYPE_III_IEC1937_AC3 0x2001
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG1_LAYER1 0x2002
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_NOEXT 0x2003
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_EXT 0x2004
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER1_LS 0x2005
-#define UAC_FORMAT_TYPE_III_IEC1937_MPEG2_LAYER23_LS 0x2006
-
-/* Formats - A.2 Format Type Codes */
-#define UAC_FORMAT_TYPE_UNDEFINED 0x0
-#define UAC_FORMAT_TYPE_I 0x1
-#define UAC_FORMAT_TYPE_II 0x2
-#define UAC_FORMAT_TYPE_III 0x3
-#define UAC_EXT_FORMAT_TYPE_I 0x81
-#define UAC_EXT_FORMAT_TYPE_II 0x82
-#define UAC_EXT_FORMAT_TYPE_III 0x83
-
-struct uac_iso_endpoint_descriptor {
- __u8 bLength; /* in bytes: 7 */
- __u8 bDescriptorType; /* USB_DT_CS_ENDPOINT */
- __u8 bDescriptorSubtype; /* EP_GENERAL */
- __u8 bmAttributes;
- __u8 bLockDelayUnits;
- __le16 wLockDelay;
-} __attribute__((packed));
-#define UAC_ISO_ENDPOINT_DESC_SIZE 7
-
-#define UAC_EP_CS_ATTR_SAMPLE_RATE 0x01
-#define UAC_EP_CS_ATTR_PITCH_CONTROL 0x02
-#define UAC_EP_CS_ATTR_FILL_MAX 0x80
-
-/* status word format (3.7.1.1) */
-
-#define UAC1_STATUS_TYPE_ORIG_MASK 0x0f
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_CONTROL_IF 0x0
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_IF 0x1
-#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_EP 0x2
-
-#define UAC1_STATUS_TYPE_IRQ_PENDING (1 << 7)
-#define UAC1_STATUS_TYPE_MEM_CHANGED (1 << 6)
-
-struct uac1_status_word {
- __u8 bStatusType;
- __u8 bOriginator;
-} __attribute__((packed));
-
-
-#endif /* _UAPI__LINUX_USB_AUDIO_H */
diff --git a/components/drivers/usb/usbdevice/class/audio_mic.c b/components/drivers/usb/usbdevice/class/audio_mic.c
index 23ade2d9b6..81170b8a72 100644
--- a/components/drivers/usb/usbdevice/class/audio_mic.c
+++ b/components/drivers/usb/usbdevice/class/audio_mic.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -11,7 +11,8 @@
#include <rthw.h>
#include <rtdevice.h>
#include "drivers/usb_device.h"
-#include "audio.h"
+
+#include "uaudioreg.h"
#define DBG_TAG "usbd.audio.mic"
#define DBG_LVL DBG_INFO
@@ -35,6 +36,7 @@
#define EVENT_RECORD_STOP (1 << 1)
#define EVENT_RECORD_DATA (1 << 2)
+#define MIC_INTF_STR_INDEX 8
/*
* uac mic descriptor define
*/
@@ -45,9 +47,6 @@
#define UAC_MAX_PACKET_SIZE 64
#define UAC_EP_MAX_PACKET_SIZE 32
#define UAC_CHANNEL_NUM RECORD_CHANNEL
-#define UAC_INTR_NUM 1
-#define UAC_CH_NUM 1
-#define UAC_FORMAT_NUM 1
struct uac_ac_descriptor
{
@@ -55,21 +54,21 @@ struct uac_ac_descriptor
struct uiad_descriptor iad_desc;
#endif
struct uinterface_descriptor intf_desc;
- DECLARE_UAC_AC_HEADER_DESCRIPTOR(UAC_INTR_NUM) hdr_desc;
- struct uac_input_terminal_descriptor it_desc;
- struct uac1_output_terminal_descriptor ot_desc;
+ struct usb_audio_control_descriptor hdr_desc;
+ struct usb_audio_input_terminal it_desc;
+ struct usb_audio_output_terminal ot_desc;
#if UAC_USE_FEATURE_UNIT
- DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(UAC_CH_NUM) feature_unit_desc;
+ struct usb_audio_feature_unit feature_unit_desc;
#endif
};
struct uac_as_descriptor
{
struct uinterface_descriptor intf_desc;
- struct uac1_as_header_descriptor hdr_desc;
- DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(UAC_FORMAT_NUM) format_type_desc;
+ struct usb_audio_streaming_interface_descriptor hdr_desc;
+ struct usb_audio_streaming_type1_descriptor format_type_desc;
struct uendpoint_descriptor ep_desc;
- struct uac_iso_endpoint_descriptor as_ep_desc;
+ struct usb_audio_streaming_endpoint_descriptor as_ep_desc;
};
/*
@@ -128,7 +127,7 @@ const static char *_ustring[] =
{
"Language",
"RT-Thread Team.",
- "Microphone",
+ "RT-Thread Audio Microphone",
"32021919830108",
"Configuration",
"Interface",
@@ -160,13 +159,17 @@ static struct uac_ac_descriptor ac_desc =
USB_CLASS_AUDIO,
USB_SUBCLASS_AUDIOCONTROL,
0x00,
+#ifdef RT_USB_DEVICE_COMPOSITE
+ MIC_INTF_STR_INDEX,
+#else
0x00,
+#endif
},
/* Header Descriptor */
{
- UAC_DT_AC_HEADER_SIZE(UAC_INTR_NUM),
+ sizeof(struct usb_audio_control_descriptor),
UAC_CS_INTERFACE,
- UAC_HEADER,
+ UDESCSUB_AC_HEADER,
0x0100, /* Version: 1.00 */
0x001E, /* Total length: 30 */
0x01, /* Total number of interfaces: 1 */
@@ -174,9 +177,9 @@ static struct uac_ac_descriptor ac_desc =
},
/* Input Terminal Descriptor */
{
- UAC_DT_INPUT_TERMINAL_SIZE,
+ sizeof(struct usb_audio_input_terminal),
UAC_CS_INTERFACE,
- UAC_INPUT_TERMINAL,
+ UDESCSUB_AC_INPUT,
0x01, /* Terminal ID: 1 */
0x0201, /* Terminal Type: Microphone (0x0201) */
0x00, /* Assoc Terminal: 0 */
@@ -187,9 +190,9 @@ static struct uac_ac_descriptor ac_desc =
},
/* Output Terminal Descriptor */
{
- UAC_DT_OUTPUT_TERMINAL_SIZE,
+ sizeof(struct usb_audio_output_terminal),
UAC_CS_INTERFACE,
- UAC_OUTPUT_TERMINAL,
+ UDESCSUB_AC_OUTPUT,
0x02, /* Terminal ID: 2 */
0x0101, /* Terminal Type: USB Streaming (0x0101) */
0x00, /* Assoc Terminal: 0 */
@@ -199,11 +202,12 @@ static struct uac_ac_descriptor ac_desc =
#if UAC_USE_FEATURE_UNIT
/* Feature unit Descriptor */
{
- UAC_DT_FEATURE_UNIT_SIZE(UAC_CH_NUM),
+ sizeof(struct usb_audio_feature_unit),
UAC_CS_INTERFACE,
- UAC_FEATURE_UNIT,
+ UDESCSUB_AC_FEATURE,
0x02,
- 0x0101,
+ 0x01,
+ 0x01,
0x00,
0x01,
},
@@ -241,19 +245,19 @@ static struct uac_as_descriptor as_desc =
},
/* General AS Descriptor */
{
- UAC_DT_AS_HEADER_SIZE,
+ sizeof(struct usb_audio_streaming_interface_descriptor),
UAC_CS_INTERFACE,
- UAC_AS_GENERAL,
+ AS_GENERAL,
0x02, /* Terminal ID: 2 */
0x01, /* Interface delay in frames: 1 */
- UAC_FORMAT_TYPE_I_PCM,
+ UA_FMT_PCM,
},
/* Format type i Descriptor */
{
- UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(UAC_FORMAT_NUM),
+ sizeof(struct usb_audio_streaming_type1_descriptor),
UAC_CS_INTERFACE,
- UAC_FORMAT_TYPE,
- UAC_FORMAT_TYPE_I,
+ FORMAT_TYPE,
+ FORMAT_TYPE_I,
UAC_CHANNEL_NUM,
2, /* Subframe Size: 2 */
RESOLUTION_BITS,
@@ -271,9 +275,9 @@ static struct uac_as_descriptor as_desc =
},
/* AS Endpoint Descriptor */
{
- UAC_ISO_ENDPOINT_DESC_SIZE,
+ sizeof(struct usb_audio_streaming_endpoint_descriptor),
UAC_CS_ENDPOINT,
- UAC_MS_GENERAL,
+ AS_GENERAL,
},
};
@@ -471,9 +475,9 @@ static rt_err_t _uac_descriptor_config(struct uac_ac_descriptor *ac,
static rt_err_t _uac_samplerate_config(struct uac_as_descriptor *as, rt_uint32_t samplerate)
{
- as->format_type_desc.tSamFreq[0][2] = samplerate >> 16 & 0xff;
- as->format_type_desc.tSamFreq[0][1] = samplerate >> 8 & 0xff;
- as->format_type_desc.tSamFreq[0][0] = samplerate & 0xff;
+ as->format_type_desc.tSamFreq[0 * 3 + 2] = samplerate >> 16 & 0xff;
+ as->format_type_desc.tSamFreq[0 * 3 + 1] = samplerate >> 8 & 0xff;
+ as->format_type_desc.tSamFreq[0 * 3 + 0] = samplerate & 0xff;
return RT_EOK;
}
@@ -495,9 +499,12 @@ ufunction_t rt_usbd_function_uac_mic_create(udevice_t device)
/* parameter check */
RT_ASSERT(device != RT_NULL);
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, MIC_INTF_STR_INDEX, _ustring[2]);
+#else
/* set usb device string description */
rt_usbd_device_set_string(device, _ustring);
-
+#endif
/* create a uac function */
func = rt_usbd_function_new(device, &dev_desc, &ops);
//not support HS
diff --git a/components/drivers/usb/usbdevice/class/audio_speaker.c b/components/drivers/usb/usbdevice/class/audio_speaker.c
index e9a3ffaf40..6148478c02 100644
--- a/components/drivers/usb/usbdevice/class/audio_speaker.c
+++ b/components/drivers/usb/usbdevice/class/audio_speaker.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2019, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -11,7 +11,9 @@
#include <rthw.h>
#include <rtdevice.h>
#include "drivers/usb_device.h"
-#include "audio.h"
+
+#define AUFMT_MAX_FREQUENCIES 1
+#include "uaudioreg.h"
#define DBG_TAG "usbd.audio.speaker"
#define DBG_LVL DBG_INFO
@@ -35,6 +37,7 @@
#define EVENT_AUDIO_STOP (1 << 1)
#define EVENT_AUDIO_DATA (1 << 2)
+#define SPK_INTF_STR_INDEX 9
/*
* uac speaker descriptor define
*/
@@ -45,9 +48,6 @@
#define UAC_MAX_PACKET_SIZE 64
#define UAC_EP_MAX_PACKET_SIZE 32
#define UAC_CHANNEL_NUM AUDIO_CHANNEL
-#define UAC_INTR_NUM 1
-#define UAC_CH_NUM 1
-#define UAC_FORMAT_NUM 1
struct uac_ac_descriptor
{
@@ -55,21 +55,21 @@ struct uac_ac_descriptor
struct uiad_descriptor iad_desc;
#endif
struct uinterface_descriptor intf_desc;
- DECLARE_UAC_AC_HEADER_DESCRIPTOR(UAC_INTR_NUM) hdr_desc;
- struct uac_input_terminal_descriptor it_desc;
- struct uac1_output_terminal_descriptor ot_desc;
+ struct usb_audio_control_descriptor hdr_desc;
+ struct usb_audio_input_terminal it_desc;
+ struct usb_audio_output_terminal ot_desc;
#if UAC_USE_FEATURE_UNIT
- DECLARE_UAC_FEATURE_UNIT_DESCRIPTOR(UAC_CH_NUM) feature_unit_desc;
+ struct usb_audio_feature_unit feature_unit_desc;
#endif
};
struct uac_as_descriptor
{
struct uinterface_descriptor intf_desc;
- struct uac1_as_header_descriptor hdr_desc;
- DECLARE_UAC_FORMAT_TYPE_I_DISCRETE_DESC(UAC_FORMAT_NUM) format_type_desc;
+ struct usb_audio_streaming_interface_descriptor hdr_desc;
+ struct usb_audio_streaming_type1_descriptor format_type_desc;
struct uendpoint_descriptor ep_desc;
- struct uac_iso_endpoint_descriptor as_ep_desc;
+ struct usb_audio_streaming_endpoint_descriptor as_ep_desc;
};
/*
@@ -128,7 +128,7 @@ const static char *_ustring[] =
{
"Language",
"RT-Thread Team.",
- "RT-Thread Speaker",
+ "RT-Thread Audio Speaker",
"32021919830108",
"Configuration",
"Interface",
@@ -160,13 +160,17 @@ static struct uac_ac_descriptor ac_desc =
USB_CLASS_AUDIO,
USB_SUBCLASS_AUDIOCONTROL,
0x00,
+#ifdef RT_USB_DEVICE_COMPOSITE
+ SPK_INTF_STR_INDEX,
+#else
0x00,
+#endif
},
/* Header Descriptor */
{
- UAC_DT_AC_HEADER_SIZE(UAC_INTR_NUM),
+ sizeof(struct usb_audio_control_descriptor),
UAC_CS_INTERFACE,
- UAC_HEADER,
+ UDESCSUB_AC_HEADER,
0x0100, /* Version: 1.00 */
0x0027, /* Total length: 39 */
0x01, /* Total number of interfaces: 1 */
@@ -174,9 +178,9 @@ static struct uac_ac_descriptor ac_desc =
},
/* Input Terminal Descriptor */
{
- UAC_DT_INPUT_TERMINAL_SIZE,
+ sizeof(struct usb_audio_input_terminal),
UAC_CS_INTERFACE,
- UAC_INPUT_TERMINAL,
+ UDESCSUB_AC_INPUT,
0x01, /* Terminal ID: 1 */
0x0101, /* Terminal Type: USB Streaming (0x0101) */
0x00, /* Assoc Terminal: 0 */
@@ -187,9 +191,9 @@ static struct uac_ac_descriptor ac_desc =
},
/* Output Terminal Descriptor */
{
- UAC_DT_OUTPUT_TERMINAL_SIZE,
+ sizeof(struct usb_audio_output_terminal),
UAC_CS_INTERFACE,
- UAC_OUTPUT_TERMINAL,
+ UDESCSUB_AC_OUTPUT,
0x02, /* Terminal ID: 2 */
0x0302, /* Terminal Type: Headphones (0x0302) */
0x00, /* Assoc Terminal: 0 */
@@ -241,19 +245,19 @@ static struct uac_as_descriptor as_desc =
},
/* General AS Descriptor */
{
- UAC_DT_AS_HEADER_SIZE,
+ sizeof(struct usb_audio_streaming_interface_descriptor),
UAC_CS_INTERFACE,
- UAC_AS_GENERAL,
+ AS_GENERAL,
0x01, /* Terminal ID: 1 */
0x01, /* Interface delay in frames: 1 */
- UAC_FORMAT_TYPE_I_PCM,
+ UA_FMT_PCM,
},
/* Format type i Descriptor */
{
- UAC_FORMAT_TYPE_I_DISCRETE_DESC_SIZE(UAC_FORMAT_NUM),
+ sizeof(struct usb_audio_streaming_type1_descriptor),
UAC_CS_INTERFACE,
- UAC_FORMAT_TYPE,
- UAC_FORMAT_TYPE_I,
+ FORMAT_TYPE,
+ FORMAT_TYPE_I,
UAC_CHANNEL_NUM,
2, /* Subframe Size: 2 */
RESOLUTION_BITS,
@@ -271,9 +275,9 @@ static struct uac_as_descriptor as_desc =
},
/* AS Endpoint Descriptor */
{
- UAC_ISO_ENDPOINT_DESC_SIZE,
+ sizeof(struct usb_audio_streaming_endpoint_descriptor),
UAC_CS_ENDPOINT,
- UAC_MS_GENERAL,
+ AS_GENERAL,
},
};
@@ -472,9 +476,9 @@ static rt_err_t _uac_descriptor_config(struct uac_ac_descriptor *ac,
static rt_err_t _uac_samplerate_config(struct uac_as_descriptor *as, rt_uint32_t samplerate)
{
- as->format_type_desc.tSamFreq[0][2] = samplerate >> 16 & 0xff;
- as->format_type_desc.tSamFreq[0][1] = samplerate >> 8 & 0xff;
- as->format_type_desc.tSamFreq[0][0] = samplerate & 0xff;
+ as->format_type_desc.tSamFreq[0 * 3 + 2] = samplerate >> 16 & 0xff;
+ as->format_type_desc.tSamFreq[0 * 3 + 1] = samplerate >> 8 & 0xff;
+ as->format_type_desc.tSamFreq[0 * 3 + 0] = samplerate & 0xff;
return RT_EOK;
}
@@ -496,9 +500,12 @@ ufunction_t rt_usbd_function_uac_speaker_create(udevice_t device)
/* parameter check */
RT_ASSERT(device != RT_NULL);
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, SPK_INTF_STR_INDEX, _ustring[2]);
+#else
/* set usb device string description */
rt_usbd_device_set_string(device, _ustring);
-
+#endif
/* create a uac function */
func = rt_usbd_function_new(device, &dev_desc, &ops);
//not support HS
diff --git a/components/drivers/usb/usbdevice/class/cdc.h b/components/drivers/usb/usbdevice/class/cdc.h
index 4e07f16266..a4616a956b 100644
--- a/components/drivers/usb/usbdevice/class/cdc.h
+++ b/components/drivers/usb/usbdevice/class/cdc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -8,7 +8,7 @@
* 2012-10-03 Yi Qiu first version
* 2012-12-12 heyuanjie87 add CDC endpoints collection
*/
-
+
#ifndef __CDC_H__
#define __CDC_H__
@@ -96,7 +96,7 @@ struct ucdc_header_descriptor
rt_uint8_t length;
rt_uint8_t type;
rt_uint8_t subtype;
- rt_uint16_t bcd;
+ rt_uint16_t bcd;
};
typedef struct ucdc_header_descriptor* ucdc_hdr_desc_t;
@@ -114,7 +114,7 @@ struct ucdc_call_mgmt_descriptor
rt_uint8_t length;
rt_uint8_t type;
rt_uint8_t subtype;
- rt_uint8_t capabilties;
+ rt_uint8_t capabilties;
rt_uint8_t data_interface;
};
typedef struct ucdc_call_mgmt_descriptor* ucdc_call_mgmt_desc_t;
@@ -136,9 +136,9 @@ struct ucdc_comm_descriptor
#endif
struct uinterface_descriptor intf_desc;
struct ucdc_header_descriptor hdr_desc;
- struct ucdc_call_mgmt_descriptor call_mgmt_desc;
- struct ucdc_acm_descriptor acm_desc;
- struct ucdc_union_descriptor union_desc;
+ struct ucdc_call_mgmt_descriptor call_mgmt_desc;
+ struct ucdc_acm_descriptor acm_desc;
+ struct ucdc_union_descriptor union_desc;
struct uendpoint_descriptor ep_desc;
};
typedef struct ucdc_comm_descriptor* ucdc_comm_desc_t;
@@ -170,7 +170,7 @@ typedef struct ucdc_eth_descriptor* ucdc_eth_desc_t;
struct ucdc_data_descriptor
{
struct uinterface_descriptor intf_desc;
- struct uendpoint_descriptor ep_out_desc;
+ struct uendpoint_descriptor ep_out_desc;
struct uendpoint_descriptor ep_in_desc;
};
typedef struct ucdc_data_descriptor* ucdc_data_desc_t;
diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c
index f9ea466bd5..3564330578 100644
--- a/components/drivers/usb/usbdevice/class/cdc_vcom.c
+++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2012-10-02 Yi Qiu first version
- * 2012-12-12 heyuanjie87 change endpoints and function handler
+ * 2012-12-12 heyuanjie87 change endpoints and function handler
* 2013-06-25 heyuanjie87 remove SOF mechinism
* 2013-07-20 Yi Qiu do more test
* 2016-02-01 Urey Fix some error
@@ -20,6 +20,7 @@
#ifdef RT_USB_DEVICE_CDC
+#define VCOM_INTF_STR_INDEX 5
#ifdef RT_VCOM_TX_TIMEOUT
#define VCOM_TX_TIMEOUT RT_VCOM_TX_TIMEOUT
#else /*!RT_VCOM_TX_TIMEOUT*/
@@ -146,23 +147,27 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_DESC_LENGTH_INTERFACE,
USB_DESC_TYPE_INTERFACE,
USB_DYNAMIC,
- 0x00,
+ 0x00,
0x01,
USB_CDC_CLASS_COMM,
USB_CDC_SUBCLASS_ACM,
USB_CDC_PROTOCOL_V25TER,
- 0x00,
+#ifdef RT_USB_DEVICE_COMPOSITE
+ VCOM_INTF_STR_INDEX,
+#else
+ 0,
+#endif
},
- /* Header Functional Descriptor */
+ /* Header Functional Descriptor */
{
- 0x05,
+ 0x05,
USB_CDC_CS_INTERFACE,
USB_CDC_SCS_HEADER,
0x0110,
},
- /* Call Management Functional Descriptor */
+ /* Call Management Functional Descriptor */
{
- 0x05,
+ 0x05,
USB_CDC_CS_INTERFACE,
USB_CDC_SCS_CALL_MGMT,
0x00,
@@ -175,7 +180,7 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_CDC_SCS_ACM,
0x02,
},
- /* Union Functional Descriptor */
+ /* Union Functional Descriptor */
{
0x05,
USB_CDC_CS_INTERFACE,
@@ -183,7 +188,7 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_DYNAMIC,
USB_DYNAMIC,
},
- /* Endpoint Descriptor */
+ /* Endpoint Descriptor */
{
USB_DESC_LENGTH_ENDPOINT,
USB_DESC_TYPE_ENDPOINT,
@@ -204,27 +209,27 @@ const static struct ucdc_data_descriptor _data_desc =
USB_DESC_TYPE_INTERFACE,
USB_DYNAMIC,
0x00,
- 0x02,
+ 0x02,
USB_CDC_CLASS_DATA,
- 0x00,
- 0x00,
- 0x00,
+ 0x00,
+ 0x00,
+ 0x00,
},
/* endpoint, bulk out */
{
- USB_DESC_LENGTH_ENDPOINT,
+ USB_DESC_LENGTH_ENDPOINT,
USB_DESC_TYPE_ENDPOINT,
USB_DYNAMIC | USB_DIR_OUT,
- USB_EP_ATTR_BULK,
+ USB_EP_ATTR_BULK,
USB_CDC_BUFSIZE,
- 0x00,
+ 0x00,
},
/* endpoint, bulk in */
{
USB_DESC_LENGTH_ENDPOINT,
USB_DESC_TYPE_ENDPOINT,
USB_DYNAMIC | USB_DIR_IN,
- USB_EP_ATTR_BULK,
+ USB_EP_ATTR_BULK,
USB_CDC_BUFSIZE,
0x00,
},
@@ -253,11 +258,11 @@ static void _vcom_reset_state(ufunction_t func)
{
struct vcom* data;
int lvl;
-
+
RT_ASSERT(func != RT_NULL)
data = (struct vcom*)func->user_data;
-
+
lvl = rt_hw_interrupt_disable();
data->connected = RT_FALSE;
data->in_sending = RT_FALSE;
@@ -299,9 +304,9 @@ static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
return RT_EOK;
}
-
+
rt_completion_done(&data->wait);
-
+
return RT_EOK;
}
@@ -396,7 +401,7 @@ static rt_err_t _cdc_set_line_coding_callback(udevice_t device, rt_size_t size)
RT_DEBUG_LOG(RT_DEBUG_USB, ("_cdc_set_line_coding_callback\n"));
dcd_ep0_send_status(device->dcd);
-
+
return RT_EOK;
}
@@ -438,7 +443,7 @@ static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)
RT_ASSERT(setup != RT_NULL);
data = (struct vcom*)func->user_data;
-
+
switch(setup->bRequest)
{
case CDC_SEND_ENCAPSULATED_COMMAND:
@@ -488,17 +493,17 @@ static rt_err_t _function_enable(ufunction_t func)
RT_DEBUG_LOG(RT_DEBUG_USB, ("cdc function enable\n"));
_vcom_reset_state(func);
-
+
data = (struct vcom*)func->user_data;
data->ep_out->buffer = rt_malloc(CDC_RX_BUFSIZE);
RT_ASSERT(data->ep_out->buffer != RT_NULL);
data->ep_out->request.buffer = data->ep_out->buffer;
data->ep_out->request.size = EP_MAXPACKET(data->ep_out);
-
+
data->ep_out->request.req_type = UIO_REQUEST_READ_BEST;
rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
-
+
return RT_EOK;
}
@@ -523,7 +528,7 @@ static rt_err_t _function_disable(ufunction_t func)
if(data->ep_out->buffer != RT_NULL)
{
rt_free(data->ep_out->buffer);
- data->ep_out->buffer = RT_NULL;
+ data->ep_out->buffer = RT_NULL;
}
return RT_EOK;
@@ -544,7 +549,7 @@ static struct ufunction_ops ops =
*
* @return RT_EOK on successful.
*/
-static rt_err_t _cdc_descriptor_config(ucdc_comm_desc_t comm,
+static rt_err_t _cdc_descriptor_config(ucdc_comm_desc_t comm,
rt_uint8_t cintf_nr, ucdc_data_desc_t data, rt_uint8_t dintf_nr)
{
comm->call_mgmt_desc.data_interface = dintf_nr;
@@ -582,21 +587,24 @@ ufunction_t rt_usbd_function_cdc_create(udevice_t device)
rt_memset(serno, 0, _SER_NO_LEN + 1);
rt_memcpy(serno, _SER_NO, rt_strlen(_SER_NO));
}
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, VCOM_INTF_STR_INDEX, _ustring[2]);
+#else
/* set usb device string description */
rt_usbd_device_set_string(device, _ustring);
-
+#endif
/* create a cdc function */
func = rt_usbd_function_new(device, &dev_desc, &ops);
-
+
/* support HS */
rt_usbd_device_set_qualifier(device, &dev_qualifier);
-
+
/* allocate memory for cdc vcom data */
data = (struct vcom*)rt_malloc(sizeof(struct vcom));
RT_ASSERT(data != RT_NULL);
rt_memset(data, 0, sizeof(struct vcom));
func->user_data = (void*)data;
-
+
/* initilize vcom */
rt_usb_vcom_init(func);
@@ -646,7 +654,7 @@ ufunction_t rt_usbd_function_cdc_create(udevice_t device)
/* add the cdc data interface to cdc function */
rt_usbd_function_add_interface(func, intf_data);
-
+
return func;
}
@@ -682,7 +690,7 @@ static int _vcom_getc(struct rt_serial_device *serial)
rt_uint32_t level;
struct ufunction *func;
struct vcom *data;
-
+
func = (struct ufunction*)serial->parent.user_data;
data = (struct vcom*)func->user_data;
@@ -918,7 +926,7 @@ static void rt_usb_vcom_init(struct ufunction *func)
rt_err_t result = RT_EOK;
struct serial_configure config;
struct vcom *data = (struct vcom*)func->user_data;
-
+
/* initialize ring buffer */
rt_ringbuffer_init(&data->rx_ringbuffer, data->rx_rbp, CDC_RX_BUFSIZE);
rt_ringbuffer_init(&data->tx_ringbuffer, data->tx_rbp, CDC_TX_BUFSIZE);
@@ -952,9 +960,9 @@ static void rt_usb_vcom_init(struct ufunction *func)
vcom_thread_stack, VCOM_TASK_STK_SIZE,
16, 20);
result = rt_thread_startup(&vcom_thread);
- RT_ASSERT(result == RT_EOK);
+ RT_ASSERT(result == RT_EOK);
}
-struct udclass vcom_class =
+struct udclass vcom_class =
{
.rt_usbd_function_create = rt_usbd_function_cdc_create
};
diff --git a/components/drivers/usb/usbdevice/class/ecm.c b/components/drivers/usb/usbdevice/class/ecm.c
index 36557dad74..d6d98478f8 100644
--- a/components/drivers/usb/usbdevice/class/ecm.c
+++ b/components/drivers/usb/usbdevice/class/ecm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -24,6 +24,7 @@
#define USB_ETH_MTU 1514
#endif
#define MAX_ADDR_LEN 6
+#define ECM_INTF_STR_INDEX 10
struct rt_ecm_eth
{
@@ -44,9 +45,9 @@ struct rt_ecm_eth
ALIGN(4)
char rx_buffer[USB_ETH_MTU];
char tx_buffer[USB_ETH_MTU];
-
+
struct rt_semaphore tx_buffer_free;
-
+
};
typedef struct rt_ecm_eth * rt_ecm_eth_t;
@@ -96,7 +97,11 @@ const static struct ucdc_eth_descriptor _comm_desc =
USB_CDC_CLASS_COMM,
USB_CDC_SUBCLASS_ETH,
USB_CDC_PROTOCOL_NONE,
+#ifdef RT_USB_DEVICE_COMPOSITE
+ ECM_INTF_STR_INDEX,
+#else
0x00,
+#endif
},
/* Header Functional Descriptor */
{
@@ -207,7 +212,7 @@ static rt_err_t _cdc_send_notifi(ufunction_t func,ucdc_notification_code_t notif
_notifi.bNotificatinCode = notifi;
_notifi.wValue = wValue;
_notifi.wLength = wLength;
-
+
eps->ep_cmd->request.buffer = (void *)&_notifi;
eps->ep_cmd->request.size = 8;
eps->ep_cmd->request.req_type = UIO_REQUEST_WRITE;
@@ -220,7 +225,7 @@ static rt_err_t _ecm_set_eth_packet_filter(ufunction_t func, ureq_t setup)
{
rt_ecm_eth_t _ecm_eth = (rt_ecm_eth_t)func->user_data;
dcd_ep0_send_status(func->device->dcd);
-
+
/* send link up. */
eth_device_linkchange(&_ecm_eth->parent, RT_TRUE);
_cdc_send_notifi(func, UCDC_NOTIFI_NETWORK_CONNECTION, 1, 0);
@@ -292,7 +297,7 @@ static rt_err_t _ep_out_handler(ufunction_t func, rt_size_t size)
ecm_device->rx_size = ecm_device->rx_offset;
ecm_device->rx_offset = 0;
eth_device_ready(&ecm_device->parent);
-
+
}else
{
ecm_device->eps.ep_out->request.buffer = ecm_device->eps.ep_out->buffer;
@@ -427,7 +432,7 @@ rt_err_t rt_ecm_eth_tx(rt_device_t dev, struct pbuf* p)
rt_sem_release(&ecm_eth_dev->tx_buffer_free);
return result;
}
-
+
pbuffer = (char *)&ecm_eth_dev->tx_buffer;
for (q = p; q != NULL; q = q->next)
{
@@ -480,7 +485,7 @@ static rt_err_t _function_enable(ufunction_t func)
/* reset eth rx tx */
ecm_device->rx_size = 0;
ecm_device->rx_offset = 0;
-
+
eps->ep_out->request.buffer = (void *)eps->ep_out->buffer;
eps->ep_out->request.size = EP_MAXPACKET(eps->ep_out);
eps->ep_out->request.req_type = UIO_REQUEST_READ_BEST;
@@ -555,13 +560,16 @@ ufunction_t rt_usbd_function_ecm_create(udevice_t device)
ualtsetting_t comm_setting, data_setting;
ucdc_data_desc_t data_desc;
ucdc_eth_desc_t comm_desc;
-
+
/* parameter check */
RT_ASSERT(device != RT_NULL);
/* set usb device string description */
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, ECM_INTF_STR_INDEX, _ustring[2]);
+#else
rt_usbd_device_set_string(device, _ustring);
-
+#endif
/* create a cdc class */
cdc = rt_usbd_function_new(device, &_dev_desc, &ops);
rt_usbd_device_set_qualifier(device, &dev_qualifier);
@@ -600,7 +608,7 @@ ufunction_t rt_usbd_function_ecm_create(udevice_t device)
rt_usbd_set_altsetting(intf_comm, 0);
/* add the communication interface to the cdc class */
rt_usbd_function_add_interface(cdc, intf_comm);
-
+
/* create a bulk in and a bulk out endpoint */
data_desc = (ucdc_data_desc_t)data_setting->desc;
eps->ep_out = rt_usbd_endpoint_new(&data_desc->ep_out_desc, _ep_out_handler);
@@ -648,14 +656,14 @@ ufunction_t rt_usbd_function_ecm_create(udevice_t device)
_ecm_eth->parent.eth_tx = rt_ecm_eth_tx;
/* register eth device */
eth_device_init(&_ecm_eth->parent, "u0");
-
+
/* send link up. */
eth_device_linkchange(&_ecm_eth->parent, RT_FALSE);
-
+
return cdc;
}
-struct udclass ecm_class =
+struct udclass ecm_class =
{
.rt_usbd_function_create = rt_usbd_function_ecm_create
};
diff --git a/components/drivers/usb/usbdevice/class/hid.c b/components/drivers/usb/usbdevice/class/hid.c
index 52e50296a4..ddd4cb93a8 100644
--- a/components/drivers/usb/usbdevice/class/hid.c
+++ b/components/drivers/usb/usbdevice/class/hid.c
@@ -1,9 +1,9 @@
/*
* File : hid.c
- * COPYRIGHT (C) 2008 - 2018, RT-Thread Development Team
+ * COPYRIGHT (C) 2006 - 2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2017-03-13 Urey the first version
@@ -17,7 +17,7 @@
#include "hid.h"
#ifdef RT_USB_DEVICE_HID
-
+#define HID_INTF_STR_INDEX 7
struct hid_s
{
struct rt_device parent;
@@ -318,8 +318,12 @@ const static struct uhid_comm_descriptor _hid_comm_desc =
#else
USB_HID_PROTOCOL_MOUSE, /* nInterfaceProtocol : 0=none, 1=keyboard, 2=mouse */
#endif
- 0, /* iInterface: Index of string descriptor */
- },
+#ifdef RT_USB_DEVICE_COMPOSITE
+ HID_INTF_STR_INDEX, /* iInterface: Index of string descriptor */
+#else
+ 0,
+#endif
+ },
/* HID Descriptor */
{
@@ -621,12 +625,12 @@ static void hid_thread_entry(void* parameter)
struct hid_report report;
struct hid_s *hiddev;
hiddev = (struct hid_s *)parameter;
- while(1)
- {
- if(rt_mq_recv(&hiddev->hid_mq, &report, sizeof(report),RT_WAITING_FOREVER) != RT_EOK )
+ while(1)
+ {
+ if(rt_mq_recv(&hiddev->hid_mq, &report, sizeof(report),RT_WAITING_FOREVER) != RT_EOK )
continue;
- HID_Report_Received(&report);
- }
+ HID_Report_Received(&report);
+ }
}
#ifdef RT_USING_DEVICE_OPS
@@ -658,7 +662,7 @@ static void rt_usb_hid_init(struct ufunction *func)
rt_device_register(&hiddev->parent, "hidd", RT_DEVICE_FLAG_RDWR);
rt_mq_init(&hiddev->hid_mq, "hiddmq", hid_mq_pool, sizeof(struct hid_report),
sizeof(hid_mq_pool), RT_IPC_FLAG_FIFO);
-
+
rt_thread_init(&hid_thread, "hidd", hid_thread_entry, hiddev,
hid_thread_stack, sizeof(hid_thread_stack), RT_USBD_THREAD_PRIO, 20);
rt_thread_startup(&hid_thread);
@@ -685,11 +689,14 @@ ufunction_t rt_usbd_function_hid_create(udevice_t device)
RT_ASSERT(device != RT_NULL);
/* set usb device string description */
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, HID_INTF_STR_INDEX, _ustring[2]);
+#else
rt_usbd_device_set_string(device, _ustring);
-
+#endif
/* create a cdc function */
func = rt_usbd_function_new(device, &_dev_desc, &ops);
-
+
/* For high speed mode supporting */
rt_usbd_device_set_qualifier(device, &dev_qualifier);
@@ -730,7 +737,7 @@ ufunction_t rt_usbd_function_hid_create(udevice_t device)
rt_usb_hid_init(func);
return func;
}
-struct udclass hid_class =
+struct udclass hid_class =
{
.rt_usbd_function_create = rt_usbd_function_hid_create
};
diff --git a/components/drivers/usb/usbdevice/class/hid.h b/components/drivers/usb/usbdevice/class/hid.h
index 4d0f314a11..2b6a4ad90a 100644
--- a/components/drivers/usb/usbdevice/class/hid.h
+++ b/components/drivers/usb/usbdevice/class/hid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/drivers/usb/usbdevice/class/mstorage.c b/components/drivers/usb/usbdevice/class/mstorage.c
index 6991d97eae..97a189834b 100644
--- a/components/drivers/usb/usbdevice/class/mstorage.c
+++ b/components/drivers/usb/usbdevice/class/mstorage.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -7,7 +7,7 @@
* Date Author Notes
* 2012-10-01 Yi Qiu first version
* 2012-11-25 Heyuanjie87 reduce the memory consumption
- * 2012-12-09 Heyuanjie87 change function and endpoint handler
+ * 2012-12-09 Heyuanjie87 change function and endpoint handler
* 2013-07-25 Yi Qiu update for USB CV test
*/
@@ -18,16 +18,16 @@
#ifdef RT_USING_DFS_MNTTABLE
#include "dfs_fs.h"
#endif
-
#ifdef RT_USB_DEVICE_MSTORAGE
+#define MSTRORAGE_INTF_STR_INDEX 11
enum STAT
{
STAT_CBW,
- STAT_CMD,
+ STAT_CMD,
STAT_CSW,
STAT_RECEIVE,
- STAT_SEND,
+ STAT_SEND,
};
typedef enum
@@ -49,7 +49,7 @@ typedef rt_size_t (*cbw_handler)(ufunction_t func, ustorage_cbw_t cbw);
struct scsi_cmd
{
rt_uint16_t cmd;
- cbw_handler handler;
+ cbw_handler handler;
rt_size_t cmd_len;
CB_SIZE_TYPE type;
rt_size_t data_size;
@@ -57,10 +57,10 @@ struct scsi_cmd
};
struct mstorage
-{
+{
struct ustorage_csw csw_response;
uep_t ep_in;
- uep_t ep_out;
+ uep_t ep_out;
int status;
rt_uint32_t cb_data_size;
rt_device_t disk;
@@ -68,7 +68,7 @@ struct mstorage
rt_int32_t count;
rt_int32_t size;
struct scsi_cmd* processing;
- struct rt_device_blk_geometry geometry;
+ struct rt_device_blk_geometry geometry;
};
ALIGN(4)
@@ -131,7 +131,11 @@ const static struct umass_descriptor _mass_desc =
USB_CLASS_MASS_STORAGE, //bInterfaceClass;
0x06, //bInterfaceSubClass;
0x50, //bInterfaceProtocol;
+#ifdef RT_USB_DEVICE_COMPOSITE
+ MSTRORAGE_INTF_STR_INDEX,
+#else
0x00, //iInterface;
+#endif
},
{
@@ -183,9 +187,9 @@ static struct scsi_cmd cmd_data[] =
{SCSI_REQUEST_SENSE, _request_sense, 6, COUNT, 0, DIR_IN},
{SCSI_INQUIRY_CMD, _inquiry_cmd, 6, COUNT, 0, DIR_IN},
{SCSI_ALLOW_REMOVAL, _allow_removal, 6, FIXED, 0, DIR_NONE},
- {SCSI_MODE_SENSE_6, _mode_sense_6, 6, COUNT, 0, DIR_IN},
- {SCSI_START_STOP, _start_stop, 6, FIXED, 0, DIR_NONE},
- {SCSI_READ_CAPACITIES, _read_capacities, 10, COUNT, 0, DIR_NONE},
+ {SCSI_MODE_SENSE_6, _mode_sense_6, 6, COUNT, 0, DIR_IN},
+ {SCSI_START_STOP, _start_stop, 6, FIXED, 0, DIR_NONE},
+ {SCSI_READ_CAPACITIES, _read_capacities, 10, COUNT, 0, DIR_NONE},
{SCSI_READ_CAPACITY, _read_capacity, 10, FIXED, 8, DIR_IN},
{SCSI_READ_10, _read_10, 10, BLOCK_COUNT, 0, DIR_IN},
{SCSI_WRITE_10, _write_10, 10, BLOCK_COUNT, 0, DIR_OUT},
@@ -200,9 +204,9 @@ static void _send_status(ufunction_t func)
RT_DEBUG_LOG(RT_DEBUG_USB, ("_send_status\n"));
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
data->ep_in->request.buffer = (rt_uint8_t*)&data->csw_response;
- data->ep_in->request.size = SIZEOF_CSW;
+ data->ep_in->request.size = SIZEOF_CSW;
data->ep_in->request.req_type = UIO_REQUEST_WRITE;
rt_usbd_io_request(func->device, data->ep_in, &data->ep_in->request);
data->status = STAT_CSW;
@@ -213,13 +217,13 @@ static rt_size_t _test_unit_ready(ufunction_t func, ustorage_cbw_t cbw)
struct mstorage *data;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_test_unit_ready\n"));
data = (struct mstorage*)func->user_data;
data->csw_response.status = 0;
-
+
return 0;
}
@@ -228,7 +232,7 @@ static rt_size_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw)
struct mstorage *data;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_allow_removal\n"));
@@ -241,7 +245,7 @@ static rt_size_t _allow_removal(ufunction_t func, ustorage_cbw_t cbw)
/**
* This function will handle inquiry command request.
*
- * @param func the usb function object.
+ * @param func the usb function object.
* @param cbw the command block wrapper.
*
* @return RT_EOK on successful.
@@ -253,12 +257,12 @@ static rt_size_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw)
rt_uint8_t *buf;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_inquiry_cmd\n"));
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
buf = data->ep_in->buffer;
*(rt_uint32_t*)&buf[0] = 0x0 | (0x80 << 8);
@@ -281,7 +285,7 @@ static rt_size_t _inquiry_cmd(ufunction_t func, ustorage_cbw_t cbw)
/**
* This function will handle sense request.
*
- * @param func the usb function object.
+ * @param func the usb function object.
* @param cbw the command block wrapper.
*
* @return RT_EOK on successful.
@@ -292,12 +296,12 @@ static rt_size_t _request_sense(ufunction_t func, ustorage_cbw_t cbw)
struct request_sense_data *buf;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_request_sense\n"));
-
- data = (struct mstorage*)func->user_data;
+
+ data = (struct mstorage*)func->user_data;
buf = (struct request_sense_data *)data->ep_in->buffer;
buf->ErrorCode = 0x70;
@@ -325,7 +329,7 @@ static rt_size_t _request_sense(ufunction_t func, ustorage_cbw_t cbw)
* This function will handle mode_sense_6 request.
*
* @param func the usb function object.
- * @param cbw the command block wrapper.
+ * @param cbw the command block wrapper.
*
* @return RT_EOK on successful.
*/
@@ -335,12 +339,12 @@ static rt_size_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw)
rt_uint8_t *buf;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_mode_sense_6\n"));
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
buf = data->ep_in->buffer;
buf[0] = 3;
buf[1] = 0;
@@ -360,7 +364,7 @@ static rt_size_t _mode_sense_6(ufunction_t func, ustorage_cbw_t cbw)
/**
* This function will handle read_capacities request.
*
- * @param func the usb function object.
+ * @param func the usb function object.
* @param cbw the command block wrapper.
*
* @return RT_EOK on successful.
@@ -372,12 +376,12 @@ static rt_size_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw)
rt_uint32_t sector_count, sector_size;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_read_capacities\n"));
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
buf = data->ep_in->buffer;
sector_count = data->geometry.sector_count;
sector_size = data->geometry.bytes_per_sector;
@@ -405,7 +409,7 @@ static rt_size_t _read_capacities(ufunction_t func, ustorage_cbw_t cbw)
/**
* This function will handle read_capacity request.
*
- * @param func the usb function object.
+ * @param func the usb function object.
* @param cbw the command block wapper.
*
* @return RT_EOK on successful.
@@ -418,13 +422,13 @@ static rt_size_t _read_capacity(ufunction_t func, ustorage_cbw_t cbw)
rt_uint32_t sector_count, sector_size;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_read_capacity\n"));
- data = (struct mstorage*)func->user_data;
- buf = data->ep_in->buffer;
+ data = (struct mstorage*)func->user_data;
+ buf = data->ep_in->buffer;
sector_count = data->geometry.sector_count - 1; /* Last Logical Block Address */
sector_size = data->geometry.bytes_per_sector;
@@ -459,19 +463,19 @@ static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw)
{
struct mstorage *data;
rt_size_t size;
-
+
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
data->block = cbw->cb[2]<<24 | cbw->cb[3]<<16 | cbw->cb[4]<<8 |
cbw->cb[5]<<0;
data->count = cbw->cb[7]<<8 | cbw->cb[8]<<0;
RT_ASSERT(data->count < data->geometry.sector_count);
- data->csw_response.data_reside = data->cb_data_size;
+ data->csw_response.data_reside = data->cb_data_size;
size = rt_device_read(data->disk, data->block, data->ep_in->buffer, 1);
if(size == 0)
{
@@ -479,11 +483,11 @@ static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw)
}
data->ep_in->request.buffer = data->ep_in->buffer;
- data->ep_in->request.size = data->geometry.bytes_per_sector;
- data->ep_in->request.req_type = UIO_REQUEST_WRITE;
+ data->ep_in->request.size = data->geometry.bytes_per_sector;
+ data->ep_in->request.req_type = UIO_REQUEST_WRITE;
rt_usbd_io_request(func->device, data->ep_in, &data->ep_in->request);
data->status = STAT_SEND;
-
+
return data->geometry.bytes_per_sector;
}
@@ -503,7 +507,7 @@ static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw)
RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
data->block = cbw->cb[2]<<24 | cbw->cb[3]<<16 | cbw->cb[4]<<8 |
cbw->cb[5]<<0;
@@ -515,13 +519,13 @@ static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw)
data->count, data->block, data->geometry.sector_count));
data->csw_response.data_reside = data->cb_data_size;
-
+
data->ep_out->request.buffer = data->ep_out->buffer;
- data->ep_out->request.size = data->geometry.bytes_per_sector;
+ data->ep_out->request.size = data->geometry.bytes_per_sector;
data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
data->status = STAT_RECEIVE;
-
+
return data->geometry.bytes_per_sector;
}
@@ -537,42 +541,42 @@ static rt_size_t _verify_10(ufunction_t func, ustorage_cbw_t cbw)
struct mstorage *data;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_verify_10\n"));
data = (struct mstorage*)func->user_data;
data->csw_response.status = 0;
-
+
return 0;
}
-static rt_size_t _start_stop(ufunction_t func,
+static rt_size_t _start_stop(ufunction_t func,
ustorage_cbw_t cbw)
{
struct mstorage *data;
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_start_stop\n"));
data = (struct mstorage*)func->user_data;
data->csw_response.status = 0;
-
+
return 0;
}
static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
{
struct mstorage *data;
-
+
RT_ASSERT(func != RT_NULL);
RT_ASSERT(func->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_ep_in_handler\n"));
-
- data = (struct mstorage*)func->user_data;
+
+ data = (struct mstorage*)func->user_data;
switch(data->status)
{
@@ -580,15 +584,15 @@ static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
if(data->ep_in->request.size != SIZEOF_CSW)
{
rt_kprintf("Size of csw command error\n");
- rt_usbd_ep_set_stall(func->device, data->ep_in);
+ rt_usbd_ep_set_stall(func->device, data->ep_in);
}
else
{
RT_DEBUG_LOG(RT_DEBUG_USB, ("return to cbw status\n"));
data->ep_out->request.buffer = data->ep_out->buffer;
data->ep_out->request.size = SIZEOF_CBW;
- data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
- rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
+ data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
+ rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
data->status = STAT_CBW;
}
break;
@@ -601,47 +605,47 @@ static rt_err_t _ep_in_handler(ufunction_t func, rt_size_t size)
{
data->csw_response.data_reside -= data->ep_in->request.size;
if(data->csw_response.data_reside != 0)
- {
- RT_DEBUG_LOG(RT_DEBUG_USB, ("data_reside %d, request %d\n",
+ {
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("data_reside %d, request %d\n",
data->csw_response.data_reside, data->ep_in->request.size));
if(data->processing->dir == DIR_OUT)
{
rt_usbd_ep_set_stall(func->device, data->ep_out);
}
else
- {
+ {
//rt_kprintf("warning:in stall path but not stall\n");
-
+
/* FIXME: Disable the operation or the disk cannot work. */
- //rt_usbd_ep_set_stall(func->device, data->ep_in);
+ //rt_usbd_ep_set_stall(func->device, data->ep_in);
}
data->csw_response.data_reside = 0;
}
}
_send_status(func);
break;
- case STAT_SEND:
+ case STAT_SEND:
data->csw_response.data_reside -= data->ep_in->request.size;
- data->count--;
- data->block++;
+ data->count--;
+ data->block++;
if(data->count > 0 && data->csw_response.data_reside > 0)
{
if(rt_device_read(data->disk, data->block, data->ep_in->buffer, 1) == 0)
{
rt_kprintf("disk read error\n");
rt_usbd_ep_set_stall(func->device, data->ep_in);
- return -RT_ERROR;
+ return -RT_ERROR;
}
data->ep_in->request.buffer = data->ep_in->buffer;
- data->ep_in->request.size = data->geometry.bytes_per_sector;
- data->ep_in->request.req_type = UIO_REQUEST_WRITE;
- rt_usbd_io_request(func->device, data->ep_in, &data->ep_in->request);
+ data->ep_in->request.size = data->geometry.bytes_per_sector;
+ data->ep_in->request.req_type = UIO_REQUEST_WRITE;
+ rt_usbd_io_request(func->device, data->ep_in, &data->ep_in->request);
}
else
{
- _send_status(func);
- }
+ _send_status(func);
+ }
break;
}
@@ -671,7 +675,7 @@ static struct scsi_cmd* _find_cbw_command(rt_uint16_t cmd)
{
if(cmd_data[i].cmd == cmd)
return &cmd_data[i];
- }
+ }
return RT_NULL;
}
@@ -685,7 +689,7 @@ static void _cb_len_calc(ufunction_t func, struct scsi_cmd* cmd,
RT_ASSERT(cmd != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
if(cmd->cmd_len == 6)
{
switch(cmd->type)
@@ -699,9 +703,9 @@ static void _cb_len_calc(ufunction_t func, struct scsi_cmd* cmd,
case FIXED:
data->cb_data_size = cmd->data_size;
break;
- default:
+ default:
break;
- }
+ }
}
else if(cmd->cmd_len == 10)
{
@@ -711,32 +715,32 @@ static void _cb_len_calc(ufunction_t func, struct scsi_cmd* cmd,
data->cb_data_size = cbw->cb[7]<<8 | cbw->cb[8];
break;
case BLOCK_COUNT:
- data->cb_data_size = (cbw->cb[7]<<8 | cbw->cb[8]) *
+ data->cb_data_size = (cbw->cb[7]<<8 | cbw->cb[8]) *
data->geometry.bytes_per_sector;
break;
case FIXED:
data->cb_data_size = cmd->data_size;
break;
- default:
+ default:
break;
}
}
-
+
//workaround: for stability in full-speed mode
else if(cmd->cmd_len == 12)
{
switch(cmd->type)
{
case COUNT:
- data->cb_data_size = cbw->cb[4];
+ data->cb_data_size = cbw->cb[4];
break;
- default:
+ default:
break;
}
}
else
{
- rt_kprintf("cmd_len error %d\n", cmd->cmd_len);
+ rt_kprintf("cmd_len error %d\n", cmd->cmd_len);
}
}
@@ -749,7 +753,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
RT_ASSERT(cbw != RT_NULL);
RT_ASSERT(func != RT_NULL);
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
if(cmd->cmd_len != cbw->cb_len)
{
rt_kprintf("cb_len error\n");
@@ -780,7 +784,7 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
rt_kprintf("xfer_len > data_size\n");
return RT_FALSE;
}
-
+
if(cbw->xfer_len < data->cb_data_size)
{
rt_kprintf("xfer_len < data_size\n");
@@ -788,18 +792,18 @@ static rt_bool_t _cbw_verify(ufunction_t func, struct scsi_cmd* cmd,
data->csw_response.status = 1;
}
- return RT_TRUE;
+ return RT_TRUE;
}
static rt_size_t _cbw_handler(ufunction_t func, struct scsi_cmd* cmd,
ustorage_cbw_t cbw)
-{
+{
struct mstorage *data;
RT_ASSERT(func != RT_NULL);
RT_ASSERT(cbw != RT_NULL);
RT_ASSERT(cmd->handler != RT_NULL);
-
+
data = (struct mstorage*)func->user_data;
data->processing = cmd;
return cmd->handler(func, cbw);
@@ -819,21 +823,21 @@ static rt_err_t _ep_out_handler(ufunction_t func, rt_size_t size)
struct scsi_cmd* cmd;
rt_size_t len;
struct ustorage_cbw* cbw;
-
+
RT_ASSERT(func != RT_NULL);
RT_ASSERT(func->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_ep_out_handler %d\n", size));
-
+
data = (struct mstorage*)func->user_data;
- cbw = (struct ustorage_cbw*)data->ep_out->buffer;
+ cbw = (struct ustorage_cbw*)data->ep_out->buffer;
if(data->status == STAT_CBW)
{
/* dump cbw information */
if(cbw->signature != CBW_SIGNATURE || size != SIZEOF_CBW)
{
goto exit;
- }
+ }
data->csw_response.signature = CSW_SIGNATURE;
data->csw_response.tag = cbw->tag;
@@ -841,33 +845,33 @@ static rt_err_t _ep_out_handler(ufunction_t func, rt_size_t size)
data->csw_response.status = 0;
RT_DEBUG_LOG(RT_DEBUG_USB, ("ep_out reside %d\n", data->csw_response.data_reside));
-
+
cmd = _find_cbw_command(cbw->cb[0]);
if(cmd == RT_NULL)
{
rt_kprintf("can't find cbw command\n");
goto exit;
- }
+ }
_cb_len_calc(func, cmd, cbw);
if(!_cbw_verify(func, cmd, cbw))
{
goto exit;
}
-
+
len = _cbw_handler(func, cmd, cbw);
if(len == 0)
{
_send_status(func);
- }
-
- return RT_EOK;
+ }
+
+ return RT_EOK;
}
else if(data->status == STAT_RECEIVE)
{
RT_DEBUG_LOG(RT_DEBUG_USB, ("\nwrite size %d block 0x%x oount 0x%x\n",
size, data->block, data->size));
-
+
data->size -= size;
data->csw_response.data_reside -= size;
@@ -876,10 +880,10 @@ static rt_err_t _ep_out_handler(ufunction_t func, rt_size_t size)
if(data->csw_response.data_reside != 0)
{
data->ep_out->request.buffer = data->ep_out->buffer;
- data->ep_out->request.size = data->geometry.bytes_per_sector;
- data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
+ data->ep_out->request.size = data->geometry.bytes_per_sector;
+ data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
- data->block ++;
+ data->block ++;
}
else
{
@@ -904,7 +908,7 @@ exit:
}
data->csw_response.status = 1;
_send_status(func);
-
+
return -RT_ERROR;
}
@@ -919,21 +923,21 @@ exit:
static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)
{
rt_uint8_t lun = 0;
-
+
RT_ASSERT(func != RT_NULL);
- RT_ASSERT(func->device != RT_NULL);
+ RT_ASSERT(func->device != RT_NULL);
RT_ASSERT(setup != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("mstorage_interface_handler\n"));
switch(setup->bRequest)
{
- case USBREQ_GET_MAX_LUN:
-
+ case USBREQ_GET_MAX_LUN:
+
RT_DEBUG_LOG(RT_DEBUG_USB, ("USBREQ_GET_MAX_LUN\n"));
-
+
if(setup->wValue || setup->wLength != 1)
- {
+ {
rt_usbd_ep0_set_stall(func->device);
}
else
@@ -944,14 +948,14 @@ static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)
case USBREQ_MASS_STORAGE_RESET:
RT_DEBUG_LOG(RT_DEBUG_USB, ("USBREQ_MASS_STORAGE_RESET\n"));
-
+
if(setup->wValue || setup->wLength != 0)
{
rt_usbd_ep0_set_stall(func->device);
}
else
- {
- dcd_ep0_send_status(func->device->dcd);
+ {
+ dcd_ep0_send_status(func->device->dcd);
}
break;
default:
@@ -992,14 +996,14 @@ static rt_err_t _function_enable(ufunction_t func)
rt_kprintf("disk open error\n");
return -RT_ERROR;
}
-
- if(rt_device_control(data->disk, RT_DEVICE_CTRL_BLK_GETGEOME,
+
+ if(rt_device_control(data->disk, RT_DEVICE_CTRL_BLK_GETGEOME,
(void*)&data->geometry) != RT_EOK)
{
rt_kprintf("get disk info error\n");
return -RT_ERROR;
}
-
+
data->ep_in->buffer = (rt_uint8_t*)rt_malloc(data->geometry.bytes_per_sector);
if(data->ep_in->buffer == RT_NULL)
{
@@ -1012,14 +1016,14 @@ static rt_err_t _function_enable(ufunction_t func)
rt_free(data->ep_in->buffer);
rt_kprintf("no memory\n");
return -RT_ENOMEM;
- }
-
+ }
+
/* prepare to read CBW request */
data->ep_out->request.buffer = data->ep_out->buffer;
- data->ep_out->request.size = SIZEOF_CBW;
- data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
+ data->ep_out->request.size = SIZEOF_CBW;
+ data->ep_out->request.req_type = UIO_REQUEST_READ_FULL;
rt_usbd_io_request(func->device, data->ep_out, &data->ep_out->request);
-
+
return RT_EOK;
}
@@ -1037,11 +1041,11 @@ static rt_err_t _function_disable(ufunction_t func)
RT_DEBUG_LOG(RT_DEBUG_USB, ("Mass storage function disabled\n"));
- data = (struct mstorage*)func->user_data;
+ data = (struct mstorage*)func->user_data;
if(data->ep_in->buffer != RT_NULL)
{
rt_free(data->ep_in->buffer);
- data->ep_in->buffer = RT_NULL;
+ data->ep_in->buffer = RT_NULL;
}
if(data->ep_out->buffer != RT_NULL)
@@ -1057,9 +1061,9 @@ static rt_err_t _function_disable(ufunction_t func)
#endif
data->disk = RT_NULL;
}
-
+
data->status = STAT_CBW;
-
+
return RT_EOK;
}
@@ -1097,12 +1101,16 @@ ufunction_t rt_usbd_function_mstorage_create(udevice_t device)
RT_ASSERT(device != RT_NULL);
/* set usb device string description */
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, MSTRORAGE_INTF_STR_INDEX, _ustring[2]);
+#else
rt_usbd_device_set_string(device, _ustring);
-
+#endif
+
/* create a mass storage function */
func = rt_usbd_function_new(device, &dev_desc, &ops);
device->dev_qualifier = &dev_qualifier;
-
+
/* allocate memory for mass storage function data */
data = (struct mstorage*)rt_malloc(sizeof(struct mstorage));
rt_memset(data, 0, sizeof(struct mstorage));
@@ -1113,7 +1121,7 @@ ufunction_t rt_usbd_function_mstorage_create(udevice_t device)
/* create an alternate setting object */
setting = rt_usbd_altsetting_new(sizeof(struct umass_descriptor));
-
+
/* config desc in alternate setting */
rt_usbd_altsetting_config_descriptor(setting, &_mass_desc, (rt_off_t)&((umass_desc_t)0)->intf_desc);
@@ -1138,7 +1146,7 @@ ufunction_t rt_usbd_function_mstorage_create(udevice_t device)
return func;
}
-struct udclass msc_class =
+struct udclass msc_class =
{
.rt_usbd_function_create = rt_usbd_function_mstorage_create
};
diff --git a/components/drivers/usb/usbdevice/class/mstorage.h b/components/drivers/usb/usbdevice/class/mstorage.h
index 254038195b..6c81809ef2 100644
--- a/components/drivers/usb/usbdevice/class/mstorage.h
+++ b/components/drivers/usb/usbdevice/class/mstorage.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -8,7 +8,7 @@
* 2012-10-01 Yi Qiu first version
* 2012-12-12 heyuanjie87 add MASS endpoints collection
*/
-
+
#ifndef __MSTORAGE_H__
#define __MSTORAGE_H__
@@ -23,7 +23,7 @@ struct umass_descriptor
#endif
struct uinterface_descriptor intf_desc;
struct uendpoint_descriptor ep_out_desc;
- struct uendpoint_descriptor ep_in_desc;
+ struct uendpoint_descriptor ep_in_desc;
};
typedef struct umass_descriptor* umass_desc_t;
diff --git a/components/drivers/usb/usbdevice/class/ndis.h b/components/drivers/usb/usbdevice/class/ndis.h
index 6d6943366e..b83f3c78ec 100644
--- a/components/drivers/usb/usbdevice/class/ndis.h
+++ b/components/drivers/usb/usbdevice/class/ndis.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -7,14 +7,14 @@
* Date Author Notes
*/
/*
- * ndis.h
- *
+ * ndis.h
+ *
* Modified by Colin O'Flynn <[email protected]>
* ntddndis.h modified by Benedikt Spranger <[email protected]>
- *
- * Thanks to the cygwin development team,
+ *
+ * Thanks to the cygwin development team,
* espacially to Casper S. Hornstrup <[email protected]>
- *
+ *
* THIS SOFTWARE IS NOT COPYRIGHTED
*
* This source code is offered for use in the public domain. You may
@@ -30,7 +30,7 @@
#ifndef __NDIS_H__
#define __NDIS_H__
-#define NDIS_STATUS_MULTICAST_FULL 0xC0010009
+#define NDIS_STATUS_MULTICAST_FULL 0xC0010009
#define NDIS_STATUS_MULTICAST_EXISTS 0xC001000A
#define NDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B
@@ -42,21 +42,21 @@
#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104
#define OID_PNP_ENABLE_WAKE_UP 0xFD010106
-enum NDIS_DEVICE_POWER_STATE
+enum NDIS_DEVICE_POWER_STATE
{
- NdisDeviceStateUnspecified = 0,
- NdisDeviceStateD0,
- NdisDeviceStateD1,
- NdisDeviceStateD2,
- NdisDeviceStateD3,
- NdisDeviceStateMaximum
+ NdisDeviceStateUnspecified = 0,
+ NdisDeviceStateD0,
+ NdisDeviceStateD1,
+ NdisDeviceStateD2,
+ NdisDeviceStateD3,
+ NdisDeviceStateMaximum
};
struct NDIS_PM_WAKE_UP_CAPABILITIES
{
- enum NDIS_DEVICE_POWER_STATE MinMagicPacketWakeUp;
- enum NDIS_DEVICE_POWER_STATE MinPatternWakeUp;
- enum NDIS_DEVICE_POWER_STATE MinLinkChangeWakeUp;
+ enum NDIS_DEVICE_POWER_STATE MinMagicPacketWakeUp;
+ enum NDIS_DEVICE_POWER_STATE MinPatternWakeUp;
+ enum NDIS_DEVICE_POWER_STATE MinLinkChangeWakeUp;
};
/* NDIS_PNP_CAPABILITIES.Flags constants */
@@ -194,36 +194,36 @@ struct NDIS_PM_WAKE_UP_CAPABILITIES
#define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS 0x00800000
#define NDIS_MINIPORT_64BITS_DMA 0x01000000
-#define NDIS_MEDIUM_802_3 0x00000000
-#define NDIS_MEDIUM_802_5 0x00000001
-#define NDIS_MEDIUM_FDDI 0x00000002
-#define NDIS_MEDIUM_WAN 0x00000003
-#define NDIS_MEDIUM_LOCAL_TALK 0x00000004
-#define NDIS_MEDIUM_DIX 0x00000005
+#define NDIS_MEDIUM_802_3 0x00000000
+#define NDIS_MEDIUM_802_5 0x00000001
+#define NDIS_MEDIUM_FDDI 0x00000002
+#define NDIS_MEDIUM_WAN 0x00000003
+#define NDIS_MEDIUM_LOCAL_TALK 0x00000004
+#define NDIS_MEDIUM_DIX 0x00000005
#define NDIS_MEDIUM_ARCENT_RAW 0x00000006
#define NDIS_MEDIUM_ARCENT_878_2 0x00000007
-#define NDIS_MEDIUM_ATM 0x00000008
+#define NDIS_MEDIUM_ATM 0x00000008
#define NDIS_MEDIUM_WIRELESS_LAN 0x00000009
-#define NDIS_MEDIUM_IRDA 0x0000000A
-#define NDIS_MEDIUM_BPC 0x0000000B
-#define NDIS_MEDIUM_CO_WAN 0x0000000C
-#define NDIS_MEDIUM_1394 0x0000000D
+#define NDIS_MEDIUM_IRDA 0x0000000A
+#define NDIS_MEDIUM_BPC 0x0000000B
+#define NDIS_MEDIUM_CO_WAN 0x0000000C
+#define NDIS_MEDIUM_1394 0x0000000D
-#define NDIS_PACKET_TYPE_DIRECTED 0x00000001
-#define NDIS_PACKET_TYPE_MULTICAST 0x00000002
-#define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004
-#define NDIS_PACKET_TYPE_BROADCAST 0x00000008
-#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010
-#define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020
-#define NDIS_PACKET_TYPE_SMT 0x00000040
-#define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080
-#define NDIS_PACKET_TYPE_GROUP 0x00000100
-#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00000200
-#define NDIS_PACKET_TYPE_FUNCTIONAL 0x00000400
-#define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800
+#define NDIS_PACKET_TYPE_DIRECTED 0x00000001
+#define NDIS_PACKET_TYPE_MULTICAST 0x00000002
+#define NDIS_PACKET_TYPE_ALL_MULTICAST 0x00000004
+#define NDIS_PACKET_TYPE_BROADCAST 0x00000008
+#define NDIS_PACKET_TYPE_SOURCE_ROUTING 0x00000010
+#define NDIS_PACKET_TYPE_PROMISCUOUS 0x00000020
+#define NDIS_PACKET_TYPE_SMT 0x00000040
+#define NDIS_PACKET_TYPE_ALL_LOCAL 0x00000080
+#define NDIS_PACKET_TYPE_GROUP 0x00000100
+#define NDIS_PACKET_TYPE_ALL_FUNCTIONAL 0x00000200
+#define NDIS_PACKET_TYPE_FUNCTIONAL 0x00000400
+#define NDIS_PACKET_TYPE_MAC_FRAME 0x00000800
-#define NDIS_MEDIA_STATE_CONNECTED 0x00000000
-#define NDIS_MEDIA_STATE_DISCONNECTED 0x00000001
+#define NDIS_MEDIA_STATE_CONNECTED 0x00000000
+#define NDIS_MEDIA_STATE_DISCONNECTED 0x00000001
#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001
#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED 0x00000002
diff --git a/components/drivers/usb/usbdevice/class/rndis.c b/components/drivers/usb/usbdevice/class/rndis.c
index 93e0ba6ae2..ee25ec1ddf 100644
--- a/components/drivers/usb/usbdevice/class/rndis.c
+++ b/components/drivers/usb/usbdevice/class/rndis.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -28,7 +28,7 @@
#define DBG_SECTION_NAME "RNDIS"
#include <rtdbg.h>
-
+#define RNDIS_INTF_STR_INDEX 12
/* RT-Thread LWIP ethernet interface */
#include <netif/ethernetif.h>
@@ -123,7 +123,11 @@ const static struct ucdc_comm_descriptor _comm_desc =
USB_CDC_CLASS_COMM,
USB_CDC_SUBCLASS_ACM,
USB_CDC_PROTOCOL_VENDOR,
+#ifdef RT_USB_DEVICE_COMPOSITE
+ RNDIS_INTF_STR_INDEX,
+#else
0x00,
+#endif
},
/* Header Functional Descriptor */
{
@@ -215,7 +219,7 @@ const static char* _ustring[] =
};
ALIGN(4)
-struct usb_os_function_comp_id_descriptor rndis_func_comp_id_desc =
+struct usb_os_function_comp_id_descriptor rndis_func_comp_id_desc =
{
.bFirstInterfaceNumber = USB_DYNAMIC,
.reserved1 = 0x01,
@@ -347,7 +351,7 @@ static rt_err_t _rndis_init_response(ufunction_t func, rndis_init_msg_t msg)
rt_list_insert_before(&((rt_rndis_eth_t)func->user_data)->response_list, &response->list);
rt_hw_interrupt_enable(level);
}
-
+
return RT_EOK;
}
@@ -764,7 +768,7 @@ static rt_err_t send_encapsulated_command_done(udevice_t device, rt_size_t size)
}
//#error here have bug ep 0x82 send failed
static rt_err_t _rndis_send_encapsulated_command(ufunction_t func, ureq_t setup)
-{
+{
RT_ASSERT(setup->wLength <= sizeof(rndis_message_buffer));
function = func;
rt_usbd_ep0_read(func->device,rndis_message_buffer,setup->wLength,send_encapsulated_command_done);
@@ -808,7 +812,7 @@ static rt_err_t _rndis_get_encapsulated_response(ufunction_t func, ureq_t setup)
data[1] = 0;
((rt_rndis_eth_t)func->user_data)->eps.ep_cmd->request.buffer = ((rt_rndis_eth_t)func->user_data)->eps.ep_cmd->buffer;
((rt_rndis_eth_t)func->user_data)->eps.ep_cmd->request.size = 8;
- ((rt_rndis_eth_t)func->user_data)->eps.ep_cmd->request.req_type = UIO_REQUEST_WRITE;
+ ((rt_rndis_eth_t)func->user_data)->eps.ep_cmd->request.req_type = UIO_REQUEST_WRITE;
rt_usbd_io_request(func->device, ((rt_rndis_eth_t)func->user_data)->eps.ep_cmd, &((rt_rndis_eth_t)func->user_data)->eps.ep_cmd->request);
}
else
@@ -983,7 +987,7 @@ static rt_err_t _function_enable(ufunction_t func)
((rt_rndis_eth_t)func->user_data)->need_notify = RT_TRUE;
rt_hw_interrupt_enable(level);
}
-
+
return RT_EOK;
}
@@ -1022,7 +1026,7 @@ static rt_err_t _function_disable(ufunction_t func)
rt_hw_interrupt_enable(level);
}
-
+
/* link down. */
eth_device_linkchange(&((rt_rndis_eth_t)func->user_data)->parent, RT_FALSE);
@@ -1318,12 +1322,15 @@ ufunction_t rt_usbd_function_rndis_create(udevice_t device)
RT_ASSERT(device != RT_NULL);
/* set usb device string description */
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, RNDIS_INTF_STR_INDEX, _ustring[2]);
+#else
rt_usbd_device_set_string(device, _ustring);
-
+#endif
/* create a cdc class */
cdc = rt_usbd_function_new(device, &_dev_desc, &ops);
rt_usbd_device_set_qualifier(device, &dev_qualifier);
- _rndis= rt_malloc(sizeof(struct rt_rndis_eth));
+ _rndis= rt_malloc(sizeof(struct rt_rndis_eth));
rt_memset(_rndis, 0, sizeof(struct rt_rndis_eth));
cdc->user_data = _rndis;
@@ -1357,7 +1364,7 @@ ufunction_t rt_usbd_function_rndis_create(udevice_t device)
rt_usbd_set_altsetting(intf_comm, 0);
/* add the communication interface to the cdc class */
rt_usbd_function_add_interface(cdc, intf_comm);
-
+
/* create a bulk in and a bulk out endpoint */
data_desc = (ucdc_data_desc_t)data_setting->desc;
eps->ep_out = rt_usbd_endpoint_new(&data_desc->ep_out_desc, _ep_out_handler);
@@ -1434,7 +1441,7 @@ ufunction_t rt_usbd_function_rndis_create(udevice_t device)
return cdc;
}
-struct udclass rndis_class =
+struct udclass rndis_class =
{
.rt_usbd_function_create = rt_usbd_function_rndis_create
};
diff --git a/components/drivers/usb/usbdevice/class/rndis.h b/components/drivers/usb/usbdevice/class/rndis.h
index fcdd249984..f25ae4931c 100644
--- a/components/drivers/usb/usbdevice/class/rndis.h
+++ b/components/drivers/usb/usbdevice/class/rndis.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -13,43 +13,43 @@
#include <rtthread.h>
-#define USB_ETH_MTU 1500+14
+#define USB_ETH_MTU 1500+14
#define RNDIS_MESSAGE_BUFFER_SIZE 128
#define RESPONSE_AVAILABLE 0x00000001
/* Remote NDIS version numbers */
-#define RNDIS_MAJOR_VERSION 1
+#define RNDIS_MAJOR_VERSION 1
#define RNDIS_MINOR_VERSION 0
/* common status values */
-#define RNDIS_STATUS_SUCCESS 0X00000000
-#define RNDIS_STATUS_FAILURE 0XC0000001
-#define RNDIS_STATUS_INVALID_DATA 0XC0010015
-#define RNDIS_STATUS_NOT_SUPPORTED 0XC00000BB
-#define RNDIS_STATUS_MEDIA_CONNECT 0X4001000B
-#define RNDIS_STATUS_MEDIA_DISCONNECT 0X4001000C
+#define RNDIS_STATUS_SUCCESS 0X00000000
+#define RNDIS_STATUS_FAILURE 0XC0000001
+#define RNDIS_STATUS_INVALID_DATA 0XC0010015
+#define RNDIS_STATUS_NOT_SUPPORTED 0XC00000BB
+#define RNDIS_STATUS_MEDIA_CONNECT 0X4001000B
+#define RNDIS_STATUS_MEDIA_DISCONNECT 0X4001000C
/* Remote NDIS message types */
-#define REMOTE_NDIS_PACKET_MSG 0x00000001
-#define REMOTE_NDIS_INITIALIZE_MSG 0X00000002
-#define REMOTE_NDIS_HALT_MSG 0X00000003
-#define REMOTE_NDIS_QUERY_MSG 0X00000004
-#define REMOTE_NDIS_SET_MSG 0X00000005
-#define REMOTE_NDIS_RESET_MSG 0X00000006
+#define REMOTE_NDIS_PACKET_MSG 0x00000001
+#define REMOTE_NDIS_INITIALIZE_MSG 0X00000002
+#define REMOTE_NDIS_HALT_MSG 0X00000003
+#define REMOTE_NDIS_QUERY_MSG 0X00000004
+#define REMOTE_NDIS_SET_MSG 0X00000005
+#define REMOTE_NDIS_RESET_MSG 0X00000006
#define REMOTE_NDIS_INDICATE_STATUS_MSG 0X00000007
-#define REMOTE_NDIS_KEEPALIVE_MSG 0X00000008
-#define REMOTE_NDIS_INITIALIZE_CMPLT 0X80000002
-#define REMOTE_NDIS_QUERY_CMPLT 0X80000004
-#define REMOTE_NDIS_SET_CMPLT 0X80000005
-#define REMOTE_NDIS_RESET_CMPLT 0X80000006
-#define REMOTE_NDIS_KEEPALIVE_CMPLT 0X80000008
+#define REMOTE_NDIS_KEEPALIVE_MSG 0X00000008
+#define REMOTE_NDIS_INITIALIZE_CMPLT 0X80000002
+#define REMOTE_NDIS_QUERY_CMPLT 0X80000004
+#define REMOTE_NDIS_SET_CMPLT 0X80000005
+#define REMOTE_NDIS_RESET_CMPLT 0X80000006
+#define REMOTE_NDIS_KEEPALIVE_CMPLT 0X80000008
/* device flags */
-#define RNDIS_DF_CONNECTIONLESS 0x00000001
-#define RNDIS_DF_CONNECTION_ORIENTED 0x00000002
+#define RNDIS_DF_CONNECTIONLESS 0x00000001
+#define RNDIS_DF_CONNECTION_ORIENTED 0x00000002
/* mediums */
-#define RNDIS_MEDIUM_802_3 0x00000000
+#define RNDIS_MEDIUM_802_3 0x00000000
struct ucls_rndis
{
@@ -64,24 +64,24 @@ struct ucls_rndis
/* Remote NDIS generic message type */
struct rndis_gen_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
};
typedef struct rndis_gen_msg* rndis_gen_msg_t;
struct rndis_packet_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t DataOffset;
- rt_uint32_t DataLength;
- rt_uint32_t OOBDataOffset;
- rt_uint32_t OOBDataLength;
- rt_uint32_t NumOOBDataElements;
- rt_uint32_t PerPacketInfoOffset;
- rt_uint32_t PerPacketInfoLength;
- rt_uint32_t VcHandle;
- rt_uint32_t Reserved;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t DataOffset;
+ rt_uint32_t DataLength;
+ rt_uint32_t OOBDataOffset;
+ rt_uint32_t OOBDataLength;
+ rt_uint32_t NumOOBDataElements;
+ rt_uint32_t PerPacketInfoOffset;
+ rt_uint32_t PerPacketInfoLength;
+ rt_uint32_t VcHandle;
+ rt_uint32_t Reserved;
};
typedef struct rndis_packet_msg* rndis_packet_msg_t;
@@ -89,132 +89,132 @@ typedef struct rndis_packet_msg* rndis_packet_msg_t;
struct rndis_init_msg
{
rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t MajorVersion;
- rt_uint32_t MinorVersion;
- rt_uint32_t MaxTransferSize;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t MajorVersion;
+ rt_uint32_t MinorVersion;
+ rt_uint32_t MaxTransferSize;
};
typedef struct rndis_init_msg* rndis_init_msg_t;
/* Response */
struct rndis_init_cmplt
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t Status;
- rt_uint32_t MajorVersion;
- rt_uint32_t MinorVersion;
- rt_uint32_t DeviceFlags;
- rt_uint32_t Medium;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t Status;
+ rt_uint32_t MajorVersion;
+ rt_uint32_t MinorVersion;
+ rt_uint32_t DeviceFlags;
+ rt_uint32_t Medium;
rt_uint32_t MaxPacketsPerTransfer;
- rt_uint32_t MaxTransferSize;
+ rt_uint32_t MaxTransferSize;
rt_uint32_t PacketAlignmentFactor;
- rt_uint32_t AfListOffset;
- rt_uint32_t AfListSize;
+ rt_uint32_t AfListOffset;
+ rt_uint32_t AfListSize;
};
typedef struct rndis_init_cmplt* rndis_init_cmplt_t;
/* Remote NDIS Halt Message */
struct rndis_halt_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
};
/* Remote NDIS Query Message */
struct rndis_query_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t Oid;
- rt_uint32_t InformationBufferLength;
- rt_uint32_t InformationBufferOffset;
- rt_uint32_t DeviceVcHandle;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t Oid;
+ rt_uint32_t InformationBufferLength;
+ rt_uint32_t InformationBufferOffset;
+ rt_uint32_t DeviceVcHandle;
};
typedef struct rndis_query_msg* rndis_query_msg_t;
/* Response */
struct rndis_query_cmplt
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t Status;
- rt_uint32_t InformationBufferLength;
- rt_uint32_t InformationBufferOffset;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t Status;
+ rt_uint32_t InformationBufferLength;
+ rt_uint32_t InformationBufferOffset;
};
typedef struct rndis_query_cmplt* rndis_query_cmplt_t;
/* Remote NDIS Set Message */
struct rndis_set_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t Oid;
- rt_uint32_t InformationBufferLength;
- rt_uint32_t InformationBufferOffset;
- rt_uint32_t DeviceVcHandle;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t Oid;
+ rt_uint32_t InformationBufferLength;
+ rt_uint32_t InformationBufferOffset;
+ rt_uint32_t DeviceVcHandle;
};
typedef struct rndis_set_msg* rndis_set_msg_t;
/* Response */
struct rndis_set_cmplt
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t Status;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t Status;
};
typedef struct rndis_set_cmplt* rndis_set_cmplt_t;
/* Remote NDIS Soft Reset Message */
struct rndis_reset_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t Reserved;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t Reserved;
};
/* Remote NDIS Soft Reset Response */
struct rndis_reset_cmplt
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t Status;
- rt_uint32_t AddressingReset;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t Status;
+ rt_uint32_t AddressingReset;
};
/* Remote NDIS Indicate Status Message */
struct rndis_indicate_status_msg
{
rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t Status;
- rt_uint32_t StatusBufferLength;
- rt_uint32_t StatusBufferOffset;
+ rt_uint32_t MessageLength;
+ rt_uint32_t Status;
+ rt_uint32_t StatusBufferLength;
+ rt_uint32_t StatusBufferOffset;
};
typedef struct rndis_indicate_status_msg* rndis_indicate_status_msg_t;
struct rndis_keepalive_msg
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestID;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestID;
};
typedef struct rndis_keepalive_msg* rndis_keepalive_msg_t;
/* Response: */
struct rndis_keepalive_cmplt
{
- rt_uint32_t MessageType;
- rt_uint32_t MessageLength;
- rt_uint32_t RequestId;
- rt_uint32_t Status;
+ rt_uint32_t MessageType;
+ rt_uint32_t MessageLength;
+ rt_uint32_t RequestId;
+ rt_uint32_t Status;
};
typedef struct rndis_keepalive_cmplt* rndis_keepalive_cmplt_t;
diff --git a/components/drivers/usb/usbdevice/class/uaudioreg.h b/components/drivers/usb/usbdevice/class/uaudioreg.h
new file mode 100644
index 0000000000..6ed8614c39
--- /dev/null
+++ b/components/drivers/usb/usbdevice/class/uaudioreg.h
@@ -0,0 +1,418 @@
+/* $NetBSD: uaudioreg.h,v 1.15.38.1 2012/06/02 11:09:29 mrg Exp $ */
+
+/*
+ * Copyright (c) 1999 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Lennart Augustsson ([email protected]) at
+ * Carlstedt Research & Technology.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+#include <rtdef.h>
+
+typedef uint8_t uByte;
+typedef uint16_t uWord;
+
+#define UPACKED __attribute__ ((packed))
+
+#define UAUDIO_VERSION 0x100
+
+#define USB_SUBCLASS_AUDIOCONTROL 1
+#define USB_SUBCLASS_AUDIOSTREAMING 2
+#define USB_SUBCLASS_AUDIOMIDISTREAM 3
+
+#define UDESC_CS_CONFIG 0x22
+#define UDESC_CS_STRING 0x23
+#define UDESC_CS_INTERFACE 0x24
+#define UDESC_CS_ENDPOINT 0x25
+
+#define UDESCSUB_AC_HEADER 1
+#define UDESCSUB_AC_INPUT 2
+#define UDESCSUB_AC_OUTPUT 3
+#define UDESCSUB_AC_MIXER 4
+#define UDESCSUB_AC_SELECTOR 5
+#define UDESCSUB_AC_FEATURE 6
+#define UDESCSUB_AC_PROCESSING 7
+#define UDESCSUB_AC_EXTENSION 8
+
+#ifndef AUFMT_MAX_FREQUENCIES
+#define AUFMT_MAX_FREQUENCIES 1
+#endif
+
+/* The first fields are identical to usb_endpoint_descriptor_t */
+typedef struct {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bEndpointAddress;
+ uByte bmAttributes;
+ uWord wMaxPacketSize;
+ uByte bInterval;
+ /*
+ * The following two entries are only used by the Audio Class.
+ * And according to the specs the Audio Class is the only one
+ * allowed to extend the endpoint descriptor.
+ * Who knows what goes on in the minds of the people in the USB
+ * standardization? :-(
+ */
+ uByte bRefresh;
+ uByte bSynchAddress;
+} UPACKED usb_endpoint_descriptor_audio_t;
+
+/* generic, for iteration */
+typedef struct {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+} UPACKED uaudio_cs_descriptor_t;
+
+struct usb_audio_control_descriptor {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uWord bcdADC;
+ uWord wTotalLength;
+ uByte bInCollection;
+ uByte baInterfaceNr[1];
+} UPACKED;
+
+struct usb_audio_streaming_interface_descriptor {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bTerminalLink;
+ uByte bDelay;
+ uWord wFormatTag;
+} UPACKED;
+
+struct usb_audio_streaming_endpoint_descriptor {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bmAttributes;
+#define UA_SED_FREQ_CONTROL 0x01
+#define UA_SED_PITCH_CONTROL 0x02
+#define UA_SED_MAXPACKETSONLY 0x80
+ uByte bLockDelayUnits;
+ uWord wLockDelay;
+} UPACKED;
+
+struct usb_audio_streaming_type1_descriptor {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bFormatType;
+ uByte bNrChannels;
+ uByte bSubFrameSize;
+ uByte bBitResolution;
+ uByte bSamFreqType;
+#define UA_SAMP_CONTNUOUS 0
+ uByte tSamFreq[3*AUFMT_MAX_FREQUENCIES];
+#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16))
+#define UA_SAMP_LO(p) UA_GETSAMP(p, 0)
+#define UA_SAMP_HI(p) UA_GETSAMP(p, 1)
+} UPACKED;
+
+struct usb_audio_cluster {
+ uByte bNrChannels;
+ uWord wChannelConfig;
+#define UA_CHANNEL_LEFT 0x0001
+#define UA_CHANNEL_RIGHT 0x0002
+#define UA_CHANNEL_CENTER 0x0004
+#define UA_CHANNEL_LFE 0x0008
+#define UA_CHANNEL_L_SURROUND 0x0010
+#define UA_CHANNEL_R_SURROUND 0x0020
+#define UA_CHANNEL_L_CENTER 0x0040
+#define UA_CHANNEL_R_CENTER 0x0080
+#define UA_CHANNEL_SURROUND 0x0100
+#define UA_CHANNEL_L_SIDE 0x0200
+#define UA_CHANNEL_R_SIDE 0x0400
+#define UA_CHANNEL_TOP 0x0800
+ uByte iChannelNames;
+} UPACKED;
+
+/* Shared by all units and terminals */
+struct usb_audio_unit {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bUnitId;
+};
+
+/* UDESCSUB_AC_INPUT */
+struct usb_audio_input_terminal {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bTerminalId;
+ uWord wTerminalType;
+ uByte bAssocTerminal;
+ uByte bNrChannels;
+ uWord wChannelConfig;
+ uByte iChannelNames;
+ uByte iTerminal;
+} UPACKED;
+
+/* UDESCSUB_AC_OUTPUT */
+struct usb_audio_output_terminal {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bTerminalId;
+ uWord wTerminalType;
+ uByte bAssocTerminal;
+ uByte bSourceId;
+ uByte iTerminal;
+} UPACKED;
+
+/* UDESCSUB_AC_MIXER */
+struct usb_audio_mixer_unit {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bUnitId;
+ uByte bNrInPins;
+ uByte baSourceId[255]; /* [bNrInPins] */
+ /* struct usb_audio_mixer_unit_1 */
+} UPACKED;
+struct usb_audio_mixer_unit_1 {
+ uByte bNrChannels;
+ uWord wChannelConfig;
+ uByte iChannelNames;
+ uByte bmControls[255]; /* [bNrChannels] */
+ /*uByte iMixer;*/
+} UPACKED;
+
+/* UDESCSUB_AC_SELECTOR */
+struct usb_audio_selector_unit {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bUnitId;
+ uByte bNrInPins;
+ uByte baSourceId[255]; /* [bNrInPins] */
+ /* uByte iSelector; */
+} UPACKED;
+
+/* UDESCSUB_AC_FEATURE */
+struct usb_audio_feature_unit {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bUnitId;
+ uByte bSourceId;
+ uByte bControlSize;
+ uByte bmaControls[2]; /* size for more than enough */
+ /* uByte iFeature; */
+} UPACKED;
+
+/* UDESCSUB_AC_PROCESSING */
+struct usb_audio_processing_unit {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bUnitId;
+ uWord wProcessType;
+ uByte bNrInPins;
+ uByte baSourceId[255]; /* [bNrInPins] */
+ /* struct usb_audio_processing_unit_1 */
+} UPACKED;
+struct usb_audio_processing_unit_1{
+ uByte bNrChannels;
+ uWord wChannelConfig;
+ uByte iChannelNames;
+ uByte bControlSize;
+ uByte bmControls[255]; /* [bControlSize] */
+#define UA_PROC_ENABLE_MASK 1
+} UPACKED;
+
+struct usb_audio_processing_unit_updown {
+ uByte iProcessing;
+ uByte bNrModes;
+ uWord waModes[255]; /* [bNrModes] */
+} UPACKED;
+
+/* UDESCSUB_AC_EXTENSION */
+struct usb_audio_extension_unit {
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+ uByte bUnitId;
+ uWord wExtensionCode;
+ uByte bNrInPins;
+ uByte baSourceId[255]; /* [bNrInPins] */
+ /* struct usb_audio_extension_unit_1 */
+} UPACKED;
+struct usb_audio_extension_unit_1 {
+ uByte bNrChannels;
+ uWord wChannelConfig;
+ uByte iChannelNames;
+ uByte bControlSize;
+ uByte bmControls[255]; /* [bControlSize] */
+#define UA_EXT_ENABLE_MASK 1
+#define UA_EXT_ENABLE 1
+ /*uByte iExtension;*/
+} UPACKED;
+
+/* USB terminal types */
+#define UAT_UNDEFINED 0x0100
+#define UAT_STREAM 0x0101
+#define UAT_VENDOR 0x01ff
+/* input terminal types */
+#define UATI_UNDEFINED 0x0200
+#define UATI_MICROPHONE 0x0201
+#define UATI_DESKMICROPHONE 0x0202
+#define UATI_PERSONALMICROPHONE 0x0203
+#define UATI_OMNIMICROPHONE 0x0204
+#define UATI_MICROPHONEARRAY 0x0205
+#define UATI_PROCMICROPHONEARR 0x0206
+/* output terminal types */
+#define UATO_UNDEFINED 0x0300
+#define UATO_SPEAKER 0x0301
+#define UATO_HEADPHONES 0x0302
+#define UATO_DISPLAYAUDIO 0x0303
+#define UATO_DESKTOPSPEAKER 0x0304
+#define UATO_ROOMSPEAKER 0x0305
+#define UATO_COMMSPEAKER 0x0306
+#define UATO_SUBWOOFER 0x0307
+/* bidir terminal types */
+#define UATB_UNDEFINED 0x0400
+#define UATB_HANDSET 0x0401
+#define UATB_HEADSET 0x0402
+#define UATB_SPEAKERPHONE 0x0403
+#define UATB_SPEAKERPHONEESUP 0x0404
+#define UATB_SPEAKERPHONEECANC 0x0405
+/* telephony terminal types */
+#define UATT_UNDEFINED 0x0500
+#define UATT_PHONELINE 0x0501
+#define UATT_TELEPHONE 0x0502
+#define UATT_DOWNLINEPHONE 0x0503
+/* external terminal types */
+#define UATE_UNDEFINED 0x0600
+#define UATE_ANALOGCONN 0x0601
+#define UATE_DIGITALAUIFC 0x0602
+#define UATE_LINECONN 0x0603
+#define UATE_LEGACYCONN 0x0604
+#define UATE_SPDIF 0x0605
+#define UATE_1394DA 0x0606
+#define UATE_1394DV 0x0607
+/* embedded function terminal types */
+#define UATF_UNDEFINED 0x0700
+#define UATF_CALIBNOISE 0x0701
+#define UATF_EQUNOISE 0x0702
+#define UATF_CDPLAYER 0x0703
+#define UATF_DAT 0x0704
+#define UATF_DCC 0x0705
+#define UATF_MINIDISK 0x0706
+#define UATF_ANALOGTAPE 0x0707
+#define UATF_PHONOGRAPH 0x0708
+#define UATF_VCRAUDIO 0x0709
+#define UATF_VIDEODISCAUDIO 0x070a
+#define UATF_DVDAUDIO 0x070b
+#define UATF_TVTUNERAUDIO 0x070c
+#define UATF_SATELLITE 0x070d
+#define UATF_CABLETUNER 0x070e
+#define UATF_DSS 0x070f
+#define UATF_RADIORECV 0x0710
+#define UATF_RADIOXMIT 0x0711
+#define UATF_MULTITRACK 0x0712
+#define UATF_SYNTHESIZER 0x0713
+
+
+#define SET_CUR 0x01
+#define GET_CUR 0x81
+#define SET_MIN 0x02
+#define GET_MIN 0x82
+#define SET_MAX 0x03
+#define GET_MAX 0x83
+#define SET_RES 0x04
+#define GET_RES 0x84
+#define SET_MEM 0x05
+#define GET_MEM 0x85
+#define GET_STAT 0xff
+
+#define MUTE_CONTROL 0x01
+#define VOLUME_CONTROL 0x02
+#define BASS_CONTROL 0x03
+#define MID_CONTROL 0x04
+#define TREBLE_CONTROL 0x05
+#define GRAPHIC_EQUALIZER_CONTROL 0x06
+#define AGC_CONTROL 0x07
+#define DELAY_CONTROL 0x08
+#define BASS_BOOST_CONTROL 0x09
+#define LOUDNESS_CONTROL 0x0a
+
+#define FU_MASK(u) (1 << ((u)-1))
+
+#define MASTER_CHAN 0
+
+#define AS_GENERAL 1
+#define FORMAT_TYPE 2
+#define FORMAT_SPECIFIC 3
+
+#define UA_FMT_PCM 1
+#define UA_FMT_PCM8 2
+#define UA_FMT_IEEE_FLOAT 3
+#define UA_FMT_ALAW 4
+#define UA_FMT_MULAW 5
+#define UA_FMT_MPEG 0x1001
+#define UA_FMT_AC3 0x1002
+
+#define SAMPLING_FREQ_CONTROL 0x01
+#define PITCH_CONTROL 0x02
+
+#define FORMAT_TYPE_UNDEFINED 0
+#define FORMAT_TYPE_I 1
+#define FORMAT_TYPE_II 2
+#define FORMAT_TYPE_III 3
+
+#define UA_PROC_MASK(n) (1<< ((n)-1))
+#define PROCESS_UNDEFINED 0
+#define XX_ENABLE_CONTROL 1
+#define UPDOWNMIX_PROCESS 1
+#define UD_ENABLE_CONTROL 1
+#define UD_MODE_SELECT_CONTROL 2
+#define DOLBY_PROLOGIC_PROCESS 2
+#define DP_ENABLE_CONTROL 1
+#define DP_MODE_SELECT_CONTROL 2
+#define P3D_STEREO_EXTENDER_PROCESS 3
+#define P3D_ENABLE_CONTROL 1
+#define P3D_SPACIOUSNESS_CONTROL 2
+#define REVERBATION_PROCESS 4
+#define RV_ENABLE_CONTROL 1
+#define RV_LEVEL_CONTROL 2
+#define RV_TIME_CONTROL 3
+#define RV_FEEDBACK_CONTROL 4
+#define CHORUS_PROCESS 5
+#define CH_ENABLE_CONTROL 1
+#define CH_LEVEL_CONTROL 2
+#define CH_RATE_CONTROL 3
+#define CH_DEPTH_CONTROL 4
+#define DYN_RANGE_COMP_PROCESS 6
+#define DR_ENABLE_CONTROL 1
+#define DR_COMPRESSION_RATE_CONTROL 2
+#define DR_MAXAMPL_CONTROL 3
+#define DR_THRESHOLD_CONTROL 4
+#define DR_ATTACK_TIME_CONTROL 5
+#define DR_RELEASE_TIME_CONTROL 6
diff --git a/components/drivers/usb/usbdevice/class/winusb.c b/components/drivers/usb/usbdevice/class/winusb.c
index 4af6dba3cf..b5a169d2cb 100644
--- a/components/drivers/usb/usbdevice/class/winusb.c
+++ b/components/drivers/usb/usbdevice/class/winusb.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -19,7 +19,7 @@ struct winusb_device
uep_t ep_out;
uep_t ep_in;
};
-
+#define WINUSB_INTF_STR_INDEX 13
typedef struct winusb_device * winusb_device_t;
ALIGN(4)
@@ -57,7 +57,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
};
ALIGN(4)
-struct winusb_descriptor _winusb_desc =
+struct winusb_descriptor _winusb_desc =
{
#ifdef RT_USB_DEVICE_COMPOSITE
/* Interface Association Descriptor */
@@ -82,7 +82,11 @@ struct winusb_descriptor _winusb_desc =
0xFF, //bInterfaceClass;
0x00, //bInterfaceSubClass;
0x00, //bInterfaceProtocol;
+#ifdef RT_USB_DEVICE_COMPOSITE
+ WINUSB_INTF_STR_INDEX,
+#else
0x00, //iInterface;
+#endif
},
/*endpoint descriptor*/
{
@@ -117,13 +121,13 @@ const static char* _ustring[] =
};
ALIGN(4)
-struct usb_os_proerty winusb_proerty[] =
+struct usb_os_proerty winusb_proerty[] =
{
USB_OS_PROPERTY_DESC(USB_OS_PROPERTY_TYPE_REG_SZ,"DeviceInterfaceGUID",RT_WINUSB_GUID),
};
ALIGN(4)
-struct usb_os_function_comp_id_descriptor winusb_func_comp_id_desc =
+struct usb_os_function_comp_id_descriptor winusb_func_comp_id_desc =
{
.bFirstInterfaceNumber = USB_DYNAMIC,
.reserved1 = 0x01,
@@ -155,7 +159,7 @@ static ufunction_t cmd_func = RT_NULL;
static rt_err_t _ep0_cmd_handler(udevice_t device, rt_size_t size)
{
winusb_device_t winusb_device;
-
+
if(cmd_func != RT_NULL)
{
winusb_device = (winusb_device_t)cmd_func->user_data;
@@ -191,7 +195,7 @@ static rt_err_t _interface_handler(ufunction_t func, ureq_t setup)
_ep0_cmd_read(func, setup);
break;
}
-
+
return RT_EOK;
}
static rt_err_t _function_enable(ufunction_t func)
@@ -291,7 +295,7 @@ static rt_err_t rt_usb_winusb_init(ufunction_t func)
winusb_device->parent.user_data = func;
-
+
return rt_device_register(&winusb_device->parent, "winusb", RT_DEVICE_FLAG_RDWR);
}
@@ -308,7 +312,11 @@ ufunction_t rt_usbd_function_winusb_create(udevice_t device)
RT_ASSERT(device != RT_NULL);
/* set usb device string description */
+#ifdef RT_USB_DEVICE_COMPOSITE
+ rt_usbd_device_set_interface_string(device, WINUSB_INTF_STR_INDEX, _ustring[2]);
+#else
rt_usbd_device_set_string(device, _ustring);
+#endif
/* create a cdc function */
func = rt_usbd_function_new(device, &dev_desc, &ops);
@@ -352,7 +360,7 @@ ufunction_t rt_usbd_function_winusb_create(udevice_t device)
return func;
}
-struct udclass winusb_class =
+struct udclass winusb_class =
{
.rt_usbd_function_create = rt_usbd_function_winusb_create
};
diff --git a/components/drivers/usb/usbdevice/class/winusb.h b/components/drivers/usb/usbdevice/class/winusb.h
index b5f87b4e56..43fec34b6a 100644
--- a/components/drivers/usb/usbdevice/class/winusb.h
+++ b/components/drivers/usb/usbdevice/class/winusb.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/drivers/usb/usbdevice/core/usbdevice.c b/components/drivers/usb/usbdevice/core/usbdevice.c
index 2455bd8017..0891c0bd26 100644
--- a/components/drivers/usb/usbdevice/core/usbdevice.c
+++ b/components/drivers/usb/usbdevice/core/usbdevice.c
@@ -1,9 +1,9 @@
/*
* File : hid.c
- * COPYRIGHT (C) 2008 - 2018, RT-Thread Development Team
+ * COPYRIGHT (C) 2006 - 2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
- *
+ *
* Change Logs:
* Date Author Notes
* 2012-10-02 Yi Qiu first version
@@ -62,7 +62,7 @@ static struct usb_qualifier_descriptor dev_qualifier =
};
#endif
-struct usb_os_comp_id_descriptor usb_comp_id_desc =
+struct usb_os_comp_id_descriptor usb_comp_id_desc =
{
//head section
{
diff --git a/components/drivers/usb/usbdevice/core/usbdevice_core.c b/components/drivers/usb/usbdevice/core/usbdevice_core.c
index ef569d7bf2..c12636aaf5 100644
--- a/components/drivers/usb/usbdevice/core/usbdevice_core.c
+++ b/components/drivers/usb/usbdevice/core/usbdevice_core.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -123,12 +123,18 @@ static rt_err_t _get_string_descriptor(struct udevice* device, ureq_t setup)
}
else
{
- len = rt_strlen(device->str[index]);
+ if(index < 5)
+ len = rt_strlen(device->str[index]);
+ else
+ len = rt_strlen(device->str_intf[index]);
str_desc.bLength = len*2 + 2;
for(i=0; i<len; i++)
{
- str_desc.String[i*2] = device->str[index][i];
+ if(index < 5)
+ str_desc.String[i*2] = device->str[index][i];
+ else
+ str_desc.String[i*2] = device->str_intf[index][i];
str_desc.String[i*2 + 1] = 0;
}
}
@@ -238,7 +244,7 @@ static rt_err_t _get_interface(struct udevice* device, ureq_t setup)
rt_uint8_t value;
uintf_t intf;
ufunction_t func;
-
+
/* parameter check */
RT_ASSERT(device != RT_NULL);
RT_ASSERT(setup != RT_NULL);
@@ -262,7 +268,7 @@ static rt_err_t _get_interface(struct udevice* device, ureq_t setup)
{
intf->handler(func, setup);
}
-
+
return RT_EOK;
}
@@ -293,7 +299,7 @@ static rt_err_t _set_interface(struct udevice* device, ureq_t setup)
rt_usbd_ep0_set_stall(device);
return -RT_ERROR;
}
-
+
/* find the specified interface */
intf = rt_usbd_find_interface(device, setup->wIndex & 0xFF, &func);
@@ -309,12 +315,12 @@ static rt_err_t _set_interface(struct udevice* device, ureq_t setup)
dcd_ep_enable(device->dcd, ep);
}
dcd_ep0_send_status(device->dcd);
-
+
if (intf->handler)
{
intf->handler(func, setup);
}
-
+
return RT_EOK;
}
@@ -336,7 +342,7 @@ static rt_err_t _get_config(struct udevice* device, ureq_t setup)
RT_ASSERT(device->curr_cfg != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_get_config\n"));
-
+
if (device->state == USB_STATE_CONFIGURED)
{
/* get current configuration */
@@ -443,7 +449,7 @@ static rt_err_t _set_address(struct udevice* device, ureq_t setup)
dcd_ep0_send_status(device->dcd);
RT_DEBUG_LOG(RT_DEBUG_USB, ("_set_address\n"));
-
+
device->state = USB_STATE_ADDRESS;
return RT_EOK;
@@ -479,7 +485,7 @@ static rt_err_t _request_interface(struct udevice* device, ureq_t setup)
{
ret = -RT_ERROR;
}
-
+
return ret;
}
@@ -564,9 +570,9 @@ static rt_err_t _standard_request(struct udevice* device, ureq_t setup)
case USB_REQ_GET_STATUS:
{
uep_t ep;
-
+
ep = rt_usbd_find_endpoint(device, RT_NULL, setup->wIndex);
- value = ep->stalled;
+ value = ep->stalled;
rt_usbd_ep0_write(device, &value, 2);
}
break;
@@ -581,13 +587,13 @@ static rt_err_t _standard_request(struct udevice* device, ureq_t setup)
{
rt_usbd_clear_feature(device, setup->wValue, setup->wIndex);
dcd_ep0_send_status(dcd);
- ep->stalled = RT_FALSE;
+ ep->stalled = RT_FALSE;
for (node = ep->request_list.next; node != &ep->request_list; node = node->next)
{
- req = (uio_request_t)rt_list_entry(node, struct uio_request, list);
+ req = (uio_request_t)rt_list_entry(node, struct uio_request, list);
rt_usbd_io_request(device, ep, req);
- RT_DEBUG_LOG(RT_DEBUG_USB, ("fired a request\n"));
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("fired a request\n"));
}
rt_list_init(&ep->request_list);
@@ -601,10 +607,10 @@ static rt_err_t _standard_request(struct udevice* device, ureq_t setup)
if(USB_EP_HALT == setup->wValue)
{
ep = rt_usbd_find_endpoint(device, RT_NULL, setup->wIndex);
- ep->stalled = RT_TRUE;
+ ep->stalled = RT_TRUE;
rt_usbd_set_feature(device, setup->wValue, setup->wIndex);
dcd_ep0_send_status(dcd);
- }
+ }
}
break;
case USB_REQ_SYNCH_FRAME:
@@ -698,7 +704,7 @@ static rt_err_t _vendor_request(udevice_t device, ureq_t setup)
{
rt_uint8_t * pusb_comp_id_desc;
rt_list_t *p;
- usb_comp_id_desc_size = sizeof(struct usb_os_header_comp_id_descriptor) +
+ usb_comp_id_desc_size = sizeof(struct usb_os_header_comp_id_descriptor) +
(sizeof(struct usb_os_function_comp_id_descriptor)-sizeof(rt_list_t))*rt_list_len(&device->os_comp_id_desc->func_desc);
usb_comp_id_desc = (rt_uint8_t *)rt_malloc(usb_comp_id_desc_size);
@@ -707,7 +713,7 @@ static rt_err_t _vendor_request(udevice_t device, ureq_t setup)
pusb_comp_id_desc = usb_comp_id_desc;
rt_memcpy((void *)pusb_comp_id_desc,(void *)&device->os_comp_id_desc->head_desc,sizeof(struct usb_os_header_comp_id_descriptor));
pusb_comp_id_desc += sizeof(struct usb_os_header_comp_id_descriptor);
-
+
for (p = device->os_comp_id_desc->func_desc.next; p != &device->os_comp_id_desc->func_desc; p = p->next)
{
func_comp_id_desc = rt_list_entry(p,struct usb_os_function_comp_id_descriptor,list);
@@ -726,7 +732,7 @@ static rt_err_t _vendor_request(udevice_t device, ureq_t setup)
}
break;
}
-
+
break;
}
return RT_EOK;
@@ -784,7 +790,7 @@ static rt_err_t _setup_request(udevice_t device, ureq_t setup)
/**
* This function will hanle data notify event.
*
- * @param device the usb device object.
+ * @param device the usb device object.
* @param ep_msg the endpoint message.
*
* @return RT_EOK.
@@ -794,18 +800,18 @@ static rt_err_t _data_notify(udevice_t device, struct ep_msg* ep_msg)
uep_t ep;
ufunction_t func;
rt_size_t size = 0;
-
+
RT_ASSERT(device != RT_NULL);
RT_ASSERT(ep_msg != RT_NULL);
-
+
if (device->state != USB_STATE_CONFIGURED)
{
return -RT_ERROR;
}
-
+
ep = rt_usbd_find_endpoint(device, &func, ep_msg->ep_addr);
if(ep == RT_NULL)
- {
+ {
rt_kprintf("invalid endpoint\n");
return -RT_ERROR;
}
@@ -817,7 +823,7 @@ static rt_err_t _data_notify(udevice_t device, struct ep_msg* ep_msg)
{
dcd_ep_write(device->dcd, EP_ADDRESS(ep), ep->request.buffer, EP_MAXPACKET(ep));
ep->request.remain_size -= EP_MAXPACKET(ep);
- ep->request.buffer += EP_MAXPACKET(ep);
+ ep->request.buffer += EP_MAXPACKET(ep);
}
else if(ep->request.remain_size > 0)
{
@@ -834,9 +840,9 @@ static rt_err_t _data_notify(udevice_t device, struct ep_msg* ep_msg)
size = ep_msg->size;
if(ep->request.remain_size == 0)
{
- return RT_EOK;
+ return RT_EOK;
}
-
+
if(size == 0)
{
size = dcd_ep_read(device->dcd, EP_ADDRESS(ep), ep->request.buffer);
@@ -865,9 +871,9 @@ static rt_err_t _ep0_out_notify(udevice_t device, struct ep_msg* ep_msg)
{
uep_t ep0;
rt_size_t size;
-
+
RT_ASSERT(device != RT_NULL);
- RT_ASSERT(ep_msg != RT_NULL);
+ RT_ASSERT(ep_msg != RT_NULL);
RT_ASSERT(device->dcd != RT_NULL);
ep0 = &device->dcd->ep0;
@@ -875,18 +881,18 @@ static rt_err_t _ep0_out_notify(udevice_t device, struct ep_msg* ep_msg)
if(ep0->request.remain_size == 0)
{
- return RT_EOK;
- }
+ return RT_EOK;
+ }
if(size == 0)
{
size = dcd_ep_read(device->dcd, EP0_OUT_ADDR, ep0->request.buffer);
if(size == 0)
{
return RT_EOK;
- }
+ }
}
- ep0->request.remain_size -= size;
+ ep0->request.remain_size -= size;
ep0->request.buffer += size;
if(ep0->request.remain_size == 0)
{
@@ -894,7 +900,7 @@ static rt_err_t _ep0_out_notify(udevice_t device, struct ep_msg* ep_msg)
if(ep0->rx_indicate != RT_NULL)
{
ep0->rx_indicate(device, size);
- }
+ }
}
else
{
@@ -959,10 +965,10 @@ static rt_err_t _stop_notify(udevice_t device)
static rt_size_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_size_t size)
{
rt_uint16_t maxpacket;
-
- RT_ASSERT(device != RT_NULL);
+
+ RT_ASSERT(device != RT_NULL);
RT_ASSERT(device->dcd != RT_NULL);
- RT_ASSERT(ep != RT_NULL);
+ RT_ASSERT(ep != RT_NULL);
rt_enter_critical();
maxpacket = EP_MAXPACKET(ep);
@@ -970,11 +976,11 @@ static rt_size_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_s
{
dcd_ep_write(device->dcd, EP_ADDRESS(ep), ep->request.buffer, maxpacket);
ep->request.remain_size -= maxpacket;
- ep->request.buffer += maxpacket;
+ ep->request.buffer += maxpacket;
}
else
{
- dcd_ep_write(device->dcd, EP_ADDRESS(ep), ep->request.buffer,
+ dcd_ep_write(device->dcd, EP_ADDRESS(ep), ep->request.buffer,
ep->request.remain_size);
ep->request.remain_size = 0;
}
@@ -984,9 +990,9 @@ static rt_size_t rt_usbd_ep_write(udevice_t device, uep_t ep, void *buffer, rt_s
static rt_size_t rt_usbd_ep_read_prepare(udevice_t device, uep_t ep, void *buffer, rt_size_t size)
{
- RT_ASSERT(device != RT_NULL);
+ RT_ASSERT(device != RT_NULL);
RT_ASSERT(device->dcd != RT_NULL);
- RT_ASSERT(ep != RT_NULL);
+ RT_ASSERT(ep != RT_NULL);
RT_ASSERT(buffer != RT_NULL);
RT_ASSERT(ep->ep_desc != RT_NULL);
@@ -1044,6 +1050,28 @@ rt_err_t rt_usbd_device_set_string(udevice_t device, const char** ustring)
return RT_EOK;
}
+/**
+ * This function will set usb device interface string description.
+ *
+ * @param device the usb device object.
+ * @param index of interface string
+ * @param string pointer to interface string description.
+ *
+ * @return RT_EOK.
+ */
+rt_err_t rt_usbd_device_set_interface_string(udevice_t device, int index, const char* string)
+{
+ /* parameter check */
+ RT_ASSERT(device != RT_NULL);
+ RT_ASSERT(string != RT_NULL);
+ RT_ASSERT(index < MAX_INTF_STR);
+
+ /* set string descriptor array to the device object */
+ device->str_intf[index] = string;
+
+ return RT_EOK;
+}
+
rt_err_t rt_usbd_device_set_os_comp_id_desc(udevice_t device, usb_os_comp_id_desc_t os_comp_id_desc)
{
/* parameter check */
@@ -1705,7 +1733,7 @@ rt_err_t rt_usbd_set_config(udevice_t device, rt_uint8_t value)
device->curr_cfg = cfg;
dcd_set_config(device->dcd, value);
-
+
return RT_TRUE;
}
@@ -1713,7 +1741,7 @@ rt_err_t rt_usbd_set_config(udevice_t device, rt_uint8_t value)
* This function will bRequest an IO transaction.
*
* @param device the usb device object.
- * @param ep the endpoint object.
+ * @param ep the endpoint object.
* @param req IO bRequest.
*
* @return RT_EOK.
@@ -1721,7 +1749,7 @@ rt_err_t rt_usbd_set_config(udevice_t device, rt_uint8_t value)
rt_size_t rt_usbd_io_request(udevice_t device, uep_t ep, uio_request_t req)
{
rt_size_t size = 0;
-
+
RT_ASSERT(device != RT_NULL);
RT_ASSERT(req != RT_NULL);
@@ -1747,7 +1775,7 @@ rt_size_t rt_usbd_io_request(udevice_t device, uep_t ep, uio_request_t req)
{
rt_list_insert_before(&ep->request_list, &req->list);
RT_DEBUG_LOG(RT_DEBUG_USB, ("suspend a request\n"));
- }
+ }
return size;
}
@@ -1770,10 +1798,10 @@ rt_err_t rt_usbd_set_feature(udevice_t device, rt_uint16_t value, rt_uint16_t in
}
else if (value == USB_FEATURE_ENDPOINT_HALT)
{
- RT_DEBUG_LOG(RT_DEBUG_USB, ("set feature stall\n"));
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("set feature stall\n"));
dcd_ep_set_stall(device->dcd, (rt_uint32_t)(index & 0xFF));
}
-
+
return RT_EOK;
}
@@ -1798,38 +1826,38 @@ rt_err_t rt_usbd_clear_feature(udevice_t device, rt_uint16_t value, rt_uint16_t
RT_DEBUG_LOG(RT_DEBUG_USB, ("clear feature stall\n"));
dcd_ep_clear_stall(device->dcd, (rt_uint32_t)(index & 0xFF));
}
-
+
return RT_EOK;
}
rt_err_t rt_usbd_ep0_set_stall(udevice_t device)
{
RT_ASSERT(device != RT_NULL);
-
+
return dcd_ep_set_stall(device->dcd, 0);
}
rt_err_t rt_usbd_ep0_clear_stall(udevice_t device)
{
RT_ASSERT(device != RT_NULL);
-
+
return dcd_ep_clear_stall(device->dcd, 0);
}
rt_err_t rt_usbd_ep_set_stall(udevice_t device, uep_t ep)
{
rt_err_t ret;
-
+
RT_ASSERT(device != RT_NULL);
RT_ASSERT(ep != RT_NULL);
- RT_ASSERT(ep->ep_desc != RT_NULL);
+ RT_ASSERT(ep->ep_desc != RT_NULL);
ret = dcd_ep_set_stall(device->dcd, EP_ADDRESS(ep));
if(ret == RT_EOK)
{
ep->stalled = RT_TRUE;
}
-
+
return ret;
}
@@ -1846,44 +1874,44 @@ rt_err_t rt_usbd_ep_clear_stall(udevice_t device, uep_t ep)
{
ep->stalled = RT_FALSE;
}
-
+
return ret;
}
static rt_err_t rt_usbd_ep_assign(udevice_t device, uep_t ep)
{
int i = 0;
-
+
RT_ASSERT(device != RT_NULL);
- RT_ASSERT(device->dcd != RT_NULL);
- RT_ASSERT(device->dcd->ep_pool != RT_NULL);
+ RT_ASSERT(device->dcd != RT_NULL);
+ RT_ASSERT(device->dcd->ep_pool != RT_NULL);
RT_ASSERT(ep != RT_NULL);
RT_ASSERT(ep->ep_desc != RT_NULL);
while(device->dcd->ep_pool[i].addr != 0xFF)
{
- if(device->dcd->ep_pool[i].status == ID_UNASSIGNED &&
+ if(device->dcd->ep_pool[i].status == ID_UNASSIGNED &&
ep->ep_desc->bmAttributes == device->dcd->ep_pool[i].type && (EP_ADDRESS(ep) & 0x80) == device->dcd->ep_pool[i].dir)
{
EP_ADDRESS(ep) |= device->dcd->ep_pool[i].addr;
ep->id = &device->dcd->ep_pool[i];
device->dcd->ep_pool[i].status = ID_ASSIGNED;
- RT_DEBUG_LOG(RT_DEBUG_USB, ("assigned %d\n", device->dcd->ep_pool[i].addr));
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("assigned %d\n", device->dcd->ep_pool[i].addr));
return RT_EOK;
}
-
+
i++;
}
-
+
return -RT_ERROR;
}
rt_err_t rt_usbd_ep_unassign(udevice_t device, uep_t ep)
{
RT_ASSERT(device != RT_NULL);
- RT_ASSERT(device->dcd != RT_NULL);
- RT_ASSERT(device->dcd->ep_pool != RT_NULL);
+ RT_ASSERT(device->dcd != RT_NULL);
+ RT_ASSERT(device->dcd->ep_pool != RT_NULL);
RT_ASSERT(ep != RT_NULL);
RT_ASSERT(ep->ep_desc != RT_NULL);
@@ -1911,8 +1939,8 @@ rt_err_t rt_usbd_ep0_setup_handler(udcd_t dcd, struct urequest* setup)
else
{
rt_memcpy((void*)&msg.content.setup, (void*)setup, sizeof(struct urequest));
- }
-
+ }
+
msg.type = USB_MSG_SETUP_NOTIFY;
msg.dcd = dcd;
rt_usbd_event_signal(&msg);
@@ -2011,7 +2039,7 @@ rt_err_t rt_usbd_reset_handler(udcd_t dcd)
struct udev_msg msg;
RT_ASSERT(dcd != RT_NULL);
-
+
msg.type = USB_MSG_RESET;
msg.dcd = dcd;
rt_usbd_event_signal(&msg);
@@ -2024,7 +2052,7 @@ rt_err_t rt_usbd_connect_handler(udcd_t dcd)
struct udev_msg msg;
RT_ASSERT(dcd != RT_NULL);
-
+
msg.type = USB_MSG_PLUG_IN;
msg.dcd = dcd;
rt_usbd_event_signal(&msg);
@@ -2037,7 +2065,7 @@ rt_err_t rt_usbd_disconnect_handler(udcd_t dcd)
struct udev_msg msg;
RT_ASSERT(dcd != RT_NULL);
-
+
msg.type = USB_MSG_PLUG_OUT;
msg.dcd = dcd;
rt_usbd_event_signal(&msg);
@@ -2050,7 +2078,7 @@ rt_err_t rt_usbd_sof_handler(udcd_t dcd)
struct udev_msg msg;
RT_ASSERT(dcd != RT_NULL);
-
+
msg.type = USB_MSG_SOF;
msg.dcd = dcd;
rt_usbd_event_signal(&msg);
@@ -2063,7 +2091,7 @@ rt_size_t rt_usbd_ep0_write(udevice_t device, void *buffer, rt_size_t size)
uep_t ep0;
rt_size_t sent_size = 0;
- RT_ASSERT(device != RT_NULL);
+ RT_ASSERT(device != RT_NULL);
RT_ASSERT(device->dcd != RT_NULL);
RT_ASSERT(buffer != RT_NULL);
RT_ASSERT(size > 0);
@@ -2085,7 +2113,7 @@ rt_size_t rt_usbd_ep0_write(udevice_t device, void *buffer, rt_size_t size)
return dcd_ep_write(device->dcd, EP0_IN_ADDR, ep0->request.buffer, sent_size);
}
-rt_size_t rt_usbd_ep0_read(udevice_t device, void *buffer, rt_size_t size,
+rt_size_t rt_usbd_ep0_read(udevice_t device, void *buffer, rt_size_t size,
rt_err_t (*rx_ind)(udevice_t device, rt_size_t size))
{
uep_t ep0;
@@ -2096,7 +2124,7 @@ rt_size_t rt_usbd_ep0_read(udevice_t device, void *buffer, rt_size_t size,
RT_ASSERT(buffer != RT_NULL);
ep0 = &device->dcd->ep0;
- ep0->request.buffer = (rt_uint8_t *)buffer;
+ ep0->request.buffer = (rt_uint8_t *)buffer;
ep0->request.remain_size = size;
ep0->rx_indicate = rx_ind;
if(size >= ep0->id->maxpacket)
@@ -2143,7 +2171,7 @@ static void rt_usbd_thread_entry(void* parameter)
}
RT_DEBUG_LOG(RT_DEBUG_USB, ("message type %d\n", msg.type));
-
+
switch (msg.type)
{
case USB_MSG_SOF:
@@ -2160,7 +2188,7 @@ static void rt_usbd_thread_entry(void* parameter)
case USB_MSG_EP0_OUT:
_ep0_out_notify(device, &msg.content.ep_msg);
break;
- case USB_MSG_RESET:
+ case USB_MSG_RESET:
RT_DEBUG_LOG(RT_DEBUG_USB, ("reset %d\n", device->state));
if (device->state == USB_STATE_ADDRESS || device->state == USB_STATE_CONFIGURED)
_stop_notify(device);
@@ -2170,7 +2198,7 @@ static void rt_usbd_thread_entry(void* parameter)
device->state = USB_STATE_ATTACHED;
break;
case USB_MSG_PLUG_OUT:
- device->state = USB_STATE_NOTATTACHED;
+ device->state = USB_STATE_NOTATTACHED;
_stop_notify(device);
break;
default:
diff --git a/components/drivers/usb/usbhost/class/adk.c b/components/drivers/usb/usbhost/class/adk.c
index 2425de7bba..492a2f9bb7 100644
--- a/components/drivers/usb/usbhost/class/adk.c
+++ b/components/drivers/usb/usbhost/class/adk.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/drivers/usb/usbhost/class/adk.h b/components/drivers/usb/usbhost/class/adk.h
index c582ad7f17..aebe7de705 100644
--- a/components/drivers/usb/usbhost/class/adk.h
+++ b/components/drivers/usb/usbhost/class/adk.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -19,7 +19,7 @@ struct uadkinst
upipe_t pipe_out;
struct rt_device device;
-};
+};
typedef struct uadkinst* uadk_t;
#define USB_ACCESSORY_VENDOR_ID 0x18D1
diff --git a/components/drivers/usb/usbhost/class/hid.c b/components/drivers/usb/usbhost/class/hid.c
index e16096877f..eaf413a2a6 100644
--- a/components/drivers/usb/usbhost/class/hid.c
+++ b/components/drivers/usb/usbhost/class/hid.c
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
* Change Logs:
* Date Author Notes
* 2011-12-12 Yi Qiu first version
+ * 2021-02-23 Leslie Lee update with current usb api
*/
#include <rtthread.h>
@@ -23,31 +24,32 @@ static rt_list_t _protocal_list;
* @param intf the interface instance.
* @duration the idle period of requesting data.
* @report_id the report id
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id)
+rt_err_t rt_usbh_hid_set_idle(struct uhintf* intf, int duration, int report_id)
{
struct urequest setup;
- struct uinstance* device;
+ struct uinstance* device;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(intf != RT_NULL);
RT_ASSERT(intf->device != RT_NULL);
device = intf->device;
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_INTERFACE;
- setup.request = USB_REQ_SET_IDLE;
- setup.index = 0;
- setup.length = 0;
- setup.value = (duration << 8 )| report_id;
+ setup.bRequest = USB_REQ_SET_IDLE;
+ setup.wIndex = 0;
+ setup.wLength = 0;
+ setup.wValue = (duration << 8 )| report_id;
- if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, RT_NULL, 0,
- timeout) == 0) return RT_EOK;
- else return -RT_FALSE;
+ if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8)
+ return RT_EOK;
+ else
+ return -RT_FALSE;
}
/**
@@ -56,32 +58,42 @@ rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id)
* @param intf the interface instance.
* @buffer the data buffer to save usb report descriptor.
* @param nbytes the size of buffer
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type,
+rt_err_t rt_usbh_hid_get_report(struct uhintf* intf, rt_uint8_t type,
rt_uint8_t id, rt_uint8_t *buffer, rt_size_t size)
{
struct urequest setup;
struct uinstance* device;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(intf != RT_NULL);
RT_ASSERT(intf->device != RT_NULL);
device = intf->device;
- setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_INTERFACE;
- setup.request = USB_REQ_GET_REPORT;
- setup.index = intf->intf_desc->bInterfaceNumber;
- setup.length = size;
- setup.value = (type << 8 ) + id;
+ setup.bRequest = USB_REQ_GET_REPORT;
+ setup.wIndex = intf->intf_desc->bInterfaceNumber;
+ setup.wLength = size;
+ setup.wValue = (type << 8 ) + id;
- if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, buffer, size,
- timeout) == size) return RT_EOK;
- else return -RT_FALSE;
+ if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8)
+ {
+ if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_in, buffer, size, timeout) == size)
+ {
+ if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_out, RT_NULL, 0, timeout) == 0)
+ {
+ return RT_EOK;
+ }
+ }
+ }
+ else
+ return -RT_FALSE;
+ return -RT_FALSE;
}
/**
@@ -90,31 +102,32 @@ rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type,
* @param intf the interface instance.
* @buffer the data buffer to save usb report descriptor.
* @param nbytes the size of buffer
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_t size)
+rt_err_t rt_usbh_hid_set_report(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size)
{
struct urequest setup;
- struct uinstance* device;
+ struct uinstance* device;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(intf != RT_NULL);
RT_ASSERT(intf->device != RT_NULL);
-
+
device = intf->device;
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_INTERFACE;
- setup.request = USB_REQ_SET_REPORT;
- setup.index = intf->intf_desc->bInterfaceNumber;
- setup.length = size;
- setup.value = 0x02 << 8;
+ setup.bRequest = USB_REQ_SET_REPORT;
+ setup.wIndex = intf->intf_desc->bInterfaceNumber;
+ setup.wLength = size;
+ setup.wValue = 0x02 << 8;
- if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, buffer, size,
- timeout) == size) return RT_EOK;
- else return -RT_FALSE;
+ if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8)
+ return RT_EOK;
+ else
+ return -RT_FALSE;
}
/**
@@ -122,73 +135,84 @@ rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_
*
* @param intf the interface instance.
* @param protocol the protocol id.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_hid_set_protocal(struct uintf* intf, int protocol)
+rt_err_t rt_usbh_hid_set_protocal(struct uhintf* intf, int protocol)
{
struct urequest setup;
struct uinstance* device;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(intf != RT_NULL);
RT_ASSERT(intf->device != RT_NULL);
-
+
device = intf->device;
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_INTERFACE;
- setup.request = USB_REQ_SET_PROTOCOL;
- setup.index = 0;
- setup.length = 0;
- setup.value = protocol;
+ setup.bRequest = USB_REQ_SET_PROTOCOL;
+ setup.wIndex = 0;
+ setup.wLength = 0;
+ setup.wValue = protocol;
- if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, RT_NULL, 0,
- timeout) == 0) return RT_EOK;
- else return -RT_FALSE;
+ if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8)
+ return RT_EOK;
+ else
+ return -RT_FALSE;
}
/**
- * This function will do USB_REQ_GET_DESCRIPTOR request for the device instance
+ * This function will do USB_REQ_GET_DESCRIPTOR request for the device instance
* to set feature of the hub port.
*
* @param intf the interface instance.
* @buffer the data buffer to save usb report descriptor.
* @param nbytes the size of buffer
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_hid_get_report_descriptor(struct uintf* intf,
+rt_err_t rt_usbh_hid_get_report_descriptor(struct uhintf* intf,
rt_uint8_t *buffer, rt_size_t size)
{
struct urequest setup;
- struct uinstance* device;
+ struct uinstance* device;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(intf != RT_NULL);
RT_ASSERT(intf->device != RT_NULL);
-
+
device = intf->device;
- setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_STANDARD|
+ setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_STANDARD|
USB_REQ_TYPE_INTERFACE;
- setup.request = USB_REQ_GET_DESCRIPTOR;
- setup.index = 0;
- setup.length = size;
- setup.value = USB_DESC_TYPE_REPORT << 8;
+ setup.bRequest = USB_REQ_GET_DESCRIPTOR;
+ setup.wIndex = 0;
+ setup.wLength = size;
+ setup.wValue = USB_DESC_TYPE_REPORT << 8;
- if(rt_usb_hcd_control_xfer(device->hcd, device, &setup, buffer, size,
- timeout) == size) return RT_EOK;
- else return -RT_FALSE;
+ if (rt_usb_hcd_setup_xfer(device->hcd, device->pipe_ep0_out, &setup, timeout) == 8)
+ {
+ if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_in, buffer, size, timeout) == size)
+ {
+ if (rt_usb_hcd_pipe_xfer(device->hcd, device->pipe_ep0_out, RT_NULL, 0, timeout) == 0)
+ {
+ return RT_EOK;
+ }
+ }
+ }
+ else
+ return -RT_FALSE;
+ return -RT_FALSE;
}
/**
* This function will register specified hid protocal to protocal list
*
* @param protocal the specified protocal.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hid_protocal_register(uprotocal_t protocal)
@@ -199,44 +223,44 @@ rt_err_t rt_usbh_hid_protocal_register(uprotocal_t protocal)
/* insert class driver into driver list */
rt_list_insert_after(&_protocal_list, &(protocal->list));
-
- return RT_EOK;
+
+ return RT_EOK;
}
/**
* This function is the callback function of hid's int endpoint, it is invoked when data comes.
*
* @param context the context of the callback function.
- *
+ *
* @return none.
*/
static void rt_usbh_hid_callback(void* context)
{
- upipe_t pipe;
+ upipe_t pipe;
struct uhid* hid;
int timeout = USB_TIMEOUT_LONG;
/* parameter check */
RT_ASSERT(context != RT_NULL);
-
+
pipe = (upipe_t)context;
- hid = (struct uhid*)pipe->intf->user_data;
+ hid = (struct uhid*)((struct uhintf*)pipe->inst)->user_data;
/* invoke protocal callback function */
hid->protocal->callback((void*)hid);
/* parameter check */
- RT_ASSERT(pipe->intf->device->hcd != RT_NULL);
+ RT_ASSERT(((struct uhintf*)pipe->inst)->device->hcd != RT_NULL);
- rt_usb_hcd_int_xfer(pipe->intf->device->hcd, pipe, hid->buffer,
- pipe->ep.wMaxPacketSize, timeout);
+ rt_usb_hcd_pipe_xfer(((struct uhintf*)pipe->inst)->device->hcd, pipe,
+ hid->buffer, pipe->ep.wMaxPacketSize, timeout);
}
/**
* This function will find specified hid protocal from protocal list
*
* @param pro_id the protocal id.
- *
+ *
* @return the found protocal or RT_NULL if there is no this protocal.
*/
static uprotocal_t rt_usbh_hid_protocal_find(int pro_id)
@@ -246,7 +270,7 @@ static uprotocal_t rt_usbh_hid_protocal_find(int pro_id)
/* try to find protocal object */
for (node = _protocal_list.next; node != &_protocal_list; node = node->next)
{
- uprotocal_t protocal =
+ uprotocal_t protocal =
(uprotocal_t)rt_list_entry(node, struct uprotocal, list);
if (protocal->pro_id == pro_id) return protocal;
}
@@ -260,18 +284,16 @@ static uprotocal_t rt_usbh_hid_protocal_find(int pro_id)
* as a hid class device, it will continue the enumulate process.
*
* @param arg the argument.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t rt_usbh_hid_enable(void* arg)
{
int i = 0, pro_id;
- uprotocal_t protocal;
+ uprotocal_t protocal;
struct uhid* hid;
- struct uintf* intf = (struct uintf*)arg;
- int timeout = USB_TIMEOUT_BASIC;
- upipe_t pipe;
-
+ struct uhintf* intf = (struct uhintf*)arg;
+
/* parameter check */
if(intf == RT_NULL)
{
@@ -282,71 +304,65 @@ static rt_err_t rt_usbh_hid_enable(void* arg)
pro_id = intf->intf_desc->bInterfaceProtocol;
RT_DEBUG_LOG(RT_DEBUG_USB,
- ("HID device enable, protocal id %d\n", pro_id));
+ ("HID device enable, protocal id %d\n", pro_id));
- protocal = rt_usbh_hid_protocal_find(pro_id);
+ protocal = rt_usbh_hid_protocal_find(pro_id);
if(protocal == RT_NULL)
{
rt_kprintf("can't find hid protocal %d\n", pro_id);
- intf->user_data = RT_NULL;
+ intf->user_data = RT_NULL;
return -RT_ERROR;
}
-
+
hid = rt_malloc(sizeof(struct uhid));
RT_ASSERT(hid != RT_NULL);
- /* initilize the data structure */
+ /* initilize the data structure */
rt_memset(hid, 0, sizeof(struct uhid));
intf->user_data = (void*)hid;
hid->protocal = protocal;
-
+
for(i=0; i<intf->intf_desc->bNumEndpoints; i++)
- {
+ {
rt_err_t ret;
uep_desc_t ep_desc;
- /* get endpoint descriptor */
+ /* get endpoint descriptor */
rt_usbh_get_endpoint_descriptor(intf->intf_desc, i, &ep_desc);
if(ep_desc == RT_NULL)
{
rt_kprintf("rt_usbh_get_endpoint_descriptor error\n");
return -RT_ERROR;
}
-
- if(USB_EP_ATTR(ep_desc->bmAttributes) != USB_EP_ATTR_INT)
+
+ if(USB_EP_ATTR(ep_desc->bmAttributes) != USB_EP_ATTR_INT)
continue;
-
+
if(!(ep_desc->bEndpointAddress & USB_DIR_IN)) continue;
- ret = rt_usb_hcd_alloc_pipe(intf->device->hcd, &hid->pipe_in,
- intf, ep_desc, rt_usbh_hid_callback);
+ ret = rt_usb_hcd_alloc_pipe(intf->device->hcd, &hid->pipe_in,
+ intf, ep_desc);
if(ret != RT_EOK) return ret;
}
/* initialize hid protocal */
- hid->protocal->init((void*)intf);
- pipe = hid->pipe_in;
+ hid->protocal->init((void*)intf);
- /* parameter check */
- RT_ASSERT(pipe->intf->device->hcd != RT_NULL);
-
- rt_usb_hcd_int_xfer(pipe->intf->device->hcd, hid->pipe_in,
- hid->buffer, hid->pipe_in->ep.wMaxPacketSize, timeout);
return RT_EOK;
}
/**
- * This function will be invoked when usb device plug out is detected and it would clean
+ * This function will be invoked when usb device plug out is detected and it would clean
* and release all hub class related resources.
*
* @param arg the argument.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t rt_usbh_hid_disable(void* arg)
{
struct uhid* hid;
- struct uintf* intf = (struct uintf*)arg;
+ struct uhintf* intf = (struct uhintf*)arg;
RT_ASSERT(intf != RT_NULL);
@@ -361,12 +377,9 @@ static rt_err_t rt_usbh_hid_disable(void* arg)
rt_usb_hcd_free_pipe(intf->device->hcd, hid->pipe_in);
}
- /* free the hid instance */
+ /* free the hid instance */
rt_free(hid);
}
-
- /* free the instance */
- rt_free(intf);
return RT_EOK;
}
@@ -374,7 +387,7 @@ static rt_err_t rt_usbh_hid_disable(void* arg)
/**
* This function will register hid class driver to the usb class driver manager.
* and it should be invoked in the usb system initialization.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
ucd_t rt_usbh_class_driver_hid(void)
@@ -382,7 +395,7 @@ ucd_t rt_usbh_class_driver_hid(void)
rt_list_init(&_protocal_list);
hid_driver.class_code = USB_CLASS_HID;
-
+
hid_driver.enable = rt_usbh_hid_enable;
hid_driver.disable = rt_usbh_hid_disable;
diff --git a/components/drivers/usb/usbhost/class/hid.h b/components/drivers/usb/usbhost/class/hid.h
index 8e446c8cea..19b2b09855 100644
--- a/components/drivers/usb/usbhost/class/hid.h
+++ b/components/drivers/usb/usbhost/class/hid.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -18,7 +18,7 @@ struct uhid
upipe_t pipe_in;
rt_uint8_t buffer[8];
uprotocal_t protocal;
-};
+};
typedef struct uhid uhid_t;
#define USB_REQ_GET_REPORT 0x01
@@ -28,14 +28,14 @@ typedef struct uhid uhid_t;
#define USB_REQ_SET_IDLE 0x0a
#define USB_REQ_SET_PROTOCOL 0x0b
-#define USB_HID_KEYBOARD 1
+#define USB_HID_KEYBOARD 1
#define USB_HID_MOUSE 2
-rt_err_t rt_usbh_hid_set_idle(struct uintf* intf, int duration, int report_id);
-rt_err_t rt_usbh_hid_get_report(struct uintf* intf, rt_uint8_t type, rt_uint8_t id, rt_uint8_t *buffer, rt_size_t size);
-rt_err_t rt_usbh_hid_set_report(struct uintf* intf, rt_uint8_t *buffer, rt_size_t size);
-rt_err_t rt_usbh_hid_set_protocal(struct uintf* intf, int protocol);
-rt_err_t rt_usbh_hid_get_report_descriptor(struct uintf* intf, rt_uint8_t *buffer, rt_size_t size);
+rt_err_t rt_usbh_hid_set_idle(struct uhintf* intf, int duration, int report_id);
+rt_err_t rt_usbh_hid_get_report(struct uhintf* intf, rt_uint8_t type, rt_uint8_t id, rt_uint8_t *buffer, rt_size_t size);
+rt_err_t rt_usbh_hid_set_report(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size);
+rt_err_t rt_usbh_hid_set_protocal(struct uhintf* intf, int protocol);
+rt_err_t rt_usbh_hid_get_report_descriptor(struct uhintf* intf, rt_uint8_t *buffer, rt_size_t size);
rt_err_t rt_usbh_hid_protocal_register(uprotocal_t protocal);
#endif
diff --git a/components/drivers/usb/usbhost/class/mass.c b/components/drivers/usb/usbhost/class/mass.c
index 20048873f5..abd89a5efc 100644
--- a/components/drivers/usb/usbhost/class/mass.c
+++ b/components/drivers/usb/usbhost/class/mass.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -24,29 +24,29 @@ static struct uclass_driver storage_driver;
*
* @param intf the interface instance.
* @param max_lun the buffer to save max_lun.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t _pipe_check(struct uhintf* intf, upipe_t pipe)
{
- struct uinstance* device;
+ struct uinstance* device;
rt_err_t ret;
ustor_t stor;
- int size = 0;
+ int size = 0;
struct ustorage_csw csw;
if(intf == RT_NULL || pipe == RT_NULL)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
+ }
- /* get usb device instance from the interface instance */
- device = intf->device;
+ /* get usb device instance from the interface instance */
+ device = intf->device;
- /* get storage instance from the interface instance */
+ /* get storage instance from the interface instance */
stor = (ustor_t)intf->user_data;
-
+
/* check pipe status */
if(pipe->status == UPIPE_STATUS_OK) return RT_EOK;
@@ -58,11 +58,11 @@ static rt_err_t _pipe_check(struct uhintf* intf, upipe_t pipe)
if(pipe->status == UPIPE_STATUS_STALL)
{
/* clear the pipe stall status */
- ret = rt_usbh_clear_feature(device, pipe->ep.bEndpointAddress,
+ ret = rt_usbh_clear_feature(device, pipe->ep.bEndpointAddress,
USB_FEATURE_ENDPOINT_HALT);
if(ret != RT_EOK) return ret;
}
-
+
rt_thread_delay(50);
@@ -73,14 +73,14 @@ static rt_err_t _pipe_check(struct uhintf* intf, upipe_t pipe)
RT_DEBUG_LOG(RT_DEBUG_USB, ("clean storage in pipe stall\n"));
/* it should receive csw after clear the stall feature */
- size = rt_usb_hcd_pipe_xfer(stor->pipe_in->inst->hcd,
+ size = rt_usb_hcd_pipe_xfer(stor->pipe_in->inst->hcd,
stor->pipe_in, &csw, SIZEOF_CSW, 100);
- if(size != SIZEOF_CSW)
+ if(size != SIZEOF_CSW)
{
rt_kprintf("receive the csw after stall failed\n");
return -RT_EIO;
}
-
+
return -RT_ERROR;
}
@@ -89,35 +89,35 @@ static rt_err_t _pipe_check(struct uhintf* intf, upipe_t pipe)
*
* @param intf the interface instance.
* @param max_lun the buffer to save max_lun.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-static rt_err_t rt_usb_bulk_only_xfer(struct uhintf* intf,
+static rt_err_t rt_usb_bulk_only_xfer(struct uhintf* intf,
ustorage_cbw_t cmd, rt_uint8_t* buffer, int timeout)
{
rt_size_t size;
- rt_err_t ret;
+ rt_err_t ret;
upipe_t pipe;
struct ustorage_csw csw;
ustor_t stor;
- RT_ASSERT(cmd != RT_NULL);
+ RT_ASSERT(cmd != RT_NULL);
if(intf == RT_NULL)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
}
-
- /* get storage instance from the interface instance */
+
+ /* get storage instance from the interface instance */
stor = (ustor_t)intf->user_data;
do
{
/* send the cbw */
- size = rt_usb_hcd_pipe_xfer(stor->pipe_out->inst->hcd, stor->pipe_out,
+ size = rt_usb_hcd_pipe_xfer(stor->pipe_out->inst->hcd, stor->pipe_out,
cmd, SIZEOF_CBW, timeout);
- if(size != SIZEOF_CBW)
+ if(size != SIZEOF_CBW)
{
rt_kprintf("CBW size error\n");
return -RT_EIO;
@@ -126,20 +126,20 @@ static rt_err_t rt_usb_bulk_only_xfer(struct uhintf* intf,
{
pipe = (cmd->dflags == CBWFLAGS_DIR_IN) ? stor->pipe_in :
stor->pipe_out;
- size = rt_usb_hcd_pipe_xfer(pipe->inst->hcd, pipe, (void*)buffer,
+ size = rt_usb_hcd_pipe_xfer(pipe->inst->hcd, pipe, (void*)buffer,
cmd->xfer_len, timeout);
if(size != cmd->xfer_len)
{
- rt_kprintf("request size %d, transfer size %d\n",
+ rt_kprintf("request size %d, transfer size %d\n",
cmd->xfer_len, size);
break;
- }
+ }
}
-
+
/* receive the csw */
- size = rt_usb_hcd_pipe_xfer(stor->pipe_in->inst->hcd, stor->pipe_in,
+ size = rt_usb_hcd_pipe_xfer(stor->pipe_in->inst->hcd, stor->pipe_in,
&csw, SIZEOF_CSW, timeout);
- if(size != SIZEOF_CSW)
+ if(size != SIZEOF_CSW)
{
rt_kprintf("csw size error\n");
return -RT_EIO;
@@ -148,12 +148,12 @@ static rt_err_t rt_usb_bulk_only_xfer(struct uhintf* intf,
/* check in pipes status */
ret = _pipe_check(intf, stor->pipe_in);
- if(ret != RT_EOK)
+ if(ret != RT_EOK)
{
rt_kprintf("in pipe error\n");
return ret;
}
-
+
/* check out pipes status */
ret = _pipe_check(intf, stor->pipe_out);
if(ret != RT_EOK)
@@ -161,20 +161,20 @@ static rt_err_t rt_usb_bulk_only_xfer(struct uhintf* intf,
rt_kprintf("out pipe error\n");
return ret;
}
-
+
/* check csw status */
if(csw.signature != CSW_SIGNATURE || csw.tag != CBW_TAG_VALUE)
{
rt_kprintf("csw signature error\n");
return -RT_EIO;
}
-
+
if(csw.status != 0)
{
//rt_kprintf("csw status error:%d\n",csw.status);
return -RT_ERROR;
}
-
+
return RT_EOK;
}
@@ -183,12 +183,12 @@ static rt_err_t rt_usb_bulk_only_xfer(struct uhintf* intf,
*
* @param intf the interface instance.
* @param max_lun the buffer to save max_lun.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_storage_get_max_lun(struct uhintf* intf, rt_uint8_t* max_lun)
{
- struct uinstance* device;
+ struct uinstance* device;
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
@@ -196,17 +196,17 @@ rt_err_t rt_usbh_storage_get_max_lun(struct uhintf* intf, rt_uint8_t* max_lun)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
+ }
/* parameter check */
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_get_max_lun\n"));
- /* get usb device instance from the interface instance */
- device = intf->device;
+ /* get usb device instance from the interface instance */
+ device = intf->device;
/* construct the request */
- setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_INTERFACE;
setup.bRequest = USBREQ_GET_MAX_LUN;
setup.wValue = intf->intf_desc->bInterfaceNumber;
@@ -233,13 +233,13 @@ rt_err_t rt_usbh_storage_get_max_lun(struct uhintf* intf, rt_uint8_t* max_lun)
* This function will do USBREQ_MASS_STORAGE_RESET request for the usb interface instance.
*
* @param intf the interface instance.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_storage_reset(struct uhintf* intf)
{
struct urequest setup;
- struct uinstance* device;
+ struct uinstance* device;
int timeout = USB_TIMEOUT_BASIC;
/* parameter check */
@@ -247,16 +247,16 @@ rt_err_t rt_usbh_storage_reset(struct uhintf* intf)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
+ }
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_reset\n"));
- /* get usb device instance from the interface instance */
- device = intf->device;
+ /* get usb device instance from the interface instance */
+ device = intf->device;
/* construct the request */
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_INTERFACE;
setup.bRequest = USBREQ_MASS_STORAGE_RESET;
setup.wIndex = intf->intf_desc->bInterfaceNumber;
@@ -279,12 +279,12 @@ rt_err_t rt_usbh_storage_reset(struct uhintf* intf)
*
* @param intf the interface instance.
* @param buffer the data buffer to save read data
- * @param sector the start sector address to read.
+ * @param sector the start sector address to read.
* @param sector the sector count to read.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_storage_read10(struct uhintf* intf, rt_uint8_t *buffer,
+rt_err_t rt_usbh_storage_read10(struct uhintf* intf, rt_uint8_t *buffer,
rt_uint32_t sector, rt_size_t count, int timeout)
{
struct ustorage_cbw cmd;
@@ -294,8 +294,8 @@ rt_err_t rt_usbh_storage_read10(struct uhintf* intf, rt_uint8_t *buffer,
{
rt_kprintf("interface is not available\n");
return -RT_EIO;
- }
-
+ }
+
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_read10\n"));
@@ -325,12 +325,12 @@ rt_err_t rt_usbh_storage_read10(struct uhintf* intf, rt_uint8_t *buffer,
*
* @param intf the interface instance.
* @param buffer the data buffer to save write data
- * @param sector the start sector address to write.
+ * @param sector the start sector address to write.
* @param sector the sector count to write.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_storage_write10(struct uhintf* intf, rt_uint8_t *buffer,
+rt_err_t rt_usbh_storage_write10(struct uhintf* intf, rt_uint8_t *buffer,
rt_uint32_t sector, rt_size_t count, int timeout)
{
struct ustorage_cbw cmd;
@@ -340,8 +340,8 @@ rt_err_t rt_usbh_storage_write10(struct uhintf* intf, rt_uint8_t *buffer,
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
-
+ }
+
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_write10\n"));
@@ -371,7 +371,7 @@ rt_err_t rt_usbh_storage_write10(struct uhintf* intf, rt_uint8_t *buffer,
*
* @param intf the interface instance.
* @param buffer the data buffer to save sense data
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_storage_request_sense(struct uhintf* intf, rt_uint8_t* buffer)
@@ -384,12 +384,12 @@ rt_err_t rt_usbh_storage_request_sense(struct uhintf* intf, rt_uint8_t* buffer)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
-
+ }
+
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_request_sense\n"));
- /* construct the command block wrapper */
+ /* construct the command block wrapper */
rt_memset(&cmd, 0, sizeof(struct ustorage_cbw));
cmd.signature = CBW_SIGNATURE;
cmd.tag = CBW_TAG_VALUE;
@@ -407,7 +407,7 @@ rt_err_t rt_usbh_storage_request_sense(struct uhintf* intf, rt_uint8_t* buffer)
* This function will execute SCSI_TEST_UNIT_READY command to get unit ready status.
*
* @param intf the interface instance.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_storage_test_unit_ready(struct uhintf* intf)
@@ -420,8 +420,8 @@ rt_err_t rt_usbh_storage_test_unit_ready(struct uhintf* intf)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
-
+ }
+
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_test_unit_ready\n"));
@@ -434,7 +434,7 @@ rt_err_t rt_usbh_storage_test_unit_ready(struct uhintf* intf)
cmd.lun = 0;
cmd.cb_len = 12;
cmd.cb[0] = SCSI_TEST_UNIT_READY;
-
+
return rt_usb_bulk_only_xfer(intf, &cmd, RT_NULL, timeout);
}
@@ -443,21 +443,21 @@ rt_err_t rt_usbh_storage_test_unit_ready(struct uhintf* intf)
*
* @param intf the interface instance.
* @param buffer the data buffer to save inquiry data
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_storage_inquiry(struct uhintf* intf, rt_uint8_t* buffer)
{
struct ustorage_cbw cmd;
int timeout = USB_TIMEOUT_LONG;
-
+
/* parameter check */
if(intf == RT_NULL)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
-
+ }
+
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_inquiry\n"));
@@ -480,7 +480,7 @@ rt_err_t rt_usbh_storage_inquiry(struct uhintf* intf, rt_uint8_t* buffer)
*
* @param intf the interface instance.
* @param buffer the data buffer to save capacity data
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_storage_get_capacity(struct uhintf* intf, rt_uint8_t* buffer)
@@ -493,7 +493,7 @@ rt_err_t rt_usbh_storage_get_capacity(struct uhintf* intf, rt_uint8_t* buffer)
{
rt_kprintf("the interface is not available\n");
return -RT_EIO;
- }
+ }
RT_ASSERT(intf->device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_get_capacity\n"));
@@ -513,17 +513,17 @@ rt_err_t rt_usbh_storage_get_capacity(struct uhintf* intf, rt_uint8_t* buffer)
/**
* This function will run mass storage class driver when usb device is detected
- * and identified as a mass storage class device, it will continue to do the enumulate
+ * and identified as a mass storage class device, it will continue to do the enumulate
* process.
*
* @param arg the argument.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t rt_usbh_storage_enable(void* arg)
{
int i = 0;
- rt_err_t ret;
+ rt_err_t ret;
ustor_t stor;
struct uhintf* intf = (struct uhintf*)arg;
@@ -534,25 +534,25 @@ static rt_err_t rt_usbh_storage_enable(void* arg)
return -RT_EIO;
}
- RT_DEBUG_LOG(RT_DEBUG_USB, ("subclass %d, protocal %d\n",
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("subclass %d, protocal %d\n",
intf->intf_desc->bInterfaceSubClass,
intf->intf_desc->bInterfaceProtocol));
-
+
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_storage_run\n"));
/* only support SCSI subclass and bulk only protocal */
-
+
stor = rt_malloc(sizeof(struct ustor));
RT_ASSERT(stor != RT_NULL);
/* initilize the data structure */
- rt_memset(stor, 0, sizeof(struct ustor));
+ rt_memset(stor, 0, sizeof(struct ustor));
intf->user_data = (void*)stor;
for(i=0; i<intf->intf_desc->bNumEndpoints; i++)
- {
+ {
uep_desc_t ep_desc;
-
+
/* get endpoint descriptor from interface descriptor */
rt_usbh_get_endpoint_descriptor(intf->intf_desc, i, &ep_desc);
if(ep_desc == RT_NULL)
@@ -560,11 +560,11 @@ static rt_err_t rt_usbh_storage_enable(void* arg)
rt_kprintf("rt_usb_get_endpoint_descriptor error\n");
return -RT_ERROR;
}
-
- /* the endpoint type of mass storage class should be BULK */
+
+ /* the endpoint type of mass storage class should be BULK */
if((ep_desc->bmAttributes & USB_EP_ATTR_TYPE_MASK) != USB_EP_ATTR_BULK)
continue;
-
+
/* allocate pipes according to the endpoint type */
if(ep_desc->bEndpointAddress & USB_DIR_IN)
{
@@ -572,7 +572,7 @@ static rt_err_t rt_usbh_storage_enable(void* arg)
stor->pipe_in = rt_usb_instance_find_pipe(intf->device,ep_desc->bEndpointAddress);
}
else
- {
+ {
/* alloc an output pipe for the storage instance */
stor->pipe_out = rt_usb_instance_find_pipe(intf->device,ep_desc->bEndpointAddress);
}
@@ -583,8 +583,8 @@ static rt_err_t rt_usbh_storage_enable(void* arg)
{
rt_kprintf("pipe error, unsupported device\n");
return -RT_ERROR;
- }
-
+ }
+
/* should implement as callback */
ret = rt_udisk_run(intf);
if(ret != RT_EOK) return ret;
@@ -593,11 +593,11 @@ static rt_err_t rt_usbh_storage_enable(void* arg)
}
/**
- * This function will be invoked when usb device plug out is detected and it would clean
+ * This function will be invoked when usb device plug out is detected and it would clean
* and release all mass storage class related resources.
*
* @param arg the argument.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t rt_usbh_storage_disable(void* arg)
@@ -617,7 +617,7 @@ static rt_err_t rt_usbh_storage_disable(void* arg)
rt_udisk_stop(intf);
-
+
/* free storage instance */
if(stor != RT_NULL) rt_free(stor);
return RT_EOK;
@@ -626,13 +626,13 @@ static rt_err_t rt_usbh_storage_disable(void* arg)
/**
* This function will register mass storage class driver to the usb class driver manager.
* and it should be invoked in the usb system initialization.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
ucd_t rt_usbh_class_driver_storage(void)
{
storage_driver.class_code = USB_CLASS_MASS_STORAGE;
-
+
storage_driver.enable = rt_usbh_storage_enable;
storage_driver.disable = rt_usbh_storage_disable;
diff --git a/components/drivers/usb/usbhost/class/mass.h b/components/drivers/usb/usbhost/class/mass.h
index 770e64a03f..2578fb54c7 100644
--- a/components/drivers/usb/usbhost/class/mass.h
+++ b/components/drivers/usb/usbhost/class/mass.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -30,17 +30,17 @@ struct ustor
upipe_t pipe_in;
upipe_t pipe_out;
rt_uint32_t capicity[2];
-
+
struct rt_device dev[MAX_PARTITION_COUNT];
rt_uint8_t dev_cnt;
-};
+};
typedef struct ustor* ustor_t;
rt_err_t rt_usbh_storage_get_max_lun(struct uhintf* intf, rt_uint8_t* max_lun);
rt_err_t rt_usbh_storage_reset(struct uhintf* intf);
-rt_err_t rt_usbh_storage_read10(struct uhintf* intf, rt_uint8_t *buffer,
+rt_err_t rt_usbh_storage_read10(struct uhintf* intf, rt_uint8_t *buffer,
rt_uint32_t sector, rt_size_t count, int timeout);
-rt_err_t rt_usbh_storage_write10(struct uhintf* intf, rt_uint8_t *buffer,
+rt_err_t rt_usbh_storage_write10(struct uhintf* intf, rt_uint8_t *buffer,
rt_uint32_t sector, rt_size_t count, int timeout);
rt_err_t rt_usbh_storage_request_sense(struct uhintf* intf, rt_uint8_t* buffer);
rt_err_t rt_usbh_storage_test_unit_ready(struct uhintf* intf);
diff --git a/components/drivers/usb/usbhost/class/udisk.c b/components/drivers/usb/usbhost/class/udisk.c
index 6c8030b29a..8be311e657 100644
--- a/components/drivers/usb/usbhost/class/udisk.c
+++ b/components/drivers/usb/usbhost/class/udisk.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
diff --git a/components/drivers/usb/usbhost/class/ukbd.c b/components/drivers/usb/usbhost/class/ukbd.c
index 7d608de259..c89d60cd36 100644
--- a/components/drivers/usb/usbhost/class/ukbd.c
+++ b/components/drivers/usb/usbhost/class/ukbd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -14,13 +14,13 @@
#if defined(RT_USBH_HID) && defined(RT_USBH_HID_KEYBOARD)
-static struct uprotocal kbd_protocal;
+static struct uprotocal kbd_protocal;
static rt_err_t rt_usbh_hid_kbd_callback(void* arg)
{
int int1, int2;
- struct uhid* hid;
-
+ struct uhid* hid;
+
hid = (struct uhid*)arg;
int1 = *(rt_uint32_t*)hid->buffer;
@@ -28,9 +28,9 @@ static rt_err_t rt_usbh_hid_kbd_callback(void* arg)
if(int1 != 0 || int2 != 0)
{
- RT_DEBUG_LOG(RT_DEBUG_USB, ("key down 0x%x, 0x%x\n", int1, int2));
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("key down 0x%x, 0x%x\n", int1, int2));
}
-
+
return RT_EOK;
}
@@ -38,20 +38,20 @@ static rt_err_t rt_usbh_hid_kbd_init(void* arg)
{
struct uintf* intf = (struct uintf*)arg;
- RT_ASSERT(intf != RT_NULL);
-
+ RT_ASSERT(intf != RT_NULL);
+
rt_usbh_hid_set_protocal(intf, 0);
rt_usbh_hid_set_idle(intf, 10, 0);
- //RT_DEBUG_LOG(RT_DEBUG_USB, ("start usb keyboard\n"));
+ //RT_DEBUG_LOG(RT_DEBUG_USB, ("start usb keyboard\n"));
return RT_EOK;
}
/**
* This function will define the hid keyboard protocal, it will be register to the protocal list.
- *
+ *
* @return the keyboard protocal structure.
*/
uprotocal_t rt_usbh_hid_protocal_kbd(void)
diff --git a/components/drivers/usb/usbhost/class/umouse.c b/components/drivers/usb/usbhost/class/umouse.c
index e769475a98..ae14cba22c 100644
--- a/components/drivers/usb/usbhost/class/umouse.c
+++ b/components/drivers/usb/usbhost/class/umouse.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -126,15 +126,36 @@ static rt_err_t rt_usbh_hid_mouse_callback(void* arg)
return RT_EOK;
}
+rt_thread_t mouse_thread;
+void mouse_task(void* param)
+{
+ struct uhintf* intf = (struct uhintf*)param;
+ while (1)
+ {
+ if (rt_usb_hcd_pipe_xfer(intf->device->hcd, ((struct uhid*)intf->user_data)->pipe_in,
+ ((struct uhid*)intf->user_data)->buffer, ((struct uhid*)intf->user_data)->pipe_in->ep.wMaxPacketSize,
+ USB_TIMEOUT_BASIC) == 0)
+ {
+ break;
+ }
+
+ rt_usbh_hid_mouse_callback(intf->user_data);
+ }
+}
+
+
static rt_err_t rt_usbh_hid_mouse_init(void* arg)
{
- struct uintf* intf = (struct uintf*)arg;
+ struct uhintf* intf = (struct uhintf*)arg;
RT_ASSERT(intf != RT_NULL);
rt_usbh_hid_set_protocal(intf, 0);
- rt_usbh_hid_set_idle(intf, 10, 0);
+ rt_usbh_hid_set_idle(intf, 0, 0);
+
+ mouse_thread = rt_thread_create("mouse0", mouse_task, intf, 500, 8, 100);
+ rt_thread_startup(mouse_thread);
RT_DEBUG_LOG(RT_DEBUG_USB, ("start usb mouse\n"));
#ifdef RT_USING_RTGUI
diff --git a/components/drivers/usb/usbhost/core/driver.c b/components/drivers/usb/usbhost/core/driver.c
index 542d456ff1..102e388154 100644
--- a/components/drivers/usb/usbhost/core/driver.c
+++ b/components/drivers/usb/usbhost/core/driver.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -19,7 +19,7 @@ static rt_bool_t _driver_list_created = RT_FALSE;
/**
* This function will initilize the usb class driver related data structure,
* and it should be invoked in the usb system initialization.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_class_driver_init(void)
@@ -29,14 +29,14 @@ rt_err_t rt_usbh_class_driver_init(void)
rt_list_init(&_driver_list);
_driver_list_created = RT_TRUE;
}
- return RT_EOK;
+ return RT_EOK;
}
/**
* This function will register an usb class driver to the class driver manager.
*
* @param drv the pointer of the usb class driver.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
@@ -49,15 +49,15 @@ rt_err_t rt_usbh_class_driver_register(ucd_t drv)
/* insert class driver into driver list */
rt_list_insert_after(&_driver_list, &(drv->list));
}
-
- return RT_EOK;
+
+ return RT_EOK;
}
/**
* This function will removes a previously registed usb class driver.
*
* @param drv the pointer of the usb class driver structure.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_class_driver_unregister(ucd_t drv)
@@ -75,7 +75,7 @@ rt_err_t rt_usbh_class_driver_unregister(ucd_t drv)
*
* @param drv the pointer of usb class driver.
* @param args the parameter of run function.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_class_driver_enable(ucd_t drv, void* args)
@@ -93,7 +93,7 @@ rt_err_t rt_usbh_class_driver_enable(ucd_t drv, void* args)
*
* @param drv the pointer of usb class driver structure.
* @param args the argument of the stop function.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_class_driver_disable(ucd_t drv, void* args)
@@ -110,7 +110,7 @@ rt_err_t rt_usbh_class_driver_disable(ucd_t drv, void* args)
/**
* This function finds a usb class driver by specified class code and subclass code.
*
- * @param class_code the usb class driver's class code.
+ * @param class_code the usb class driver's class code.
* @param subclass_code the usb class driver's sub class code.
*
* @return the registered usb class driver on successful, or RT_NULL on failure.
@@ -126,7 +126,7 @@ ucd_t rt_usbh_class_driver_find(int class_code, int subclass_code)
/* try to find driver object */
for (node = _driver_list.next; node != &_driver_list; node = node->next)
{
- ucd_t drv =
+ ucd_t drv =
(ucd_t)rt_list_entry(node, struct uclass_driver, list);
if (drv->class_code == class_code)
{
diff --git a/components/drivers/usb/usbhost/core/hub.c b/components/drivers/usb/usbhost/core/hub.c
index e8c8dfff72..bf48bc4c61 100644
--- a/components/drivers/usb/usbhost/core/hub.c
+++ b/components/drivers/usb/usbhost/core/hub.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -78,7 +78,7 @@ static rt_err_t root_hub_ctrl(struct uhcd *hcd, rt_uint16_t port, rt_uint8_t cmd
return RT_ERROR;
}
return RT_EOK;
-}
+}
void rt_usbh_root_hub_connect_handler(struct uhcd *hcd, rt_uint8_t port, rt_bool_t isHS)
{
struct uhost_msg msg;
@@ -107,23 +107,23 @@ void rt_usbh_root_hub_disconnect_handler(struct uhcd *hcd, rt_uint8_t port)
}
/**
- * This function will do USB_REQ_GET_DESCRIPTOR bRequest for the device instance
+ * This function will do USB_REQ_GET_DESCRIPTOR bRequest for the device instance
* to get usb hub descriptor.
*
* @param intf the interface instance.
* @buffer the data buffer to save usb hub descriptor.
* @param nbytes the size of buffer
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hub_get_descriptor(struct uinstance* device, rt_uint8_t *buffer, rt_size_t nbytes)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(device != RT_NULL);
-
+
setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_CLASS | USB_REQ_TYPE_DEVICE;
setup.bRequest = USB_REQ_GET_DESCRIPTOR;
setup.wIndex = 0;
@@ -136,24 +136,24 @@ rt_err_t rt_usbh_hub_get_descriptor(struct uinstance* device, rt_uint8_t *buffer
{
return RT_EOK;
}
- }
- return -RT_FALSE;
+ }
+ return -RT_FALSE;
}
/**
- * This function will do USB_REQ_GET_STATUS bRequest for the device instance
+ * This function will do USB_REQ_GET_STATUS bRequest for the device instance
* to get usb hub status.
*
* @param intf the interface instance.
* @buffer the data buffer to save usb hub status.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hub_get_status(struct uinstance* device, rt_uint32_t* buffer)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(device != RT_NULL);
@@ -169,31 +169,31 @@ rt_err_t rt_usbh_hub_get_status(struct uinstance* device, rt_uint32_t* buffer)
return RT_EOK;
}
}
- return -RT_FALSE;
+ return -RT_FALSE;
}
/**
- * This function will do USB_REQ_GET_STATUS bRequest for the device instance
+ * This function will do USB_REQ_GET_STATUS bRequest for the device instance
* to get hub port status.
*
* @param intf the interface instance.
* @port the hub port to get status.
* @buffer the data buffer to save usb hub status.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hub_get_port_status(uhub_t hub, rt_uint16_t port, rt_uint32_t* buffer)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(hub != RT_NULL);
/* get roothub port status */
if(hub->is_roothub)
{
- root_hub_ctrl(hub->hcd, port, RH_GET_PORT_STATUS,
+ root_hub_ctrl(hub->hcd, port, RH_GET_PORT_STATUS,
(void*)buffer);
return RT_EOK;
}
@@ -211,36 +211,36 @@ rt_err_t rt_usbh_hub_get_port_status(uhub_t hub, rt_uint16_t port, rt_uint32_t*
return RT_EOK;
}
}
- return -RT_FALSE;
+ return -RT_FALSE;
}
/**
- * This function will do USB_REQ_CLEAR_FEATURE bRequest for the device instance
+ * This function will do USB_REQ_CLEAR_FEATURE bRequest for the device instance
* to clear feature of the hub port.
*
* @param intf the interface instance.
* @port the hub port.
* @feature feature to be cleared.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hub_clear_port_feature(uhub_t hub, rt_uint16_t port, rt_uint16_t feature)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(hub != RT_NULL);
/* clear roothub feature */
if(hub->is_roothub)
{
- root_hub_ctrl(hub->hcd, port, RH_CLEAR_PORT_FEATURE,
+ root_hub_ctrl(hub->hcd, port, RH_CLEAR_PORT_FEATURE,
(void*)(rt_uint32_t)feature);
return RT_EOK;
}
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_OTHER;
setup.bRequest = USB_REQ_CLEAR_FEATURE;
setup.wIndex = port;
@@ -251,37 +251,37 @@ rt_err_t rt_usbh_hub_clear_port_feature(uhub_t hub, rt_uint16_t port, rt_uint16_
{
return RT_EOK;
}
- return -RT_FALSE;
+ return -RT_FALSE;
}
/**
- * This function will do USB_REQ_SET_FEATURE bRequest for the device instance
+ * This function will do USB_REQ_SET_FEATURE bRequest for the device instance
* to set feature of the hub port.
*
* @param intf the interface instance.
* @port the hub port.
* @feature feature to be set.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_hub_set_port_feature(uhub_t hub, rt_uint16_t port,
+rt_err_t rt_usbh_hub_set_port_feature(uhub_t hub, rt_uint16_t port,
rt_uint16_t feature)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
/* parameter check */
RT_ASSERT(hub != RT_NULL);
/* clear roothub feature */
if(hub->is_roothub)
{
- root_hub_ctrl(hub->hcd, port, RH_SET_PORT_FEATURE,
+ root_hub_ctrl(hub->hcd, port, RH_SET_PORT_FEATURE,
(void*)(rt_uint32_t)feature);
return RT_EOK;
}
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_CLASS |
USB_REQ_TYPE_OTHER;
setup.bRequest = USB_REQ_SET_FEATURE;
setup.wIndex = port;
@@ -292,7 +292,7 @@ rt_err_t rt_usbh_hub_set_port_feature(uhub_t hub, rt_uint16_t port,
{
return RT_EOK;
}
- else return -RT_FALSE;
+ else return -RT_FALSE;
}
/**
@@ -300,17 +300,17 @@ rt_err_t rt_usbh_hub_set_port_feature(uhub_t hub, rt_uint16_t port,
*
* @param intf the interface instance.
* @param port the hub port.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hub_reset_port(uhub_t hub, rt_uint16_t port)
{
rt_err_t ret;
rt_uint32_t pstatus;
-
+
/* parameter check */
RT_ASSERT(hub != RT_NULL);
-
+
rt_thread_delay(50);
/* reset hub port */
@@ -322,12 +322,12 @@ rt_err_t rt_usbh_hub_reset_port(uhub_t hub, rt_uint16_t port)
ret = rt_usbh_hub_get_port_status(hub, port, &pstatus);
if(!(pstatus & PORT_PRS)) break;
}
-
+
/* clear port reset feature */
- ret = rt_usbh_hub_clear_port_feature(hub, port, PORT_FEAT_C_RESET);
+ ret = rt_usbh_hub_clear_port_feature(hub, port, PORT_FEAT_C_RESET);
if(ret != RT_EOK) return ret;
- rt_thread_delay(50);
+ rt_thread_delay(50);
return RT_EOK;
}
@@ -337,7 +337,7 @@ rt_err_t rt_usbh_hub_reset_port(uhub_t hub, rt_uint16_t port)
*
* @param device the usb instance.
* @param port the hub port.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_hub_port_debounce(uhub_t hub, rt_uint16_t port)
@@ -357,15 +357,15 @@ rt_err_t rt_usbh_hub_port_debounce(uhub_t hub, rt_uint16_t port)
{
ret = rt_usbh_hub_get_port_status(hub, port, &pstatus);
if(ret != RT_EOK) return ret;
-
- if(!(pstatus & PORT_CCS))
+
+ if(!(pstatus & PORT_CCS))
{
connect = RT_FALSE;
break;
}
-
+
rt_thread_delay(delayticks);
- }
+ }
if(connect) return RT_EOK;
else return -RT_ERROR;
@@ -376,7 +376,7 @@ rt_err_t rt_usbh_hub_port_debounce(uhub_t hub, rt_uint16_t port)
* disconnect events.
*
* @param intf the interface instance.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t rt_usbh_hub_port_change(uhub_t hub)
@@ -387,7 +387,7 @@ static rt_err_t rt_usbh_hub_port_change(uhub_t hub)
/* parameter check */
RT_ASSERT(hub != RT_NULL);
- /* get usb device instance */
+ /* get usb device instance */
for (i = 0; i < hub->num_ports; i++)
{
rt_err_t ret;
@@ -395,7 +395,7 @@ static rt_err_t rt_usbh_hub_port_change(uhub_t hub)
rt_uint32_t pstatus = 0;
reconnect = RT_FALSE;
-
+
/* get hub port status */
ret = rt_usbh_hub_get_port_status(hub, i + 1, &pstatus);
if(ret != RT_EOK) continue;
@@ -403,8 +403,8 @@ static rt_err_t rt_usbh_hub_port_change(uhub_t hub)
RT_DEBUG_LOG(RT_DEBUG_USB, ("port %d status 0x%x\n", i + 1, pstatus));
/* check port status change */
- if (pstatus & PORT_CCSC)
- {
+ if (pstatus & PORT_CCSC)
+ {
/* clear port status change feature */
rt_usbh_hub_clear_port_feature(hub, i + 1, PORT_FEAT_C_CONNECTION);
reconnect = RT_TRUE;
@@ -412,39 +412,39 @@ static rt_err_t rt_usbh_hub_port_change(uhub_t hub)
if(pstatus & PORT_PESC)
{
- rt_usbh_hub_clear_port_feature(hub, i + 1, PORT_FEAT_C_ENABLE);
+ rt_usbh_hub_clear_port_feature(hub, i + 1, PORT_FEAT_C_ENABLE);
reconnect = RT_TRUE;
}
-
+
if(reconnect)
- {
+ {
if(hub->child[i] != RT_NULL && hub->child[i]->status != DEV_STATUS_IDLE)
- {
+ {
rt_usbh_detach_instance(hub->child[i]);
/* Child device have been detach. Set hub->child[i] to NULL. */
hub->child[i] = RT_NULL;
}
-
+
ret = rt_usbh_hub_port_debounce(hub, i + 1);
if(ret != RT_EOK) continue;
-
+
/* allocate an usb instance for new connected device */
device = rt_usbh_alloc_instance(hub->hcd);
if(device == RT_NULL) break;
-
+
/* set usb device speed */
device->speed = (pstatus & PORT_LSDA) ? 1 : 0;
- device->parent_hub = hub;
+ device->parent_hub = hub;
device->hcd = hub->hcd;
device->port = i + 1;
hub->child[i] = device;
/* reset usb roothub port */
rt_usbh_hub_reset_port(hub, i + 1);
-
+
/* attatch the usb instance to the hcd */
- rt_usbh_attatch_instance(device);
+ rt_usbh_attatch_instance(device);
}
}
@@ -455,7 +455,7 @@ static rt_err_t rt_usbh_hub_port_change(uhub_t hub)
* This function is the callback function of hub's int endpoint, it is invoked when data comes.
*
* @param context the context of the callback function.
- *
+ *
* @return none.
*/
static void rt_usbh_hub_irq(void* context)
@@ -463,9 +463,9 @@ static void rt_usbh_hub_irq(void* context)
upipe_t pipe;
uhub_t hub;
int timeout = USB_TIMEOUT_BASIC;
-
+
RT_ASSERT(context != RT_NULL);
-
+
pipe = (upipe_t)context;
hub = (uhub_t)pipe->user_data;
@@ -474,14 +474,14 @@ static void rt_usbh_hub_irq(void* context)
RT_DEBUG_LOG(RT_DEBUG_USB,("hub irq error\n"));
return;
}
-
+
rt_usbh_hub_port_change(hub);
RT_DEBUG_LOG(RT_DEBUG_USB,("hub int xfer...\n"));
/* parameter check */
RT_ASSERT(pipe->inst->hcd != RT_NULL);
-
+
rt_usb_hcd_pipe_xfer(hub->self->hcd, pipe, hub->buffer, pipe->ep.wMaxPacketSize, timeout);
}
@@ -490,7 +490,7 @@ static void rt_usbh_hub_irq(void* context)
* as a hub class device, it will continue to do the enumulate process.
*
* @param arg the argument.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
@@ -506,7 +506,7 @@ static rt_err_t rt_usbh_hub_enable(void *arg)
int timeout = USB_TIMEOUT_LONG;
/* paremeter check */
RT_ASSERT(intf != RT_NULL);
-
+
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usbh_hub_run\n"));
/* get usb device instance */
@@ -516,7 +516,7 @@ static rt_err_t rt_usbh_hub_enable(void *arg)
hub = rt_malloc(sizeof(struct uhub));
RT_ASSERT(hub != RT_NULL);
rt_memset(hub, 0, sizeof(struct uhub));
-
+
/* make interface instance's user data point to hub instance */
intf->user_data = (void*)hub;
@@ -525,17 +525,17 @@ static rt_err_t rt_usbh_hub_enable(void *arg)
if(ret != RT_EOK)
{
rt_kprintf("get hub descriptor failed\n");
- return -RT_ERROR;
+ return -RT_ERROR;
}
/* get full hub descriptor */
- ret = rt_usbh_hub_get_descriptor(device, (rt_uint8_t*)&hub->hub_desc,
+ ret = rt_usbh_hub_get_descriptor(device, (rt_uint8_t*)&hub->hub_desc,
hub->hub_desc.length);
if(ret != RT_EOK)
{
rt_kprintf("get hub descriptor again failed\n");
- return -RT_ERROR;
- }
+ return -RT_ERROR;
+ }
/* get hub ports number */
/* If hub device supported ports over USB_HUB_PORT_NUM(Ex: 8 port hub). Set hub->num_ports to USB_HUB_PORT_NUM */
@@ -555,7 +555,7 @@ static rt_err_t rt_usbh_hub_enable(void *arg)
* 2 * RT_TICK_PER_SECOND / 1000 );
}
- if(intf->intf_desc->bNumEndpoints != 1)
+ if(intf->intf_desc->bNumEndpoints != 1)
return -RT_ERROR;
/* get endpoint descriptor from interface descriptor */
@@ -566,12 +566,12 @@ static rt_err_t rt_usbh_hub_enable(void *arg)
return -RT_ERROR;
}
- /* the endpoint type of hub class should be interrupt */
+ /* the endpoint type of hub class should be interrupt */
if( USB_EP_ATTR(ep_desc->bmAttributes) == USB_EP_ATTR_INT)
{
/* the endpoint direction of hub class should be in */
if(ep_desc->bEndpointAddress & USB_DIR_IN)
- {
+ {
/* allocate a pipe according to the endpoint type */
pipe_in = rt_usb_instance_find_pipe(device,ep_desc->bEndpointAddress);
if(pipe_in == RT_NULL)
@@ -586,17 +586,17 @@ static rt_err_t rt_usbh_hub_enable(void *arg)
/* parameter check */
RT_ASSERT(device->hcd != RT_NULL);
pipe_in->user_data = hub;
- rt_usb_hcd_pipe_xfer(hub->hcd, pipe_in, hub->buffer,
+ rt_usb_hcd_pipe_xfer(hub->hcd, pipe_in, hub->buffer,
pipe_in->ep.wMaxPacketSize, timeout);
return RT_EOK;
}
/**
- * This function will be invoked when usb hub plug out is detected and it would clean
+ * This function will be invoked when usb hub plug out is detected and it would clean
* and release all hub class related resources.
*
* @param arg the argument.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
static rt_err_t rt_usbh_hub_disable(void* arg)
@@ -616,7 +616,7 @@ static rt_err_t rt_usbh_hub_disable(void* arg)
if(hub->child[i] != RT_NULL)
rt_usbh_detach_instance(hub->child[i]);
}
-
+
if(hub != RT_NULL) rt_free(hub);
return RT_EOK;
@@ -625,13 +625,13 @@ static rt_err_t rt_usbh_hub_disable(void* arg)
/**
* This function will register hub class driver to the usb class driver manager.
* and it should be invoked in the usb system initialization.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
ucd_t rt_usbh_class_driver_hub(void)
-{
+{
hub_driver.class_code = USB_CLASS_HUB;
-
+
hub_driver.enable = rt_usbh_hub_enable;
hub_driver.disable = rt_usbh_hub_disable;
@@ -639,28 +639,28 @@ ucd_t rt_usbh_class_driver_hub(void)
}
/**
- * This function is the main entry of usb hub thread, it is in charge of
- * processing all messages received from the usb message buffer.
+ * This function is the main entry of usb hub thread, it is in charge of
+ * processing all messages received from the usb message buffer.
*
* @param parameter the parameter of the usb host thread.
- *
+ *
* @return none.
*/
static void rt_usbh_hub_thread_entry(void* parameter)
-{
+{
uhcd_t hcd = (uhcd_t)parameter;
while(1)
- {
+ {
struct uhost_msg msg;
-
+
/* receive message */
- if(rt_mq_recv(hcd->usb_mq, &msg, sizeof(struct uhost_msg), RT_WAITING_FOREVER)
+ if(rt_mq_recv(hcd->usb_mq, &msg, sizeof(struct uhost_msg), RT_WAITING_FOREVER)
!= RT_EOK ) continue;
//RT_DEBUG_LOG(RT_DEBUG_USB, ("msg type %d\n", msg.type));
-
+
switch (msg.type)
- {
+ {
case USB_MSG_CONNECT_CHANGE:
rt_usbh_hub_port_change(msg.content.hub);
break;
@@ -670,7 +670,7 @@ static void rt_usbh_hub_thread_entry(void* parameter)
break;
default:
break;
- }
+ }
}
}
@@ -678,8 +678,8 @@ static void rt_usbh_hub_thread_entry(void* parameter)
* This function will post an message to the usb message queue,
*
* @param msg the message to be posted
- *
- * @return the error code, RT_EOK on successfully.
+ *
+ * @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_event_signal(uhcd_t hcd, struct uhost_msg* msg)
{
@@ -695,7 +695,7 @@ rt_err_t rt_usbh_event_signal(uhcd_t hcd, struct uhost_msg* msg)
* This function will initialize usb hub thread.
*
* @return none.
- *
+ *
*/
void rt_usbh_hub_init(uhcd_t hcd)
{
@@ -707,10 +707,11 @@ void rt_usbh_hub_init(uhcd_t hcd)
hcd->roothub->hcd = hcd;
hcd->roothub->num_ports = hcd->num_ports;
/* create usb message queue */
+
hcd->usb_mq = rt_mq_create(hcd->parent.parent.name, 32, 16, RT_IPC_FLAG_FIFO);
-
+
/* create usb hub thread */
- thread = rt_thread_create(hcd->parent.parent.name, rt_usbh_hub_thread_entry, hcd,
+ thread = rt_thread_create(hcd->parent.parent.name, rt_usbh_hub_thread_entry, hcd,
USB_THREAD_STACK_SIZE, 8, 20);
if(thread != RT_NULL)
{
diff --git a/components/drivers/usb/usbhost/core/usbhost.c b/components/drivers/usb/usbhost/core/usbhost.c
index 201ec2229b..84b9640b76 100644
--- a/components/drivers/usb/usbhost/core/usbhost.c
+++ b/components/drivers/usb/usbhost/core/usbhost.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -20,13 +20,13 @@
/**
* This function will initialize the usb host stack, all the usb class driver and
* host controller driver are also be initialized here.
- *
+ *
* @return none.
*/
rt_err_t rt_usb_host_init(const char *name)
{
ucd_t drv;
- rt_device_t uhc;
+ rt_device_t uhc;
uhc = rt_device_find(name);
if(uhc == RT_NULL)
diff --git a/components/drivers/usb/usbhost/core/usbhost_core.c b/components/drivers/usb/usbhost/core/usbhost_core.c
index d72dca82f2..71fe3b8b3f 100644
--- a/components/drivers/usb/usbhost/core/usbhost_core.c
+++ b/components/drivers/usb/usbhost/core/usbhost_core.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006-2018, RT-Thread Development Team
+ * Copyright (c) 2006-2021, RT-Thread Development Team
*
* SPDX-License-Identifier: Apache-2.0
*
@@ -27,28 +27,28 @@ uinst_t rt_usbh_alloc_instance(uhcd_t uhcd)
/* lock scheduler */
rt_enter_critical();
-
+
for(i=0; i<USB_MAX_DEVICE; i++)
{
/* to find an idle instance handle */
if(dev[i].status != DEV_STATUS_IDLE) continue;
-
+
/* initialize the usb device instance */
rt_memset(&dev[i], 0, sizeof(struct uinstance));
-
+
dev[i].status = DEV_STATUS_BUSY;
dev[i].index = i + 1;
dev[i].address = 0;
dev[i].max_packet_size = 0x8;
rt_list_init(&dev[i].pipe);
dev[i].hcd = uhcd;
- /* unlock scheduler */
+ /* unlock scheduler */
rt_exit_critical();
return &dev[i];
}
- /* unlock scheduler */
- rt_exit_critical();
+ /* unlock scheduler */
+ rt_exit_critical();
return RT_NULL;
}
@@ -59,10 +59,10 @@ uinst_t rt_usbh_alloc_instance(uhcd_t uhcd)
*
* @param hcd the host controller driver.
* @param device the usb device instance.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-static struct uendpoint_descriptor ep0_out_desc =
+static struct uendpoint_descriptor ep0_out_desc =
{
/*endpoint descriptor*/
USB_DESC_LENGTH_ENDPOINT,
@@ -72,7 +72,7 @@ static struct uendpoint_descriptor ep0_out_desc =
0x00,
0x00,
};
-static struct uendpoint_descriptor ep0_in_desc =
+static struct uendpoint_descriptor ep0_in_desc =
{
/*endpoint descriptor*/
USB_DESC_LENGTH_ENDPOINT,
@@ -95,10 +95,10 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
ucd_t drv;
RT_ASSERT(device != RT_NULL);
-
+
rt_memset(&cfg_desc, 0, sizeof(struct uconfig_descriptor));
dev_desc = &device->dev_desc;
-
+
/* alloc address 0 ep0 pipe*/
ep0_out_desc.wMaxPacketSize = 8;
ep0_in_desc.wMaxPacketSize = 8;
@@ -106,7 +106,7 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
rt_usb_hcd_alloc_pipe(device->hcd, &device->pipe_ep0_in, device, &ep0_in_desc);
RT_DEBUG_LOG(RT_DEBUG_USB, ("start enumnation\n"));
-
+
/* get device descriptor head */
ret = rt_usbh_get_descriptor(device, USB_DESC_TYPE_DEVICE, (void*)dev_desc, 8);
if(ret != RT_EOK)
@@ -114,7 +114,7 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
rt_kprintf("get device descriptor head failed\n");
return ret;
}
-
+
/* reset bus */
rt_usbh_hub_reset_port(device->parent_hub, device->port);
rt_thread_delay(2);
@@ -127,20 +127,20 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
return ret;
}
/* free address 0 ep0 pipe*/
-
+
rt_usb_hcd_free_pipe(device->hcd,device->pipe_ep0_out);
rt_usb_hcd_free_pipe(device->hcd,device->pipe_ep0_in);
-
+
/* set device max packet size */
ep0_out_desc.wMaxPacketSize = device->dev_desc.bMaxPacketSize0;
ep0_in_desc.wMaxPacketSize = device->dev_desc.bMaxPacketSize0;
-
+
/* alloc true address ep0 pipe*/
rt_usb_hcd_alloc_pipe(device->hcd, &device->pipe_ep0_out, device, &ep0_out_desc);
rt_usb_hcd_alloc_pipe(device->hcd, &device->pipe_ep0_in, device, &ep0_in_desc);
RT_DEBUG_LOG(RT_DEBUG_USB, ("get device descriptor length %d\n",
dev_desc->bLength));
-
+
/* get full device descriptor again */
ret = rt_usbh_get_descriptor(device, USB_DESC_TYPE_DEVICE, (void*)dev_desc, dev_desc->bLength);
if(ret != RT_EOK)
@@ -169,7 +169,7 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
rt_memset(device->cfg_desc, 0, cfg_desc.wTotalLength);
/* get full configuration descriptor */
- ret = rt_usbh_get_descriptor(device, USB_DESC_TYPE_CONFIGURATION,
+ ret = rt_usbh_get_descriptor(device, USB_DESC_TYPE_CONFIGURATION,
device->cfg_desc, cfg_desc.wTotalLength);
if(ret != RT_EOK)
{
@@ -179,12 +179,12 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
/* set configuration */
ret = rt_usbh_set_configure(device, 1);
- if(ret != RT_EOK)
+ if(ret != RT_EOK)
{
return ret;
}
for(i=0; i<device->cfg_desc->bNumInterfaces; i++)
- {
+ {
/* get interface descriptor through configuration descriptor */
ret = rt_usbh_get_interface_descriptor(device->cfg_desc, i, &intf_desc);
if(ret != RT_EOK)
@@ -193,7 +193,7 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
return -RT_ERROR;
}
- RT_DEBUG_LOG(RT_DEBUG_USB, ("interface class 0x%x, subclass 0x%x\n",
+ RT_DEBUG_LOG(RT_DEBUG_USB, ("interface class 0x%x, subclass 0x%x\n",
intf_desc->bInterfaceClass,
intf_desc->bInterfaceSubClass));
/* alloc pipe*/
@@ -216,9 +216,9 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
}
}
/* find driver by class code found in interface descriptor */
- drv = rt_usbh_class_driver_find(intf_desc->bInterfaceClass,
+ drv = rt_usbh_class_driver_find(intf_desc->bInterfaceClass,
intf_desc->bInterfaceSubClass);
-
+
if(drv != RT_NULL)
{
/* allocate memory for interface device */
@@ -245,7 +245,7 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
continue;
}
}
-
+
return RT_EOK;
}
@@ -254,19 +254,19 @@ rt_err_t rt_usbh_attatch_instance(uinst_t device)
* and release all resource.
*
* @param device the usb device instance.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_detach_instance(uinst_t device)
{
int i = 0;
rt_list_t * l;
- if(device == RT_NULL)
+ if(device == RT_NULL)
{
rt_kprintf("no usb instance to detach\n");
return -RT_ERROR;
}
-
+
/* free configration descriptor */
if (device->cfg_desc) {
for (i = 0; i < device->cfg_desc->bNumInterfaces; i++)
@@ -282,10 +282,10 @@ rt_err_t rt_usbh_detach_instance(uinst_t device)
}
rt_free(device->cfg_desc);
}
-
+
rt_usb_hcd_free_pipe(device->hcd,device->pipe_ep0_out);
rt_usb_hcd_free_pipe(device->hcd,device->pipe_ep0_in);
-
+
while(device->pipe.next!= &device->pipe)
{
l = device->pipe.next;
@@ -293,29 +293,29 @@ rt_err_t rt_usbh_detach_instance(uinst_t device)
rt_usb_hcd_free_pipe(device->hcd,rt_list_entry(l,struct upipe,list));
}
rt_memset(device, 0, sizeof(struct uinstance));
-
+
return RT_EOK;
}
/**
* This function will do USB_REQ_GET_DESCRIPTO' bRequest for the usb device instance,
*
- * @param device the usb device instance.
+ * @param device the usb device instance.
* @param type the type of descriptor bRequest.
* @param buffer the data buffer to save requested data
* @param nbytes the size of buffer
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_get_descriptor(uinst_t device, rt_uint8_t type, void* buffer,
+rt_err_t rt_usbh_get_descriptor(uinst_t device, rt_uint8_t type, void* buffer,
int nbytes)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
RT_ASSERT(device != RT_NULL);
- setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_STANDARD |
+ setup.request_type = USB_REQ_TYPE_DIR_IN | USB_REQ_TYPE_STANDARD |
USB_REQ_TYPE_DEVICE;
setup.bRequest = USB_REQ_GET_DESCRIPTOR;
setup.wIndex = 0;
@@ -339,19 +339,19 @@ rt_err_t rt_usbh_get_descriptor(uinst_t device, rt_uint8_t type, void* buffer,
* This function will set an address to the usb device.
*
* @param device the usb device instance.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_set_address(uinst_t device)
{
struct urequest setup;
int timeout = USB_TIMEOUT_BASIC;
-
+
RT_ASSERT(device != RT_NULL);
RT_DEBUG_LOG(RT_DEBUG_USB, ("rt_usb_set_address\n"));
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
USB_REQ_TYPE_DEVICE;
setup.bRequest = USB_REQ_SET_ADDRESS;
setup.wIndex = 0;
@@ -375,7 +375,7 @@ rt_err_t rt_usbh_set_address(uinst_t device)
*
* @param device the usb device instance.
* @param config the configuration number.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_set_configure(uinst_t device, int config)
@@ -386,7 +386,7 @@ rt_err_t rt_usbh_set_configure(uinst_t device, int config)
/* check parameter */
RT_ASSERT(device != RT_NULL);
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
USB_REQ_TYPE_DEVICE;
setup.bRequest = USB_REQ_SET_CONFIGURATION;
setup.wIndex = 0;
@@ -401,7 +401,7 @@ rt_err_t rt_usbh_set_configure(uinst_t device, int config)
{
return RT_ERROR;
}
- return RT_EOK;
+ return RT_EOK;
}
/**
@@ -409,7 +409,7 @@ rt_err_t rt_usbh_set_configure(uinst_t device, int config)
*
* @param device the usb device instance.
* @param intf the interface number.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_set_interface(uinst_t device, int intf)
@@ -420,7 +420,7 @@ rt_err_t rt_usbh_set_interface(uinst_t device, int intf)
/* check parameter */
RT_ASSERT(device != RT_NULL);
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
USB_REQ_TYPE_INTERFACE;
setup.bRequest = USB_REQ_SET_INTERFACE;
setup.wIndex = 0;
@@ -431,8 +431,8 @@ rt_err_t rt_usbh_set_interface(uinst_t device, int intf)
{
return RT_ERROR;
}
-
- return RT_EOK;
+
+ return RT_EOK;
}
/**
@@ -440,7 +440,7 @@ rt_err_t rt_usbh_set_interface(uinst_t device, int intf)
*
* @param device the usb device instance.
* @param endpoint the endpoint number of the usb device.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
rt_err_t rt_usbh_clear_feature(uinst_t device, int endpoint, int feature)
@@ -451,7 +451,7 @@ rt_err_t rt_usbh_clear_feature(uinst_t device, int endpoint, int feature)
/* check parameter */
RT_ASSERT(device != RT_NULL);
- setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
+ setup.request_type = USB_REQ_TYPE_DIR_OUT | USB_REQ_TYPE_STANDARD |
USB_REQ_TYPE_ENDPOINT;
setup.bRequest = USB_REQ_CLEAR_FEATURE;
setup.wIndex = endpoint;
@@ -462,8 +462,8 @@ rt_err_t rt_usbh_clear_feature(uinst_t device, int endpoint, int feature)
{
return RT_ERROR;
}
-
- return RT_EOK;
+
+ return RT_EOK;
}
/**
@@ -472,10 +472,10 @@ rt_err_t rt_usbh_clear_feature(uinst_t device, int endpoint, int feature)
* @param cfg_desc the point of configuration descriptor structure.
* @param num the number of interface descriptor.
* @intf_desc the point of interface descriptor point.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_get_interface_descriptor(ucfg_desc_t cfg_desc, int num,
+rt_err_t rt_usbh_get_interface_descriptor(ucfg_desc_t cfg_desc, int num,
uintf_desc_t* intf_desc)
{
rt_uint32_t ptr, depth = 0;
@@ -487,9 +487,9 @@ rt_err_t rt_usbh_get_interface_descriptor(ucfg_desc_t cfg_desc, int num,
ptr = (rt_uint32_t)cfg_desc + cfg_desc->bLength;
while(ptr < (rt_uint32_t)cfg_desc + cfg_desc->wTotalLength)
{
- if(depth++ > 0x20)
+ if(depth++ > 0x20)
{
- *intf_desc = RT_NULL;
+ *intf_desc = RT_NULL;
return -RT_EIO;
}
desc = (udesc_t)ptr;
@@ -500,10 +500,10 @@ rt_err_t rt_usbh_get_interface_descriptor(ucfg_desc_t cfg_desc, int num,
*intf_desc = (uintf_desc_t)desc;
RT_DEBUG_LOG(RT_DEBUG_USB,
- ("rt_usb_get_interface_descriptor: %d\n", num));
+ ("rt_usb_get_interface_descriptor: %d\n", num));
return RT_EOK;
}
- }
+ }
ptr = (rt_uint32_t)desc + desc->bLength;
}
@@ -517,14 +517,14 @@ rt_err_t rt_usbh_get_interface_descriptor(ucfg_desc_t cfg_desc, int num,
* @param intf_desc the point of interface descriptor structure.
* @param num the number of endpoint descriptor.
* @param ep_desc the point of endpoint descriptor point.
- *
+ *
* @return the error code, RT_EOK on successfully.
*/
-rt_err_t rt_usbh_get_endpoint_descriptor(uintf_desc_t intf_desc, int num,
+rt_err_t rt_usbh_get_endpoint_descriptor(uintf_desc_t intf_desc, int num,
uep_desc_t* ep_desc)
{
int count = 0, depth = 0;
- rt_uint32_t ptr;
+ rt_uint32_t ptr;
udesc_t desc;
/* check parameter */
@@ -535,15 +535,15 @@ rt_err_t rt_usbh_get_endpoint_descriptor(uintf_desc_t intf_desc, int num,
ptr = (rt_uint32_t)intf_desc + intf_desc->bLength;
while(count < intf_desc->bNumEndpoints)
{
- if(depth++ > 0x20)
+ if(depth++ > 0x20)
{
- *ep_desc = RT_NULL;
+ *ep_desc = RT_NULL;
return -RT_EIO;
}
- desc = (udesc_t)ptr;
+ desc = (udesc_t)ptr;
if(desc->type == USB_DESC_TYPE_ENDPOINT)
{
- if(num == count)
+ if(num == count)
{
*ep_desc = (uep_desc_t)desc;