git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10511 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
16418339cb
commit
dec86b7716
|
@ -69,40 +69,6 @@
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||||
</cconfiguration>
|
</cconfiguration>
|
||||||
<cconfiguration id="0.1093754934.793646412">
|
|
||||||
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1093754934.793646412" moduleId="org.eclipse.cdt.core.settings" name="Build for STM32F303-Discovery">
|
|
||||||
<externalSettings/>
|
|
||||||
<extensions>
|
|
||||||
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
|
||||||
</extensions>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
|
||||||
<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.1093754934.793646412" name="Build for STM32F303-Discovery" parent="org.eclipse.cdt.build.core.prefbase.cfg">
|
|
||||||
<folderInfo id="0.1093754934.793646412." name="/" resourcePath="">
|
|
||||||
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.55927343" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
|
|
||||||
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.55927343.37738665" name=""/>
|
|
||||||
<builder arguments="-f Makefile-stm32f303_discovery" command="make" id="org.eclipse.cdt.build.core.settings.default.builder.1898772337" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1970756885" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.955878344" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
|
|
||||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1136133888" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.744641533" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
|
|
||||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1100282554" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
|
||||||
</tool>
|
|
||||||
<tool id="org.eclipse.cdt.build.core.settings.holder.589377864" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
|
|
||||||
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.499076633" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
|
|
||||||
</tool>
|
|
||||||
</toolChain>
|
|
||||||
</folderInfo>
|
|
||||||
</configuration>
|
|
||||||
</storageModule>
|
|
||||||
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
|
||||||
</cconfiguration>
|
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
<project id="STM32-PAL.null.932840044" name="STM32-PAL"/>
|
<project id="STM32-PAL.null.932840044" name="STM32-PAL"/>
|
||||||
|
@ -114,6 +80,7 @@
|
||||||
</scannerConfigBuildInfo>
|
</scannerConfigBuildInfo>
|
||||||
</storageModule>
|
</storageModule>
|
||||||
<storageModule moduleId="refreshScope" versionNumber="2">
|
<storageModule moduleId="refreshScope" versionNumber="2">
|
||||||
|
<configuration configurationName="Build for STM32F303-Discovery"/>
|
||||||
<configuration configurationName="Default">
|
<configuration configurationName="Default">
|
||||||
<resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>
|
<resource resourceType="PROJECT" workspacePath="/STM32-PAL"/>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
|
@ -86,7 +86,7 @@ endif
|
||||||
PROJECT = ch
|
PROJECT = ch
|
||||||
|
|
||||||
# Imported source files and paths
|
# Imported source files and paths
|
||||||
CHIBIOS := ../../..
|
CHIBIOS := ../../../..
|
||||||
CONFDIR := ./cfg-stm32l476_discovery
|
CONFDIR := ./cfg-stm32l476_discovery
|
||||||
BUILDDIR := ./build-stm32l476_discovery
|
BUILDDIR := ./build-stm32l476_discovery
|
||||||
DEPDIR := ./.dep-stm32l476_discovery
|
DEPDIR := ./.dep-stm32l476_discovery
|
||||||
|
@ -122,7 +122,7 @@ CSRC = $(STARTUPSRC) \
|
||||||
$(STREAMSSRC) \
|
$(STREAMSSRC) \
|
||||||
$(SHELLSRC) \
|
$(SHELLSRC) \
|
||||||
$(CONFDIR)/portab.c \
|
$(CONFDIR)/portab.c \
|
||||||
src/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.
|
||||||
|
@ -155,7 +155,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) \
|
||||||
$(STREAMSINC) $(SHELLINC) $(CONFDIR) ./src
|
$(STREAMSINC) $(SHELLINC) $(CONFDIR)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Project, sources and paths
|
# Project, sources and paths
|
||||||
|
|
|
@ -146,7 +146,7 @@
|
||||||
* @brief Enables the SERIAL over USB subsystem.
|
* @brief Enables the SERIAL over USB subsystem.
|
||||||
*/
|
*/
|
||||||
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
|
#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
|
||||||
#define HAL_USE_SERIAL_USB TRUE
|
#define HAL_USE_SERIAL_USB FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -167,7 +167,7 @@
|
||||||
* @brief Enables the USB subsystem.
|
* @brief Enables the USB subsystem.
|
||||||
*/
|
*/
|
||||||
#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
|
#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
|
||||||
#define HAL_USE_USB TRUE
|
#define HAL_USE_USB FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -91,6 +91,22 @@
|
||||||
#define STM32_DFSDMSEL STM32_DFSDMSEL_PCLK1
|
#define STM32_DFSDMSEL STM32_DFSDMSEL_PCLK1
|
||||||
#define STM32_RTCSEL STM32_RTCSEL_LSI
|
#define STM32_RTCSEL STM32_RTCSEL_LSI
|
||||||
|
|
||||||
|
/*
|
||||||
|
* IRQ system settings.
|
||||||
|
*/
|
||||||
|
#define STM32_IRQ_EXTI0_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI1_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI2_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI3_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI4_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI5_9_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI10_15_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI1635_38_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI18_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI19_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI20_PRIORITY 6
|
||||||
|
#define STM32_IRQ_EXTI2122_PRIORITY 15
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC driver system settings.
|
* ADC driver system settings.
|
||||||
*/
|
*/
|
||||||
|
@ -131,23 +147,6 @@
|
||||||
#define STM32_DAC_DAC1_CH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 4)
|
#define STM32_DAC_DAC1_CH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 4)
|
||||||
#define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
|
#define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
|
||||||
|
|
||||||
/*
|
|
||||||
* EXT driver system settings.
|
|
||||||
*/
|
|
||||||
#define STM32_EXT_EXTI0_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI1_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI2_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI3_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI4_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI18_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI19_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI20_IRQ_PRIORITY 6
|
|
||||||
#define STM32_EXT_EXTI2122_IRQ_PRIORITY 15
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* GPT driver system settings.
|
* GPT driver system settings.
|
||||||
*/
|
*/
|
||||||
|
@ -321,7 +320,7 @@
|
||||||
/*
|
/*
|
||||||
* USB driver system settings.
|
* USB driver system settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_USB_USE_OTG1 TRUE
|
#define STM32_USB_USE_OTG1 FALSE
|
||||||
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
||||||
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
||||||
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
|
#define STM32_USB_OTG_THREAD_PRIO LOWPRIO
|
||||||
|
|
|
@ -29,11 +29,8 @@
|
||||||
/* Module constants. */
|
/* Module constants. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
#define PORTAB_USB1 USBD1
|
|
||||||
|
|
||||||
#define PORTAB_SDU1 SDU1
|
|
||||||
|
|
||||||
#define PORTAB_BLINK_LED1 LINE_LED_GREEN
|
#define PORTAB_BLINK_LED1 LINE_LED_GREEN
|
||||||
|
#define PORTAB_BLINK_BUTTON LINE_JOY_DOWN
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Module pre-compile time settings. */
|
/* Module pre-compile time settings. */
|
||||||
|
|
|
@ -14,74 +14,10 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "ch.h"
|
#include "ch.h"
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
#include "portab.h"
|
#include "portab.h"
|
||||||
|
|
||||||
#include "shell.h"
|
|
||||||
#include "chprintf.h"
|
|
||||||
|
|
||||||
#include "usbcfg.h"
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
|
||||||
/* Command line related. */
|
|
||||||
/*===========================================================================*/
|
|
||||||
|
|
||||||
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
|
||||||
|
|
||||||
/* 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 uint8_t buf[] =
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
|
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef";
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: write\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {
|
|
||||||
#if 1
|
|
||||||
/* Writing in channel mode.*/
|
|
||||||
chnWrite(&PORTAB_SDU1, buf, sizeof buf - 1);
|
|
||||||
#else
|
|
||||||
/* Writing in buffer mode.*/
|
|
||||||
(void) obqGetEmptyBufferTimeout(&PORTAB_SDU1.obqueue, TIME_INFINITE);
|
|
||||||
memcpy(PORTAB_SDU1.obqueue.ptr, buf, SERIAL_USB_BUFFERS_SIZE);
|
|
||||||
obqPostFullBuffer(&PORTAB_SDU1.obqueue, SERIAL_USB_BUFFERS_SIZE);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
chprintf(chp, "\r\n\nstopped\r\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
static const ShellCommand commands[] = {
|
|
||||||
{"write", cmd_write},
|
|
||||||
{NULL, NULL}
|
|
||||||
};
|
|
||||||
|
|
||||||
static const ShellConfig shell_cfg1 = {
|
|
||||||
(BaseSequentialStream *)&PORTAB_SDU1,
|
|
||||||
commands
|
|
||||||
};
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Generic code. */
|
/* Generic code. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
@ -95,13 +31,10 @@ static THD_FUNCTION(Thread1, arg) {
|
||||||
(void)arg;
|
(void)arg;
|
||||||
chRegSetThreadName("blinker");
|
chRegSetThreadName("blinker");
|
||||||
while (true) {
|
while (true) {
|
||||||
systime_t time;
|
|
||||||
|
|
||||||
time = serusbcfg.usbp->state == USB_ACTIVE ? 250 : 500;
|
|
||||||
palClearLine(PORTAB_BLINK_LED1);
|
palClearLine(PORTAB_BLINK_LED1);
|
||||||
chThdSleepMilliseconds(time);
|
chThdSleepMilliseconds(500);
|
||||||
palSetLine(PORTAB_BLINK_LED1);
|
palSetLine(PORTAB_BLINK_LED1);
|
||||||
chThdSleepMilliseconds(time);
|
chThdSleepMilliseconds(500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,42 +53,15 @@ int main(void) {
|
||||||
halInit();
|
halInit();
|
||||||
chSysInit();
|
chSysInit();
|
||||||
|
|
||||||
/*
|
|
||||||
* Initializes a serial-over-USB CDC driver.
|
|
||||||
*/
|
|
||||||
sduObjectInit(&PORTAB_SDU1);
|
|
||||||
sduStart(&PORTAB_SDU1, &serusbcfg);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Activates the USB driver and then the USB bus pull-up on D+.
|
|
||||||
* Note, a delay is inserted in order to not have to disconnect the cable
|
|
||||||
* after a reset.
|
|
||||||
*/
|
|
||||||
usbDisconnectBus(serusbcfg.usbp);
|
|
||||||
chThdSleepMilliseconds(1500);
|
|
||||||
usbStart(serusbcfg.usbp, &usbcfg);
|
|
||||||
usbConnectBus(serusbcfg.usbp);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Shell manager initialization.
|
|
||||||
*/
|
|
||||||
shellInit();
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Creates the blinker thread.
|
* Creates the blinker thread.
|
||||||
*/
|
*/
|
||||||
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
|
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Normal main() thread activity, spawning shells.
|
* Normal main() thread activity.
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
if (PORTAB_SDU1.config->usbp->state == USB_ACTIVE) {
|
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
|
||||||
"shell", NORMALPRIO + 1,
|
|
||||||
shellThread, (void *)&shell_cfg1);
|
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
|
||||||
}
|
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,343 +0,0 @@
|
||||||
/*
|
|
||||||
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"
|
|
||||||
#include "portab.h"
|
|
||||||
|
|
||||||
/* Virtual serial port over USB.*/
|
|
||||||
SerialUSBDriver PORTAB_SDU1;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Endpoints to be used for USBD1.
|
|
||||||
*/
|
|
||||||
#define USB1_DATA_REQUEST_EP 1
|
|
||||||
#define USB1_DATA_AVAILABLE_EP 1
|
|
||||||
#define USB1_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 (USB1_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 (USB1_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
|
||||||
0x02, /* bmAttributes (Bulk). */
|
|
||||||
0x0040, /* wMaxPacketSize. */
|
|
||||||
0x00), /* bInterval. */
|
|
||||||
/* Endpoint 1 Descriptor.*/
|
|
||||||
USB_DESC_ENDPOINT (USB1_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 PORTAB_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, USB1_DATA_REQUEST_EP, &ep1config);
|
|
||||||
usbInitEndpointI(usbp, USB1_INTERRUPT_REQUEST_EP, &ep2config);
|
|
||||||
|
|
||||||
/* Resetting the state of the CDC subsystem.*/
|
|
||||||
sduConfigureHookI(&PORTAB_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(&PORTAB_SDU1);
|
|
||||||
|
|
||||||
chSysUnlockFromISR();
|
|
||||||
return;
|
|
||||||
case USB_EVENT_WAKEUP:
|
|
||||||
chSysLockFromISR();
|
|
||||||
|
|
||||||
/* Disconnection event on suspend.*/
|
|
||||||
sduWakeupHookI(&PORTAB_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(&PORTAB_SDU1);
|
|
||||||
osalSysUnlockFromISR();
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* USB driver configuration.
|
|
||||||
*/
|
|
||||||
const USBConfig usbcfg = {
|
|
||||||
usb_event,
|
|
||||||
get_descriptor,
|
|
||||||
sduRequestsHook,
|
|
||||||
sof_handler
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Serial over USB driver configuration.
|
|
||||||
*/
|
|
||||||
const SerialUSBConfig serusbcfg = {
|
|
||||||
&PORTAB_USB1,
|
|
||||||
USB1_DATA_REQUEST_EP,
|
|
||||||
USB1_DATA_AVAILABLE_EP,
|
|
||||||
USB1_INTERRUPT_REQUEST_EP
|
|
||||||
};
|
|
|
@ -1,26 +0,0 @@
|
||||||
/*
|
|
||||||
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