rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename USB endpoints, update ChibiOS-Contrib (#2334) 

* rename endpoints

* update chibios contrib

Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
Matthew Kennedy 2021-02-12 11:21:56 -08:00 committed by GitHub
parent 275b058e32
commit 315360cb04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/ChibiOS-Contrib

@ -1 +1 @@
Subproject commit 61baa6b036138c155f7cfc5646d833d9423f3243
Subproject commit 0a0aa7491dc24b7d984c4d391b9647e270af7c53

43
firmware/hw_layer/ports/stm32/serial_over_usb/usbcfg.c
View File

@ -251,48 +251,35 @@ static const USBDescriptor *get_descriptor(USBDriver *usbp,
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 = {
// IN CDC data state.
static USBInEndpointState cdcDataInstate;
// OUT CDC data state.
static USBOutEndpointState cdcDataOutstate;
// CDC data initialization structure (both IN and OUT).
static const USBEndpointConfig cdcDataEpConfig = {
USB_EP_MODE_TYPE_BULK,
NULL,
sduDataTransmitted,
sduDataReceived,
0x0040,
0x0040,
&ep1instate,
&ep1outstate,
&cdcDataInstate,
&cdcDataOutstate,
4,
NULL
};
/**
* @brief IN EP2 state.
*/
static USBInEndpointState ep2instate;
/**
* @brief EP2 initialization structure (IN only).
*/
static const USBEndpointConfig ep2config = {
// IN CDC interrupt state.
static USBInEndpointState cdcInterruptInstate;
// CDC interrupt initialization structure (IN only).
static const USBEndpointConfig cdcInterruptEpConfig = {
USB_EP_MODE_TYPE_INTR,
NULL,
sduInterruptTransmitted,
NULL,
0x0010,
0x0000,
&ep2instate,
&cdcInterruptInstate,
NULL,
1,
NULL
@ -311,8 +298,8 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
/* 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);
usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &cdcDataEpConfig);
usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &cdcInterruptEpConfig);
/* Resetting the state of the CDC subsystem.*/
sduConfigureHookI(&SDU1);