mirror of https://github.com/rusefi/ChibiOS.git
Fixed broken F107 USB demo.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10213 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
dce45c502e
commit
c7a1582338
|
@ -39,7 +39,7 @@
|
||||||
</cconfiguration>
|
</cconfiguration>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
<project id="TEST-STM32F1xx-USB_CDC _F107.null.636142167" name="TEST-STM32F1xx-USB_CDC _F107"/>
|
<project id="STM32F107-USB_CDC.null.636142167" name="STM32F107-USB_CDC"/>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="scannerConfiguration">
|
<storageModule moduleId="scannerConfiguration">
|
||||||
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<projectDescription>
|
<projectDescription>
|
||||||
<name>TEST-STM32F1xx-USB_CDC_F107</name>
|
<name>STM32F107-USB_CDC</name>
|
||||||
<comment></comment>
|
<comment></comment>
|
||||||
<projects>
|
<projects>
|
||||||
</projects>
|
</projects>
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
<link>
|
<link>
|
||||||
<name>board</name>
|
<name>board</name>
|
||||||
<type>2</type>
|
<type>2</type>
|
||||||
<locationURI>CHIBIOS/boards/OLIMEX_STM32_P107</locationURI>
|
<locationURI>CHIBIOS/os/hal/boards/OLIMEX_STM32_P107</locationURI>
|
||||||
</link>
|
</link>
|
||||||
<link>
|
<link>
|
||||||
<name>os</name>
|
<name>os</name>
|
||||||
|
|
|
@ -60,7 +60,7 @@ endif
|
||||||
# Stack size to be allocated to the Cortex-M process stack. This stack is
|
# Stack size to be allocated to the Cortex-M process stack. This stack is
|
||||||
# the stack used by the main() thread.
|
# the stack used by the main() thread.
|
||||||
ifeq ($(USE_PROCESS_STACKSIZE),)
|
ifeq ($(USE_PROCESS_STACKSIZE),)
|
||||||
USE_PROCESS_STACKSIZE = 0x400
|
USE_PROCESS_STACKSIZE = 0x200
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Stack size to the allocated to the Cortex-M main/exceptions stack. This
|
# Stack size to the allocated to the Cortex-M main/exceptions stack. This
|
||||||
|
@ -69,11 +69,6 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
|
||||||
USE_EXCEPTIONS_STACKSIZE = 0x400
|
USE_EXCEPTIONS_STACKSIZE = 0x400
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Enables the use of FPU (no, softfp, hard).
|
|
||||||
ifeq ($(USE_FPU),)
|
|
||||||
USE_FPU = no
|
|
||||||
endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Architecture or project specific options
|
# Architecture or project specific options
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
@ -91,17 +86,19 @@ CHIBIOS = ../../../..
|
||||||
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
|
include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f1xx.mk
|
||||||
# HAL-OSAL files (optional).
|
# HAL-OSAL files (optional).
|
||||||
include $(CHIBIOS)/os/hal/hal.mk
|
include $(CHIBIOS)/os/hal/hal.mk
|
||||||
include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform.mk
|
include $(CHIBIOS)/os/hal/ports/STM32/STM32F1xx/platform_f105_f107.mk
|
||||||
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P107/board.mk
|
include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_P107/board.mk
|
||||||
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
||||||
# RTOS files (optional).
|
# RTOS files (optional).
|
||||||
include $(CHIBIOS)/os/rt/rt.mk
|
include $(CHIBIOS)/os/rt/rt.mk
|
||||||
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
||||||
# Other files (optional).
|
# Other files (optional).
|
||||||
#include $(CHIBIOS)/test/rt/test.mk
|
include $(CHIBIOS)/test/rt/test.mk
|
||||||
|
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
||||||
|
include $(CHIBIOS)/os/various/shell/shell.mk
|
||||||
|
|
||||||
# Define linker script file here
|
# Define linker script file here
|
||||||
LDSCRIPT= $(STARTUPLD)/STM32F103xB.ld
|
LDSCRIPT= $(STARTUPLD)/STM32F107xC.ld
|
||||||
|
|
||||||
# C sources that can be compiled in ARM or THUMB mode depending on the global
|
# C sources that can be compiled in ARM or THUMB mode depending on the global
|
||||||
# setting.
|
# setting.
|
||||||
|
@ -113,10 +110,9 @@ CSRC = $(STARTUPSRC) \
|
||||||
$(PLATFORMSRC) \
|
$(PLATFORMSRC) \
|
||||||
$(BOARDSRC) \
|
$(BOARDSRC) \
|
||||||
$(TESTSRC) \
|
$(TESTSRC) \
|
||||||
$(CHIBIOS)/os/various/shell.c \
|
$(STREAMSSRC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
$(SHELLSRC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
usbcfg.c main.c
|
||||||
main.c
|
|
||||||
|
|
||||||
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
||||||
# setting.
|
# setting.
|
||||||
|
@ -149,7 +145,7 @@ ASMXSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
|
||||||
INCDIR = $(CHIBIOS)/os/license \
|
INCDIR = $(CHIBIOS)/os/license \
|
||||||
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
$(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
||||||
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various
|
$(STREAMSINC) $(SHELLINC)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Project, sources and paths
|
# Project, sources and paths
|
||||||
|
@ -159,7 +155,7 @@ INCDIR = $(CHIBIOS)/os/license \
|
||||||
# Compiler settings
|
# Compiler settings
|
||||||
#
|
#
|
||||||
|
|
||||||
MCU = cortex-m3
|
MCU = cortex-m0
|
||||||
|
|
||||||
#TRGT = arm-elf-
|
#TRGT = arm-elf-
|
||||||
TRGT = arm-none-eabi-
|
TRGT = arm-none-eabi-
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
* The value one is not valid, timeouts are rounded up to
|
* The value one is not valid, timeouts are rounded up to
|
||||||
* this value.
|
* this value.
|
||||||
*/
|
*/
|
||||||
#define CH_CFG_ST_TIMEDELTA 2
|
#define CH_CFG_ST_TIMEDELTA 0
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<launchConfiguration type="org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
|
||||||
|
<stringAttribute key="bad_container_name" value="\STM32F107-USB_CDC\debug"/>
|
||||||
|
<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.delay" value="1"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doHalt" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.doReset" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.initCommands" value="set remotetimeout 20 monitor reset init monitor sleep 50 "/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="Generic TCP/IP"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
|
||||||
|
<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.runCommands" value=""/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="arm-none-eabi-gdb"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="Standard"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb"/>
|
||||||
|
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?><contentList/>"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <globalVariableList/> "/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <memoryBlockExpressionList/> "/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="STM32F107-USB_CDC"/>
|
||||||
|
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
|
||||||
|
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.51705747"/>
|
||||||
|
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
|
||||||
|
<listEntry value="/STM32F107-USB_CDC"/>
|
||||||
|
</listAttribute>
|
||||||
|
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
|
||||||
|
<listEntry value="4"/>
|
||||||
|
</listAttribute>
|
||||||
|
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||||
|
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||||
|
</listAttribute>
|
||||||
|
</launchConfiguration>
|
|
@ -30,6 +30,13 @@
|
||||||
|
|
||||||
#include "mcuconf.h"
|
#include "mcuconf.h"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Enables the TM subsystem.
|
||||||
|
*/
|
||||||
|
#if !defined(HAL_USE_TM) || defined(__DOXYGEN__)
|
||||||
|
#define HAL_USE_TM FALSE
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Enables the PAL subsystem.
|
* @brief Enables the PAL subsystem.
|
||||||
*/
|
*/
|
||||||
|
@ -97,7 +104,7 @@
|
||||||
* @brief Enables the MAC subsystem.
|
* @brief Enables the MAC subsystem.
|
||||||
*/
|
*/
|
||||||
#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
|
#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
|
||||||
#define HAL_USE_MAC FALSE
|
#define HAL_USE_MAC TRUE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -23,368 +23,15 @@
|
||||||
#include "shell.h"
|
#include "shell.h"
|
||||||
#include "chprintf.h"
|
#include "chprintf.h"
|
||||||
|
|
||||||
/*===========================================================================*/
|
#include "usbcfg.h"
|
||||||
/* USB related stuff. */
|
|
||||||
/*===========================================================================*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Endpoints to be used for USBD1.
|
|
||||||
*/
|
|
||||||
#define USBD1_DATA_REQUEST_EP 1
|
|
||||||
#define USBD1_DATA_AVAILABLE_EP 1
|
|
||||||
#define USBD1_INTERRUPT_REQUEST_EP 2
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Serial over USB Driver structure.
|
|
||||||
*/
|
|
||||||
static SerialUSBDriver SDU1;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* USB Device Descriptor.
|
|
||||||
*/
|
|
||||||
static const uint8_t vcom_device_descriptor_data[18] = {
|
|
||||||
USB_DESC_DEVICE (0x0110, /* bcdUSB (1.1). */
|
|
||||||
0x02, /* bDeviceClass (CDC). */
|
|
||||||
0x00, /* bDeviceSubClass. */
|
|
||||||
0x00, /* bDeviceProtocol. */
|
|
||||||
0x40, /* bMaxPacketSize. */
|
|
||||||
0x0483, /* idVendor (ST). */
|
|
||||||
0x5740, /* idProduct. */
|
|
||||||
0x0200, /* bcdDevice. */
|
|
||||||
1, /* iManufacturer. */
|
|
||||||
2, /* iProduct. */
|
|
||||||
3, /* iSerialNumber. */
|
|
||||||
1) /* bNumConfigurations. */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Device Descriptor wrapper.
|
|
||||||
*/
|
|
||||||
static const USBDescriptor vcom_device_descriptor = {
|
|
||||||
sizeof vcom_device_descriptor_data,
|
|
||||||
vcom_device_descriptor_data
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Configuration Descriptor tree for a CDC.*/
|
|
||||||
static const uint8_t vcom_configuration_descriptor_data[67] = {
|
|
||||||
/* Configuration Descriptor.*/
|
|
||||||
USB_DESC_CONFIGURATION(67, /* wTotalLength. */
|
|
||||||
0x02, /* bNumInterfaces. */
|
|
||||||
0x01, /* bConfigurationValue. */
|
|
||||||
0, /* iConfiguration. */
|
|
||||||
0xC0, /* bmAttributes (self powered). */
|
|
||||||
50), /* bMaxPower (100mA). */
|
|
||||||
/* Interface Descriptor.*/
|
|
||||||
USB_DESC_INTERFACE (0x00, /* bInterfaceNumber. */
|
|
||||||
0x00, /* bAlternateSetting. */
|
|
||||||
0x01, /* bNumEndpoints. */
|
|
||||||
0x02, /* bInterfaceClass (Communications
|
|
||||||
Interface Class, CDC section
|
|
||||||
4.2). */
|
|
||||||
0x02, /* bInterfaceSubClass (Abstract
|
|
||||||
Control Model, CDC section 4.3). */
|
|
||||||
0x01, /* bInterfaceProtocol (AT commands,
|
|
||||||
CDC section 4.4). */
|
|
||||||
0), /* iInterface. */
|
|
||||||
/* Header Functional Descriptor (CDC section 5.2.3).*/
|
|
||||||
USB_DESC_BYTE (5), /* bLength. */
|
|
||||||
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
|
||||||
USB_DESC_BYTE (0x00), /* bDescriptorSubtype (Header
|
|
||||||
Functional Descriptor. */
|
|
||||||
USB_DESC_BCD (0x0110), /* bcdCDC. */
|
|
||||||
/* Call Management Functional Descriptor. */
|
|
||||||
USB_DESC_BYTE (5), /* bFunctionLength. */
|
|
||||||
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
|
||||||
USB_DESC_BYTE (0x01), /* bDescriptorSubtype (Call Management
|
|
||||||
Functional Descriptor). */
|
|
||||||
USB_DESC_BYTE (0x00), /* bmCapabilities (D0+D1). */
|
|
||||||
USB_DESC_BYTE (0x01), /* bDataInterface. */
|
|
||||||
/* ACM Functional Descriptor.*/
|
|
||||||
USB_DESC_BYTE (4), /* bFunctionLength. */
|
|
||||||
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
|
||||||
USB_DESC_BYTE (0x02), /* bDescriptorSubtype (Abstract
|
|
||||||
Control Management Descriptor). */
|
|
||||||
USB_DESC_BYTE (0x02), /* bmCapabilities. */
|
|
||||||
/* Union Functional Descriptor.*/
|
|
||||||
USB_DESC_BYTE (5), /* bFunctionLength. */
|
|
||||||
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
|
||||||
USB_DESC_BYTE (0x06), /* bDescriptorSubtype (Union
|
|
||||||
Functional Descriptor). */
|
|
||||||
USB_DESC_BYTE (0x00), /* bMasterInterface (Communication
|
|
||||||
Class Interface). */
|
|
||||||
USB_DESC_BYTE (0x01), /* bSlaveInterface0 (Data Class
|
|
||||||
Interface). */
|
|
||||||
/* Endpoint 2 Descriptor.*/
|
|
||||||
USB_DESC_ENDPOINT (USBD1_INTERRUPT_REQUEST_EP|0x80,
|
|
||||||
0x03, /* bmAttributes (Interrupt). */
|
|
||||||
0x0008, /* wMaxPacketSize. */
|
|
||||||
0xFF), /* bInterval. */
|
|
||||||
/* Interface Descriptor.*/
|
|
||||||
USB_DESC_INTERFACE (0x01, /* bInterfaceNumber. */
|
|
||||||
0x00, /* bAlternateSetting. */
|
|
||||||
0x02, /* bNumEndpoints. */
|
|
||||||
0x0A, /* bInterfaceClass (Data Class
|
|
||||||
Interface, CDC section 4.5). */
|
|
||||||
0x00, /* bInterfaceSubClass (CDC section
|
|
||||||
4.6). */
|
|
||||||
0x00, /* bInterfaceProtocol (CDC section
|
|
||||||
4.7). */
|
|
||||||
0x00), /* iInterface. */
|
|
||||||
/* Endpoint 3 Descriptor.*/
|
|
||||||
USB_DESC_ENDPOINT (USBD1_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
|
||||||
0x02, /* bmAttributes (Bulk). */
|
|
||||||
0x0040, /* wMaxPacketSize. */
|
|
||||||
0x00), /* bInterval. */
|
|
||||||
/* Endpoint 1 Descriptor.*/
|
|
||||||
USB_DESC_ENDPOINT (USBD1_DATA_REQUEST_EP|0x80, /* bEndpointAddress.*/
|
|
||||||
0x02, /* bmAttributes (Bulk). */
|
|
||||||
0x0040, /* wMaxPacketSize. */
|
|
||||||
0x00) /* bInterval. */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Configuration Descriptor wrapper.
|
|
||||||
*/
|
|
||||||
static const USBDescriptor vcom_configuration_descriptor = {
|
|
||||||
sizeof vcom_configuration_descriptor_data,
|
|
||||||
vcom_configuration_descriptor_data
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* U.S. English language identifier.
|
|
||||||
*/
|
|
||||||
static const uint8_t vcom_string0[] = {
|
|
||||||
USB_DESC_BYTE(4), /* bLength. */
|
|
||||||
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
|
||||||
USB_DESC_WORD(0x0409) /* wLANGID (U.S. English). */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Vendor string.
|
|
||||||
*/
|
|
||||||
static const uint8_t vcom_string1[] = {
|
|
||||||
USB_DESC_BYTE(38), /* bLength. */
|
|
||||||
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
|
||||||
'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,
|
|
||||||
'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,
|
|
||||||
'c', 0, 's', 0
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Device Description string.
|
|
||||||
*/
|
|
||||||
static const uint8_t vcom_string2[] = {
|
|
||||||
USB_DESC_BYTE(56), /* bLength. */
|
|
||||||
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
|
||||||
'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,
|
|
||||||
'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,
|
|
||||||
'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,
|
|
||||||
'o', 0, 'r', 0, 't', 0
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Serial Number string.
|
|
||||||
*/
|
|
||||||
static const uint8_t vcom_string3[] = {
|
|
||||||
USB_DESC_BYTE(8), /* bLength. */
|
|
||||||
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
|
||||||
'0' + CH_KERNEL_MAJOR, 0,
|
|
||||||
'0' + CH_KERNEL_MINOR, 0,
|
|
||||||
'0' + CH_KERNEL_PATCH, 0
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Strings wrappers array.
|
|
||||||
*/
|
|
||||||
static const USBDescriptor vcom_strings[] = {
|
|
||||||
{sizeof vcom_string0, vcom_string0},
|
|
||||||
{sizeof vcom_string1, vcom_string1},
|
|
||||||
{sizeof vcom_string2, vcom_string2},
|
|
||||||
{sizeof vcom_string3, vcom_string3}
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Handles the GET_DESCRIPTOR callback. All required descriptors must be
|
|
||||||
* handled here.
|
|
||||||
*/
|
|
||||||
static const USBDescriptor *get_descriptor(USBDriver *usbp,
|
|
||||||
uint8_t dtype,
|
|
||||||
uint8_t dindex,
|
|
||||||
uint16_t lang) {
|
|
||||||
|
|
||||||
(void)usbp;
|
|
||||||
(void)lang;
|
|
||||||
switch (dtype) {
|
|
||||||
case USB_DESCRIPTOR_DEVICE:
|
|
||||||
return &vcom_device_descriptor;
|
|
||||||
case USB_DESCRIPTOR_CONFIGURATION:
|
|
||||||
return &vcom_configuration_descriptor;
|
|
||||||
case USB_DESCRIPTOR_STRING:
|
|
||||||
if (dindex < 4)
|
|
||||||
return &vcom_strings[dindex];
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief IN EP1 state.
|
|
||||||
*/
|
|
||||||
static USBInEndpointState ep1instate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief OUT EP1 state.
|
|
||||||
*/
|
|
||||||
static USBOutEndpointState ep1outstate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief EP1 initialization structure (both IN and OUT).
|
|
||||||
*/
|
|
||||||
static const USBEndpointConfig ep1config = {
|
|
||||||
USB_EP_MODE_TYPE_BULK,
|
|
||||||
NULL,
|
|
||||||
sduDataTransmitted,
|
|
||||||
sduDataReceived,
|
|
||||||
0x0040,
|
|
||||||
0x0040,
|
|
||||||
&ep1instate,
|
|
||||||
&ep1outstate,
|
|
||||||
1,
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief IN EP2 state.
|
|
||||||
*/
|
|
||||||
static USBInEndpointState ep2instate;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief EP2 initialization structure (IN only).
|
|
||||||
*/
|
|
||||||
static const USBEndpointConfig ep2config = {
|
|
||||||
USB_EP_MODE_TYPE_INTR,
|
|
||||||
NULL,
|
|
||||||
sduInterruptTransmitted,
|
|
||||||
NULL,
|
|
||||||
0x0010,
|
|
||||||
0x0000,
|
|
||||||
&ep2instate,
|
|
||||||
NULL,
|
|
||||||
1,
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Handles the USB driver global events.
|
|
||||||
*/
|
|
||||||
static void usb_event(USBDriver *usbp, usbevent_t event) {
|
|
||||||
|
|
||||||
switch (event) {
|
|
||||||
case USB_EVENT_RESET:
|
|
||||||
return;
|
|
||||||
case USB_EVENT_ADDRESS:
|
|
||||||
return;
|
|
||||||
case USB_EVENT_CONFIGURED:
|
|
||||||
chSysLockFromIsr();
|
|
||||||
|
|
||||||
/* Enables the endpoints specified into the configuration.
|
|
||||||
Note, this callback is invoked from an ISR so I-Class functions
|
|
||||||
must be used.*/
|
|
||||||
usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &ep1config);
|
|
||||||
usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &ep2config);
|
|
||||||
|
|
||||||
/* Resetting the state of the CDC subsystem.*/
|
|
||||||
sduConfigureHookI(&SDU1);
|
|
||||||
|
|
||||||
chSysUnlockFromIsr();
|
|
||||||
return;
|
|
||||||
case USB_EVENT_SUSPEND:
|
|
||||||
return;
|
|
||||||
case USB_EVENT_WAKEUP:
|
|
||||||
return;
|
|
||||||
case USB_EVENT_STALLED:
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* USB driver configuration.
|
|
||||||
*/
|
|
||||||
static const USBConfig usbcfg = {
|
|
||||||
usb_event,
|
|
||||||
get_descriptor,
|
|
||||||
sduRequestsHook,
|
|
||||||
NULL
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Serial over USB driver configuration.
|
|
||||||
*/
|
|
||||||
static const SerialUSBConfig serusbcfg = {
|
|
||||||
&USBD1,
|
|
||||||
USBD1_DATA_REQUEST_EP,
|
|
||||||
USBD1_DATA_AVAILABLE_EP,
|
|
||||||
USBD1_INTERRUPT_REQUEST_EP
|
|
||||||
};
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Command line related. */
|
/* Command line related. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
#define SHELL_WA_SIZE THD_WA_SIZE(2048)
|
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
||||||
#define TEST_WA_SIZE THD_WA_SIZE(256)
|
|
||||||
|
|
||||||
static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
size_t n, size;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: mem\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
n = chHeapStatus(NULL, &size);
|
|
||||||
chprintf(chp, "core free memory : %u bytes\r\n", chCoreGetStatusX());
|
|
||||||
chprintf(chp, "heap fragments : %u\r\n", n);
|
|
||||||
chprintf(chp, "heap free total : %u bytes\r\n", size);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
static const char *states[] = {THD_STATE_NAMES};
|
|
||||||
Thread *tp;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: threads\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
chprintf(chp, " addr stack prio refs state time\r\n");
|
|
||||||
tp = chRegFirstThread();
|
|
||||||
do {
|
|
||||||
chprintf(chp, "%08lx %08lx %4lu %4lu %9s %lu\r\n",
|
|
||||||
(uint32_t)tp, (uint32_t)tp->p_ctx.r13,
|
|
||||||
(uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
|
|
||||||
states[tp->p_state], (uint32_t)tp->p_time);
|
|
||||||
tp = chRegNextThread(tp);
|
|
||||||
} while (tp != NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
Thread *tp;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: test\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriority(),
|
|
||||||
TestThread, chp);
|
|
||||||
if (tp == NULL) {
|
|
||||||
chprintf(chp, "out of memory\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
chThdWait(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/* Can be measured using dd if=/dev/xxxx of=/dev/null bs=512 count=10000.*/
|
||||||
static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
|
static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
static uint8_t buf[] =
|
static uint8_t buf[] =
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
||||||
|
@ -411,15 +58,20 @@ static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {
|
while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {
|
||||||
chSequentialStreamWrite(&SDU1, buf, sizeof buf - 1);
|
#if 1
|
||||||
|
/* Writing in channel mode.*/
|
||||||
|
chnWrite(&SDU1, buf, sizeof buf - 1);
|
||||||
|
#else
|
||||||
|
/* Writing in buffer mode.*/
|
||||||
|
(void) obqGetEmptyBufferTimeout(&SDU1.obqueue, TIME_INFINITE);
|
||||||
|
memcpy(SDU1.obqueue.ptr, buf, SERIAL_USB_BUFFERS_SIZE);
|
||||||
|
obqPostFullBuffer(&SDU1.obqueue, SERIAL_USB_BUFFERS_SIZE);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
chprintf(chp, "\r\n\nstopped\r\n");
|
chprintf(chp, "\r\n\nstopped\r\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
static const ShellCommand commands[] = {
|
static const ShellCommand commands[] = {
|
||||||
{"mem", cmd_mem},
|
|
||||||
{"threads", cmd_threads},
|
|
||||||
{"test", cmd_test},
|
|
||||||
{"write", cmd_write},
|
{"write", cmd_write},
|
||||||
{NULL, NULL}
|
{NULL, NULL}
|
||||||
};
|
};
|
||||||
|
@ -436,8 +88,8 @@ static const ShellConfig shell_cfg1 = {
|
||||||
/*
|
/*
|
||||||
* Red LED blinker thread, times are in milliseconds.
|
* Red LED blinker thread, times are in milliseconds.
|
||||||
*/
|
*/
|
||||||
static WORKING_AREA(waThread1, 128);
|
static THD_WORKING_AREA(waThread1, 128);
|
||||||
static msg_t Thread1(void *arg) {
|
static THD_FUNCTION(Thread1, arg) {
|
||||||
|
|
||||||
(void)arg;
|
(void)arg;
|
||||||
chRegSetThreadName("blinker");
|
chRegSetThreadName("blinker");
|
||||||
|
@ -454,7 +106,6 @@ static msg_t Thread1(void *arg) {
|
||||||
* Application entry point.
|
* Application entry point.
|
||||||
*/
|
*/
|
||||||
int main(void) {
|
int main(void) {
|
||||||
Thread *shelltp = NULL;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* System initializations.
|
* System initializations.
|
||||||
|
@ -493,15 +144,14 @@ int main(void) {
|
||||||
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
|
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Normal main() thread activity, in this demo it does nothing except
|
* Normal main() thread activity, spawning shells.
|
||||||
* sleeping in a loop and check the button state.
|
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
else if (chThdTerminated(shelltp)) {
|
"shell", NORMALPRIO + 1,
|
||||||
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
shellThread, (void *)&shell_cfg1);
|
||||||
shelltp = NULL; /* Triggers spawning of a new shell. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
}
|
}
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
#ifndef MCUCONF_H
|
#ifndef MCUCONF_H
|
||||||
#define MCUCONF_H
|
#define MCUCONF_H
|
||||||
|
|
||||||
#define STM32F103_MCUCONF
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* STM32F107 drivers configuration.
|
* STM32F107 drivers configuration.
|
||||||
* The following settings override the default settings present in
|
* The following settings override the default settings present in
|
||||||
|
@ -33,6 +31,8 @@
|
||||||
* 0...3 Lowest...Highest.
|
* 0...3 Lowest...Highest.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define STM32F107_MCUCONF
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* HAL driver system settings.
|
* HAL driver system settings.
|
||||||
*/
|
*/
|
||||||
|
@ -117,7 +117,8 @@
|
||||||
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
|
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
#define STM32_I2C_I2C1_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
||||||
|
#define STM32_I2C_I2C2_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ICU driver system settings.
|
* ICU driver system settings.
|
||||||
|
|
|
@ -0,0 +1,342 @@
|
||||||
|
/*
|
||||||
|
ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "hal.h"
|
||||||
|
|
||||||
|
/* Virtual serial port over USB.*/
|
||||||
|
SerialUSBDriver SDU1;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Endpoints to be used for USBD1.
|
||||||
|
*/
|
||||||
|
#define USBD1_DATA_REQUEST_EP 1
|
||||||
|
#define USBD1_DATA_AVAILABLE_EP 1
|
||||||
|
#define USBD1_INTERRUPT_REQUEST_EP 2
|
||||||
|
|
||||||
|
/*
|
||||||
|
* USB Device Descriptor.
|
||||||
|
*/
|
||||||
|
static const uint8_t vcom_device_descriptor_data[18] = {
|
||||||
|
USB_DESC_DEVICE (0x0110, /* bcdUSB (1.1). */
|
||||||
|
0x02, /* bDeviceClass (CDC). */
|
||||||
|
0x00, /* bDeviceSubClass. */
|
||||||
|
0x00, /* bDeviceProtocol. */
|
||||||
|
0x40, /* bMaxPacketSize. */
|
||||||
|
0x0483, /* idVendor (ST). */
|
||||||
|
0x5740, /* idProduct. */
|
||||||
|
0x0200, /* bcdDevice. */
|
||||||
|
1, /* iManufacturer. */
|
||||||
|
2, /* iProduct. */
|
||||||
|
3, /* iSerialNumber. */
|
||||||
|
1) /* bNumConfigurations. */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Device Descriptor wrapper.
|
||||||
|
*/
|
||||||
|
static const USBDescriptor vcom_device_descriptor = {
|
||||||
|
sizeof vcom_device_descriptor_data,
|
||||||
|
vcom_device_descriptor_data
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Configuration Descriptor tree for a CDC.*/
|
||||||
|
static const uint8_t vcom_configuration_descriptor_data[67] = {
|
||||||
|
/* Configuration Descriptor.*/
|
||||||
|
USB_DESC_CONFIGURATION(67, /* wTotalLength. */
|
||||||
|
0x02, /* bNumInterfaces. */
|
||||||
|
0x01, /* bConfigurationValue. */
|
||||||
|
0, /* iConfiguration. */
|
||||||
|
0xC0, /* bmAttributes (self powered). */
|
||||||
|
50), /* bMaxPower (100mA). */
|
||||||
|
/* Interface Descriptor.*/
|
||||||
|
USB_DESC_INTERFACE (0x00, /* bInterfaceNumber. */
|
||||||
|
0x00, /* bAlternateSetting. */
|
||||||
|
0x01, /* bNumEndpoints. */
|
||||||
|
0x02, /* bInterfaceClass (Communications
|
||||||
|
Interface Class, CDC section
|
||||||
|
4.2). */
|
||||||
|
0x02, /* bInterfaceSubClass (Abstract
|
||||||
|
Control Model, CDC section 4.3). */
|
||||||
|
0x01, /* bInterfaceProtocol (AT commands,
|
||||||
|
CDC section 4.4). */
|
||||||
|
0), /* iInterface. */
|
||||||
|
/* Header Functional Descriptor (CDC section 5.2.3).*/
|
||||||
|
USB_DESC_BYTE (5), /* bLength. */
|
||||||
|
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
||||||
|
USB_DESC_BYTE (0x00), /* bDescriptorSubtype (Header
|
||||||
|
Functional Descriptor. */
|
||||||
|
USB_DESC_BCD (0x0110), /* bcdCDC. */
|
||||||
|
/* Call Management Functional Descriptor. */
|
||||||
|
USB_DESC_BYTE (5), /* bFunctionLength. */
|
||||||
|
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
||||||
|
USB_DESC_BYTE (0x01), /* bDescriptorSubtype (Call Management
|
||||||
|
Functional Descriptor). */
|
||||||
|
USB_DESC_BYTE (0x00), /* bmCapabilities (D0+D1). */
|
||||||
|
USB_DESC_BYTE (0x01), /* bDataInterface. */
|
||||||
|
/* ACM Functional Descriptor.*/
|
||||||
|
USB_DESC_BYTE (4), /* bFunctionLength. */
|
||||||
|
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
||||||
|
USB_DESC_BYTE (0x02), /* bDescriptorSubtype (Abstract
|
||||||
|
Control Management Descriptor). */
|
||||||
|
USB_DESC_BYTE (0x02), /* bmCapabilities. */
|
||||||
|
/* Union Functional Descriptor.*/
|
||||||
|
USB_DESC_BYTE (5), /* bFunctionLength. */
|
||||||
|
USB_DESC_BYTE (0x24), /* bDescriptorType (CS_INTERFACE). */
|
||||||
|
USB_DESC_BYTE (0x06), /* bDescriptorSubtype (Union
|
||||||
|
Functional Descriptor). */
|
||||||
|
USB_DESC_BYTE (0x00), /* bMasterInterface (Communication
|
||||||
|
Class Interface). */
|
||||||
|
USB_DESC_BYTE (0x01), /* bSlaveInterface0 (Data Class
|
||||||
|
Interface). */
|
||||||
|
/* Endpoint 2 Descriptor.*/
|
||||||
|
USB_DESC_ENDPOINT (USBD1_INTERRUPT_REQUEST_EP|0x80,
|
||||||
|
0x03, /* bmAttributes (Interrupt). */
|
||||||
|
0x0008, /* wMaxPacketSize. */
|
||||||
|
0xFF), /* bInterval. */
|
||||||
|
/* Interface Descriptor.*/
|
||||||
|
USB_DESC_INTERFACE (0x01, /* bInterfaceNumber. */
|
||||||
|
0x00, /* bAlternateSetting. */
|
||||||
|
0x02, /* bNumEndpoints. */
|
||||||
|
0x0A, /* bInterfaceClass (Data Class
|
||||||
|
Interface, CDC section 4.5). */
|
||||||
|
0x00, /* bInterfaceSubClass (CDC section
|
||||||
|
4.6). */
|
||||||
|
0x00, /* bInterfaceProtocol (CDC section
|
||||||
|
4.7). */
|
||||||
|
0x00), /* iInterface. */
|
||||||
|
/* Endpoint 3 Descriptor.*/
|
||||||
|
USB_DESC_ENDPOINT (USBD1_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
||||||
|
0x02, /* bmAttributes (Bulk). */
|
||||||
|
0x0040, /* wMaxPacketSize. */
|
||||||
|
0x00), /* bInterval. */
|
||||||
|
/* Endpoint 1 Descriptor.*/
|
||||||
|
USB_DESC_ENDPOINT (USBD1_DATA_REQUEST_EP|0x80, /* bEndpointAddress.*/
|
||||||
|
0x02, /* bmAttributes (Bulk). */
|
||||||
|
0x0040, /* wMaxPacketSize. */
|
||||||
|
0x00) /* bInterval. */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Configuration Descriptor wrapper.
|
||||||
|
*/
|
||||||
|
static const USBDescriptor vcom_configuration_descriptor = {
|
||||||
|
sizeof vcom_configuration_descriptor_data,
|
||||||
|
vcom_configuration_descriptor_data
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* U.S. English language identifier.
|
||||||
|
*/
|
||||||
|
static const uint8_t vcom_string0[] = {
|
||||||
|
USB_DESC_BYTE(4), /* bLength. */
|
||||||
|
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
||||||
|
USB_DESC_WORD(0x0409) /* wLANGID (U.S. English). */
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Vendor string.
|
||||||
|
*/
|
||||||
|
static const uint8_t vcom_string1[] = {
|
||||||
|
USB_DESC_BYTE(38), /* bLength. */
|
||||||
|
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
||||||
|
'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,
|
||||||
|
'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,
|
||||||
|
'c', 0, 's', 0
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Device Description string.
|
||||||
|
*/
|
||||||
|
static const uint8_t vcom_string2[] = {
|
||||||
|
USB_DESC_BYTE(56), /* bLength. */
|
||||||
|
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
||||||
|
'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,
|
||||||
|
'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,
|
||||||
|
'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,
|
||||||
|
'o', 0, 'r', 0, 't', 0
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Serial Number string.
|
||||||
|
*/
|
||||||
|
static const uint8_t vcom_string3[] = {
|
||||||
|
USB_DESC_BYTE(8), /* bLength. */
|
||||||
|
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
||||||
|
'0' + CH_KERNEL_MAJOR, 0,
|
||||||
|
'0' + CH_KERNEL_MINOR, 0,
|
||||||
|
'0' + CH_KERNEL_PATCH, 0
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Strings wrappers array.
|
||||||
|
*/
|
||||||
|
static const USBDescriptor vcom_strings[] = {
|
||||||
|
{sizeof vcom_string0, vcom_string0},
|
||||||
|
{sizeof vcom_string1, vcom_string1},
|
||||||
|
{sizeof vcom_string2, vcom_string2},
|
||||||
|
{sizeof vcom_string3, vcom_string3}
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the GET_DESCRIPTOR callback. All required descriptors must be
|
||||||
|
* handled here.
|
||||||
|
*/
|
||||||
|
static const USBDescriptor *get_descriptor(USBDriver *usbp,
|
||||||
|
uint8_t dtype,
|
||||||
|
uint8_t dindex,
|
||||||
|
uint16_t lang) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
(void)lang;
|
||||||
|
switch (dtype) {
|
||||||
|
case USB_DESCRIPTOR_DEVICE:
|
||||||
|
return &vcom_device_descriptor;
|
||||||
|
case USB_DESCRIPTOR_CONFIGURATION:
|
||||||
|
return &vcom_configuration_descriptor;
|
||||||
|
case USB_DESCRIPTOR_STRING:
|
||||||
|
if (dindex < 4)
|
||||||
|
return &vcom_strings[dindex];
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief IN EP1 state.
|
||||||
|
*/
|
||||||
|
static USBInEndpointState ep1instate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief OUT EP1 state.
|
||||||
|
*/
|
||||||
|
static USBOutEndpointState ep1outstate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief EP1 initialization structure (both IN and OUT).
|
||||||
|
*/
|
||||||
|
static const USBEndpointConfig ep1config = {
|
||||||
|
USB_EP_MODE_TYPE_BULK,
|
||||||
|
NULL,
|
||||||
|
sduDataTransmitted,
|
||||||
|
sduDataReceived,
|
||||||
|
0x0040,
|
||||||
|
0x0040,
|
||||||
|
&ep1instate,
|
||||||
|
&ep1outstate,
|
||||||
|
2,
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief IN EP2 state.
|
||||||
|
*/
|
||||||
|
static USBInEndpointState ep2instate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief EP2 initialization structure (IN only).
|
||||||
|
*/
|
||||||
|
static const USBEndpointConfig ep2config = {
|
||||||
|
USB_EP_MODE_TYPE_INTR,
|
||||||
|
NULL,
|
||||||
|
sduInterruptTransmitted,
|
||||||
|
NULL,
|
||||||
|
0x0010,
|
||||||
|
0x0000,
|
||||||
|
&ep2instate,
|
||||||
|
NULL,
|
||||||
|
1,
|
||||||
|
NULL
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
|
extern SerialUSBDriver SDU1;
|
||||||
|
|
||||||
|
switch (event) {
|
||||||
|
case USB_EVENT_ADDRESS:
|
||||||
|
return;
|
||||||
|
case USB_EVENT_CONFIGURED:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Enables the endpoints specified into the configuration.
|
||||||
|
Note, this callback is invoked from an ISR so I-Class functions
|
||||||
|
must be used.*/
|
||||||
|
usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &ep1config);
|
||||||
|
usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &ep2config);
|
||||||
|
|
||||||
|
/* Resetting the state of the CDC subsystem.*/
|
||||||
|
sduConfigureHookI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
|
return;
|
||||||
|
case USB_EVENT_RESET:
|
||||||
|
/* Falls into.*/
|
||||||
|
case USB_EVENT_UNCONFIGURED:
|
||||||
|
/* Falls into.*/
|
||||||
|
case USB_EVENT_SUSPEND:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduSuspendHookI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
|
return;
|
||||||
|
case USB_EVENT_WAKEUP:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduWakeupHookI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
|
return;
|
||||||
|
case USB_EVENT_STALLED:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void sof_handler(USBDriver *usbp) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
|
||||||
|
osalSysLockFromISR();
|
||||||
|
sduSOFHookI(&SDU1);
|
||||||
|
osalSysUnlockFromISR();
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* USB driver configuration.
|
||||||
|
*/
|
||||||
|
const USBConfig usbcfg = {
|
||||||
|
usb_event,
|
||||||
|
get_descriptor,
|
||||||
|
sduRequestsHook,
|
||||||
|
sof_handler
|
||||||
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Serial over USB driver configuration.
|
||||||
|
*/
|
||||||
|
const SerialUSBConfig serusbcfg = {
|
||||||
|
&USBD1,
|
||||||
|
USBD1_DATA_REQUEST_EP,
|
||||||
|
USBD1_DATA_AVAILABLE_EP,
|
||||||
|
USBD1_INTERRUPT_REQUEST_EP
|
||||||
|
};
|
|
@ -0,0 +1,26 @@
|
||||||
|
/*
|
||||||
|
ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef USBCFG_H
|
||||||
|
#define USBCFG_H
|
||||||
|
|
||||||
|
extern const USBConfig usbcfg;
|
||||||
|
extern SerialUSBConfig serusbcfg;
|
||||||
|
extern SerialUSBDriver SDU1;
|
||||||
|
|
||||||
|
#endif /* USBCFG_H */
|
||||||
|
|
||||||
|
/** @} */
|
Loading…
Reference in New Issue