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

fresh version of USB CFG

This commit is contained in:
rusefi 2018-01-23 22:52:29 -05:00
parent 125884e0aa
commit 7a8eeda2a1
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/hw_layer/serial_over_usb/usbcfg.c
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -269,8 +269,6 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
extern SerialUSBDriver SDU1; extern SerialUSBDriver SDU1;
switch (event) { switch (event) {
case USB_EVENT_RESET:
return;
case USB_EVENT_ADDRESS: case USB_EVENT_ADDRESS:
return; return;
case USB_EVENT_CONFIGURED: case USB_EVENT_CONFIGURED:
@ -287,8 +285,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into.*/
case USB_EVENT_UNCONFIGURED: case USB_EVENT_UNCONFIGURED:
return; /* Falls into.*/
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR(); chSysLockFromISR();

17
firmware/hw_layer/serial_over_usb/usbcfg.h
View File

@ -1,5 +1,5 @@
/* /*
ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -14,18 +14,13 @@
limitations under the License. limitations under the License.
*/ */
/** #ifndef USBCFG_H
* @file usbcfg.h #define USBCFG_H
* @brief Serial-over-USB header
*/
#ifndef _USBCFG_H_
#define _USBCFG_H_
extern SerialUSBDriver SDU1;
extern const SerialUSBConfig serusbcfg;
extern const USBConfig usbcfg; extern const USBConfig usbcfg;
extern SerialUSBConfig serusbcfg;
extern SerialUSBDriver SDU1;
#endif /* _USBCFG_H_ */ #endif /* USBCFG_H */
/** @} */ /** @} */

2
firmware/rusefi.cpp
View File

@ -272,5 +272,5 @@ int getRusEfiVersion(void) {
if (initBootloader() != 0) if (initBootloader() != 0)
return 123; return 123;
#endif /* EFI_BOOTLOADER_INCLUDE_CODE */ #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
return 20180123; return 20180124;
} }