Updated all USB demos.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8644 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio
parent
6857f4ff33
commit
2fdca55f58
|
|
@ -26,9 +26,6 @@
|
||||||
|
|
||||||
#include "usbcfg.h"
|
#include "usbcfg.h"
|
||||||
|
|
||||||
/* Virtual serial port over USB.*/
|
|
||||||
SerialUSBDriver SDU1;
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Command line related. */
|
/* Command line related. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
@ -87,6 +84,7 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
chThdWait(tp);
|
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"
|
||||||
|
|
@ -113,7 +111,15 @@ 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");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,11 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ch.h"
|
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
|
/* Virtual serial port over USB.*/
|
||||||
|
SerialUSBDriver SDU1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Endpoints to be used for USBD1.
|
* Endpoints to be used for USBD1.
|
||||||
*/
|
*/
|
||||||
|
|
@ -33,8 +35,8 @@ static const uint8_t vcom_device_descriptor_data[18] = {
|
||||||
0x00, /* bDeviceSubClass. */
|
0x00, /* bDeviceSubClass. */
|
||||||
0x00, /* bDeviceProtocol. */
|
0x00, /* bDeviceProtocol. */
|
||||||
0x40, /* bMaxPacketSize. */
|
0x40, /* bMaxPacketSize. */
|
||||||
0x1eaf, /* idVendor (LeafLabs). */
|
0x0483, /* idVendor (ST). */
|
||||||
0x0004, /* idProduct. */
|
0x5740, /* idProduct. */
|
||||||
0x0200, /* bcdDevice. */
|
0x0200, /* bcdDevice. */
|
||||||
1, /* iManufacturer. */
|
1, /* iManufacturer. */
|
||||||
2, /* iProduct. */
|
2, /* iProduct. */
|
||||||
|
|
@ -148,9 +150,11 @@ static const uint8_t vcom_string0[] = {
|
||||||
* Vendor string.
|
* Vendor string.
|
||||||
*/
|
*/
|
||||||
static const uint8_t vcom_string1[] = {
|
static const uint8_t vcom_string1[] = {
|
||||||
USB_DESC_BYTE(18), /* bLength. */
|
USB_DESC_BYTE(38), /* bLength. */
|
||||||
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
|
||||||
'L', 0, 'e', 0, 'a', 0, 'f', 0, 'L', 0, 'a', 0, 'b', 0, 's', 0,
|
'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
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -282,6 +286,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
chSysUnlockFromISR();
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_SUSPEND:
|
case USB_EVENT_SUSPEND:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduDisconnectI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_WAKEUP:
|
case USB_EVENT_WAKEUP:
|
||||||
return;
|
return;
|
||||||
|
|
@ -291,6 +301,18 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void sof_handler(USBDriver *usbp) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
|
||||||
|
osalSysLockFromISR();
|
||||||
|
sduSOFHookI(&SDU1);
|
||||||
|
osalSysUnlockFromISR();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB driver configuration.
|
* USB driver configuration.
|
||||||
*/
|
*/
|
||||||
|
|
@ -298,7 +320,7 @@ const USBConfig usbcfg = {
|
||||||
usb_event,
|
usb_event,
|
||||||
get_descriptor,
|
get_descriptor,
|
||||||
sduRequestsHook,
|
sduRequestsHook,
|
||||||
NULL
|
sof_handler
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
extern const USBConfig usbcfg;
|
extern const USBConfig usbcfg;
|
||||||
extern SerialUSBConfig serusbcfg;
|
extern SerialUSBConfig serusbcfg;
|
||||||
|
extern SerialUSBDriver SDU1;
|
||||||
|
|
||||||
#endif /* _USBCFG_H_ */
|
#endif /* _USBCFG_H_ */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ CSRC = $(STARTUPSRC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
||||||
$(CHIBIOS)/os/various/shell.c \
|
$(CHIBIOS)/os/various/shell.c \
|
||||||
main.c
|
usbcfg.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.
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,8 @@
|
||||||
|
|
||||||
#include "ff.h"
|
#include "ff.h"
|
||||||
|
|
||||||
|
#include "usbcfg.h"
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Card insertion monitor. */
|
/* Card insertion monitor. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
@ -147,316 +149,6 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*===========================================================================*/
|
|
||||||
/* 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 SDU2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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) {
|
|
||||||
|
|
||||||
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(&SDU2);
|
|
||||||
|
|
||||||
chSysUnlockFromISR();
|
|
||||||
return;
|
|
||||||
case USB_EVENT_SUSPEND:
|
|
||||||
chSysLockFromISR();
|
|
||||||
|
|
||||||
/* Disconnection event on suspend.*/
|
|
||||||
sduDisconnectI(&SDU2);
|
|
||||||
|
|
||||||
chSysUnlockFromISR();
|
|
||||||
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. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
@ -551,7 +243,7 @@ static const ShellCommand commands[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const ShellConfig shell_cfg1 = {
|
static const ShellConfig shell_cfg1 = {
|
||||||
(BaseSequentialStream *)&SDU2,
|
(BaseSequentialStream *)&SDU1,
|
||||||
commands
|
commands
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -628,8 +320,8 @@ int main(void) {
|
||||||
/*
|
/*
|
||||||
* Initializes a serial-over-USB CDC driver.
|
* Initializes a serial-over-USB CDC driver.
|
||||||
*/
|
*/
|
||||||
sduObjectInit(&SDU2);
|
sduObjectInit(&SDU1);
|
||||||
sduStart(&SDU2, &serusbcfg);
|
sduStart(&SDU1, &serusbcfg);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Activates the USB driver and then the USB bus pull-up on D+.
|
* Activates the USB driver and then the USB bus pull-up on D+.
|
||||||
|
|
@ -663,7 +355,7 @@ int main(void) {
|
||||||
chEvtRegister(&inserted_event, &el0, 0);
|
chEvtRegister(&inserted_event, &el0, 0);
|
||||||
chEvtRegister(&removed_event, &el1, 1);
|
chEvtRegister(&removed_event, &el1, 1);
|
||||||
while (true) {
|
while (true) {
|
||||||
if (!shelltp && (SDU2.config->usbp->state == USB_ACTIVE))
|
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))
|
||||||
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
||||||
else if (chThdTerminatedX(shelltp)) {
|
else if (chThdTerminatedX(shelltp)) {
|
||||||
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,334 @@
|
||||||
|
/*
|
||||||
|
ChibiOS - Copyright (C) 2006..2015 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_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:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduDisconnectI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
|
return;
|
||||||
|
case USB_EVENT_WAKEUP:
|
||||||
|
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..2015 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_ */
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
@ -26,9 +26,6 @@
|
||||||
|
|
||||||
#include "usbcfg.h"
|
#include "usbcfg.h"
|
||||||
|
|
||||||
/* Virtual serial port over USB.*/
|
|
||||||
SerialUSBDriver SDU1;
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Command line related. */
|
/* Command line related. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
@ -87,6 +84,7 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
chThdWait(tp);
|
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"
|
||||||
|
|
@ -113,7 +111,15 @@ 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");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,11 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ch.h"
|
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
|
/* Virtual serial port over USB.*/
|
||||||
|
SerialUSBDriver SDU1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Endpoints to be used for USBD1.
|
* Endpoints to be used for USBD1.
|
||||||
*/
|
*/
|
||||||
|
|
@ -284,6 +286,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
chSysUnlockFromISR();
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_SUSPEND:
|
case USB_EVENT_SUSPEND:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduDisconnectI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_WAKEUP:
|
case USB_EVENT_WAKEUP:
|
||||||
return;
|
return;
|
||||||
|
|
@ -293,6 +301,18 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void sof_handler(USBDriver *usbp) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
|
||||||
|
osalSysLockFromISR();
|
||||||
|
sduSOFHookI(&SDU1);
|
||||||
|
osalSysUnlockFromISR();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB driver configuration.
|
* USB driver configuration.
|
||||||
*/
|
*/
|
||||||
|
|
@ -300,7 +320,7 @@ const USBConfig usbcfg = {
|
||||||
usb_event,
|
usb_event,
|
||||||
get_descriptor,
|
get_descriptor,
|
||||||
sduRequestsHook,
|
sduRequestsHook,
|
||||||
NULL
|
sof_handler
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
extern const USBConfig usbcfg;
|
extern const USBConfig usbcfg;
|
||||||
extern SerialUSBConfig serusbcfg;
|
extern SerialUSBConfig serusbcfg;
|
||||||
|
extern SerialUSBDriver SDU1;
|
||||||
|
|
||||||
#endif /* _USBCFG_H_ */
|
#endif /* _USBCFG_H_ */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,9 +24,6 @@
|
||||||
|
|
||||||
#include "usbcfg.h"
|
#include "usbcfg.h"
|
||||||
|
|
||||||
/* Virtual serial port over USB.*/
|
|
||||||
SerialUSBDriver SDU1;
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Command line related. */
|
/* Command line related. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,11 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ch.h"
|
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
|
/* Virtual serial port over USB.*/
|
||||||
|
SerialUSBDriver SDU1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Endpoints to be used for USBD1.
|
* Endpoints to be used for USBD1.
|
||||||
*/
|
*/
|
||||||
|
|
@ -284,6 +286,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
chSysUnlockFromISR();
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_SUSPEND:
|
case USB_EVENT_SUSPEND:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduDisconnectI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_WAKEUP:
|
case USB_EVENT_WAKEUP:
|
||||||
return;
|
return;
|
||||||
|
|
@ -293,6 +301,18 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void sof_handler(USBDriver *usbp) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
|
||||||
|
osalSysLockFromISR();
|
||||||
|
sduSOFHookI(&SDU1);
|
||||||
|
osalSysUnlockFromISR();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB driver configuration.
|
* USB driver configuration.
|
||||||
*/
|
*/
|
||||||
|
|
@ -300,7 +320,7 @@ const USBConfig usbcfg = {
|
||||||
usb_event,
|
usb_event,
|
||||||
get_descriptor,
|
get_descriptor,
|
||||||
sduRequestsHook,
|
sduRequestsHook,
|
||||||
NULL
|
sof_handler
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
extern const USBConfig usbcfg;
|
extern const USBConfig usbcfg;
|
||||||
extern SerialUSBConfig serusbcfg;
|
extern SerialUSBConfig serusbcfg;
|
||||||
|
extern SerialUSBDriver SDU1;
|
||||||
|
|
||||||
#endif /* _USBCFG_H_ */
|
#endif /* _USBCFG_H_ */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,7 @@ CSRC = $(STARTUPSRC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
||||||
$(CHIBIOS)/os/various/shell.c \
|
$(CHIBIOS)/os/various/shell.c \
|
||||||
web/web.c main.c
|
web/web.c usbcfg.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.
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,8 @@
|
||||||
|
|
||||||
#include "ff.h"
|
#include "ff.h"
|
||||||
|
|
||||||
|
#include "usbcfg.h"
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Card insertion monitor. */
|
/* Card insertion monitor. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
@ -150,316 +152,6 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*===========================================================================*/
|
|
||||||
/* USB related stuff. */
|
|
||||||
/*===========================================================================*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Endpoints to be used for USBD2.
|
|
||||||
*/
|
|
||||||
#define USBD2_DATA_REQUEST_EP 1
|
|
||||||
#define USBD2_DATA_AVAILABLE_EP 1
|
|
||||||
#define USBD2_INTERRUPT_REQUEST_EP 2
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Serial over USB Driver structure.
|
|
||||||
*/
|
|
||||||
static SerialUSBDriver SDU2;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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 (USBD2_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 (USBD2_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
|
||||||
0x02, /* bmAttributes (Bulk). */
|
|
||||||
0x0040, /* wMaxPacketSize. */
|
|
||||||
0x00), /* bInterval. */
|
|
||||||
/* Endpoint 1 Descriptor.*/
|
|
||||||
USB_DESC_ENDPOINT (USBD2_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) {
|
|
||||||
|
|
||||||
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, USBD2_DATA_REQUEST_EP, &ep1config);
|
|
||||||
usbInitEndpointI(usbp, USBD2_INTERRUPT_REQUEST_EP, &ep2config);
|
|
||||||
|
|
||||||
/* Resetting the state of the CDC subsystem.*/
|
|
||||||
sduConfigureHookI(&SDU2);
|
|
||||||
|
|
||||||
chSysUnlockFromISR();
|
|
||||||
return;
|
|
||||||
case USB_EVENT_SUSPEND:
|
|
||||||
chSysLockFromISR();
|
|
||||||
|
|
||||||
/* Disconnection event on suspend.*/
|
|
||||||
sduDisconnectI(&SDU2);
|
|
||||||
|
|
||||||
chSysUnlockFromISR();
|
|
||||||
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 = {
|
|
||||||
&USBD2,
|
|
||||||
USBD2_DATA_REQUEST_EP,
|
|
||||||
USBD2_DATA_AVAILABLE_EP,
|
|
||||||
USBD2_INTERRUPT_REQUEST_EP
|
|
||||||
};
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Command line related. */
|
/* Command line related. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
@ -554,7 +246,7 @@ static const ShellCommand commands[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const ShellConfig shell_cfg1 = {
|
static const ShellConfig shell_cfg1 = {
|
||||||
(BaseSequentialStream *)&SDU2,
|
(BaseSequentialStream *)&SDU1,
|
||||||
commands
|
commands
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -633,8 +325,8 @@ int main(void) {
|
||||||
/*
|
/*
|
||||||
* Initializes a serial-over-USB CDC driver.
|
* Initializes a serial-over-USB CDC driver.
|
||||||
*/
|
*/
|
||||||
sduObjectInit(&SDU2);
|
sduObjectInit(&SDU1);
|
||||||
sduStart(&SDU2, &serusbcfg);
|
sduStart(&SDU1, &serusbcfg);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Activates the USB driver and then the USB bus pull-up on D+.
|
* Activates the USB driver and then the USB bus pull-up on D+.
|
||||||
|
|
@ -681,7 +373,7 @@ int main(void) {
|
||||||
chEvtRegister(&inserted_event, &el0, 0);
|
chEvtRegister(&inserted_event, &el0, 0);
|
||||||
chEvtRegister(&removed_event, &el1, 1);
|
chEvtRegister(&removed_event, &el1, 1);
|
||||||
while (true) {
|
while (true) {
|
||||||
if (!shelltp && (SDU2.config->usbp->state == USB_ACTIVE))
|
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))
|
||||||
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
||||||
else if (chThdTerminatedX(shelltp)) {
|
else if (chThdTerminatedX(shelltp)) {
|
||||||
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
||||||
|
|
|
||||||
|
|
@ -325,7 +325,7 @@
|
||||||
* USB driver system settings.
|
* USB driver system settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_USB_USE_OTG1 TRUE
|
#define STM32_USB_USE_OTG1 TRUE
|
||||||
#define STM32_USB_USE_OTG2 TRUE
|
#define STM32_USB_USE_OTG2 FALSE
|
||||||
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
||||||
#define STM32_USB_OTG2_IRQ_PRIORITY 14
|
#define STM32_USB_OTG2_IRQ_PRIORITY 14
|
||||||
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,334 @@
|
||||||
|
/*
|
||||||
|
ChibiOS - Copyright (C) 2006..2015 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_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:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduDisconnectI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
|
return;
|
||||||
|
case USB_EVENT_WAKEUP:
|
||||||
|
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..2015 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_ */
|
||||||
|
|
||||||
|
/** @} */
|
||||||
|
|
@ -59,9 +59,6 @@ static THD_FUNCTION(Thread2, arg) {
|
||||||
/* Command line related. */
|
/* Command line related. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
/* Virtual serial port over USB.*/
|
|
||||||
SerialUSBDriver SDU1;
|
|
||||||
|
|
||||||
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
||||||
#define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256)
|
#define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -343,8 +343,8 @@
|
||||||
/*
|
/*
|
||||||
* USB driver system settings.
|
* USB driver system settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_USB_USE_OTG1 FALSE
|
#define STM32_USB_USE_OTG1 TRUE
|
||||||
#define STM32_USB_USE_OTG2 TRUE
|
#define STM32_USB_USE_OTG2 FALSE
|
||||||
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
#define STM32_USB_OTG1_IRQ_PRIORITY 14
|
||||||
#define STM32_USB_OTG2_IRQ_PRIORITY 14
|
#define STM32_USB_OTG2_IRQ_PRIORITY 14
|
||||||
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
#define STM32_USB_OTG1_RX_FIFO_SIZE 512
|
||||||
|
|
|
||||||
|
|
@ -14,15 +14,17 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ch.h"
|
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
|
/* Virtual serial port over USB.*/
|
||||||
|
SerialUSBDriver SDU1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Endpoints to be used for USBD2.
|
* Endpoints to be used for USBD1.
|
||||||
*/
|
*/
|
||||||
#define USBD2_DATA_REQUEST_EP 1
|
#define USBD1_DATA_REQUEST_EP 1
|
||||||
#define USBD2_DATA_AVAILABLE_EP 1
|
#define USBD1_DATA_AVAILABLE_EP 1
|
||||||
#define USBD2_INTERRUPT_REQUEST_EP 2
|
#define USBD1_INTERRUPT_REQUEST_EP 2
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB Device Descriptor.
|
* USB Device Descriptor.
|
||||||
|
|
@ -100,7 +102,7 @@ static const uint8_t vcom_configuration_descriptor_data[67] = {
|
||||||
USB_DESC_BYTE (0x01), /* bSlaveInterface0 (Data Class
|
USB_DESC_BYTE (0x01), /* bSlaveInterface0 (Data Class
|
||||||
Interface). */
|
Interface). */
|
||||||
/* Endpoint 2 Descriptor.*/
|
/* Endpoint 2 Descriptor.*/
|
||||||
USB_DESC_ENDPOINT (USBD2_INTERRUPT_REQUEST_EP|0x80,
|
USB_DESC_ENDPOINT (USBD1_INTERRUPT_REQUEST_EP|0x80,
|
||||||
0x03, /* bmAttributes (Interrupt). */
|
0x03, /* bmAttributes (Interrupt). */
|
||||||
0x0008, /* wMaxPacketSize. */
|
0x0008, /* wMaxPacketSize. */
|
||||||
0xFF), /* bInterval. */
|
0xFF), /* bInterval. */
|
||||||
|
|
@ -116,12 +118,12 @@ static const uint8_t vcom_configuration_descriptor_data[67] = {
|
||||||
4.7). */
|
4.7). */
|
||||||
0x00), /* iInterface. */
|
0x00), /* iInterface. */
|
||||||
/* Endpoint 3 Descriptor.*/
|
/* Endpoint 3 Descriptor.*/
|
||||||
USB_DESC_ENDPOINT (USBD2_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
USB_DESC_ENDPOINT (USBD1_DATA_AVAILABLE_EP, /* bEndpointAddress.*/
|
||||||
0x02, /* bmAttributes (Bulk). */
|
0x02, /* bmAttributes (Bulk). */
|
||||||
0x0040, /* wMaxPacketSize. */
|
0x0040, /* wMaxPacketSize. */
|
||||||
0x00), /* bInterval. */
|
0x00), /* bInterval. */
|
||||||
/* Endpoint 1 Descriptor.*/
|
/* Endpoint 1 Descriptor.*/
|
||||||
USB_DESC_ENDPOINT (USBD2_DATA_REQUEST_EP|0x80, /* bEndpointAddress.*/
|
USB_DESC_ENDPOINT (USBD1_DATA_REQUEST_EP|0x80, /* bEndpointAddress.*/
|
||||||
0x02, /* bmAttributes (Bulk). */
|
0x02, /* bmAttributes (Bulk). */
|
||||||
0x0040, /* wMaxPacketSize. */
|
0x0040, /* wMaxPacketSize. */
|
||||||
0x00) /* bInterval. */
|
0x00) /* bInterval. */
|
||||||
|
|
@ -275,8 +277,8 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
/* Enables the endpoints specified into the configuration.
|
/* Enables the endpoints specified into the configuration.
|
||||||
Note, this callback is invoked from an ISR so I-Class functions
|
Note, this callback is invoked from an ISR so I-Class functions
|
||||||
must be used.*/
|
must be used.*/
|
||||||
usbInitEndpointI(usbp, USBD2_DATA_REQUEST_EP, &ep1config);
|
usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &ep1config);
|
||||||
usbInitEndpointI(usbp, USBD2_INTERRUPT_REQUEST_EP, &ep2config);
|
usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &ep2config);
|
||||||
|
|
||||||
/* Resetting the state of the CDC subsystem.*/
|
/* Resetting the state of the CDC subsystem.*/
|
||||||
sduConfigureHookI(&SDU1);
|
sduConfigureHookI(&SDU1);
|
||||||
|
|
@ -284,6 +286,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
chSysUnlockFromISR();
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_SUSPEND:
|
case USB_EVENT_SUSPEND:
|
||||||
|
chSysLockFromISR();
|
||||||
|
|
||||||
|
/* Disconnection event on suspend.*/
|
||||||
|
sduDisconnectI(&SDU1);
|
||||||
|
|
||||||
|
chSysUnlockFromISR();
|
||||||
return;
|
return;
|
||||||
case USB_EVENT_WAKEUP:
|
case USB_EVENT_WAKEUP:
|
||||||
return;
|
return;
|
||||||
|
|
@ -293,6 +301,18 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void sof_handler(USBDriver *usbp) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
|
||||||
|
osalSysLockFromISR();
|
||||||
|
sduSOFHookI(&SDU1);
|
||||||
|
osalSysUnlockFromISR();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB driver configuration.
|
* USB driver configuration.
|
||||||
*/
|
*/
|
||||||
|
|
@ -300,15 +320,15 @@ const USBConfig usbcfg = {
|
||||||
usb_event,
|
usb_event,
|
||||||
get_descriptor,
|
get_descriptor,
|
||||||
sduRequestsHook,
|
sduRequestsHook,
|
||||||
NULL
|
sof_handler
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Serial over USB driver configuration.
|
* Serial over USB driver configuration.
|
||||||
*/
|
*/
|
||||||
const SerialUSBConfig serusbcfg = {
|
const SerialUSBConfig serusbcfg = {
|
||||||
&USBD2,
|
&USBD1,
|
||||||
USBD2_DATA_REQUEST_EP,
|
USBD1_DATA_REQUEST_EP,
|
||||||
USBD2_DATA_AVAILABLE_EP,
|
USBD1_DATA_AVAILABLE_EP,
|
||||||
USBD2_INTERRUPT_REQUEST_EP
|
USBD1_INTERRUPT_REQUEST_EP
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
extern const USBConfig usbcfg;
|
extern const USBConfig usbcfg;
|
||||||
extern SerialUSBConfig serusbcfg;
|
extern SerialUSBConfig serusbcfg;
|
||||||
|
extern SerialUSBDriver SDU1;
|
||||||
|
|
||||||
#endif /* _USBCFG_H_ */
|
#endif /* _USBCFG_H_ */
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,6 @@
|
||||||
|
|
||||||
#include "usbcfg.h"
|
#include "usbcfg.h"
|
||||||
|
|
||||||
/* Virtual serial port over USB.*/
|
|
||||||
SerialUSBDriver SDU2;
|
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/* Card insertion monitor. */
|
/* Card insertion monitor. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,11 @@
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ch.h"
|
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
|
/* Virtual serial port over USB.*/
|
||||||
|
SerialUSBDriver SDU2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Endpoints to be used for USBD2.
|
* Endpoints to be used for USBD2.
|
||||||
*/
|
*/
|
||||||
|
|
@ -28,7 +30,7 @@
|
||||||
* USB Device Descriptor.
|
* USB Device Descriptor.
|
||||||
*/
|
*/
|
||||||
static const uint8_t vcom_device_descriptor_data[18] = {
|
static const uint8_t vcom_device_descriptor_data[18] = {
|
||||||
USB_DESC_DEVICE (0x0110, /* bcdUSB (1.1). */
|
USB_DESC_DEVICE (0x0200, /* bcdUSB (2.0). */
|
||||||
0x02, /* bDeviceClass (CDC). */
|
0x02, /* bDeviceClass (CDC). */
|
||||||
0x00, /* bDeviceSubClass. */
|
0x00, /* bDeviceSubClass. */
|
||||||
0x00, /* bDeviceProtocol. */
|
0x00, /* bDeviceProtocol. */
|
||||||
|
|
@ -233,7 +235,7 @@ static const USBEndpointConfig ep1config = {
|
||||||
0x0040,
|
0x0040,
|
||||||
&ep1instate,
|
&ep1instate,
|
||||||
&ep1outstate,
|
&ep1outstate,
|
||||||
2,
|
4,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -299,6 +301,18 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handles the USB driver global events.
|
||||||
|
*/
|
||||||
|
static void sof_handler(USBDriver *usbp) {
|
||||||
|
|
||||||
|
(void)usbp;
|
||||||
|
|
||||||
|
osalSysLockFromISR();
|
||||||
|
sduSOFHookI(&SDU2);
|
||||||
|
osalSysUnlockFromISR();
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* USB driver configuration.
|
* USB driver configuration.
|
||||||
*/
|
*/
|
||||||
|
|
@ -306,7 +320,7 @@ const USBConfig usbcfg = {
|
||||||
usb_event,
|
usb_event,
|
||||||
get_descriptor,
|
get_descriptor,
|
||||||
sduRequestsHook,
|
sduRequestsHook,
|
||||||
NULL
|
sof_handler
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
extern const USBConfig usbcfg;
|
extern const USBConfig usbcfg;
|
||||||
extern SerialUSBConfig serusbcfg;
|
extern SerialUSBConfig serusbcfg;
|
||||||
|
extern SerialUSBDriver SDU2;
|
||||||
|
|
||||||
#endif /* _USBCFG_H_ */
|
#endif /* _USBCFG_H_ */
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue