diff options
| author | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:37:31 -0700 |
|---|---|---|
| committer | Michael Walker <walkerstop@gmail.com> | 2018-05-02 03:37:31 -0700 |
| commit | cd7559268dcc2da5f2b1f3872e6baa1cff1d5476 (patch) | |
| tree | 0cf31de069f9df06a13743eab4e1879f05ce9c12 /testhal/KINETIS/FRDM-KL26Z | |
| parent | 4d7ccdd1fce0c95c57129b80c81fab829daf9f99 (diff) | |
| parent | 457afa6202fe9f8e6accb65411629172bb32c41b (diff) | |
| download | ChibiOS-Contrib-cd7559268dcc2da5f2b1f3872e6baa1cff1d5476.tar.gz ChibiOS-Contrib-cd7559268dcc2da5f2b1f3872e6baa1cff1d5476.tar.bz2 ChibiOS-Contrib-cd7559268dcc2da5f2b1f3872e6baa1cff1d5476.zip | |
Merge branch 'master' into mike
Diffstat (limited to 'testhal/KINETIS/FRDM-KL26Z')
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/I2C/chconf.h | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/PWM/chconf.h | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h | 1 | ||||
| -rw-r--r-- | testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/usbcfg.c | 14 |
4 files changed, 14 insertions, 3 deletions
diff --git a/testhal/KINETIS/FRDM-KL26Z/I2C/chconf.h b/testhal/KINETIS/FRDM-KL26Z/I2C/chconf.h index eecc0a6..5f05547 100644 --- a/testhal/KINETIS/FRDM-KL26Z/I2C/chconf.h +++ b/testhal/KINETIS/FRDM-KL26Z/I2C/chconf.h @@ -29,6 +29,7 @@ #define _CHCONF_H_
#define _CHIBIOS_RT_CONF_ +#define _CHIBIOS_RT_CONF_VER_5_0_ /*===========================================================================*/
/**
diff --git a/testhal/KINETIS/FRDM-KL26Z/PWM/chconf.h b/testhal/KINETIS/FRDM-KL26Z/PWM/chconf.h index 8c37f87..9f9b3e9 100644 --- a/testhal/KINETIS/FRDM-KL26Z/PWM/chconf.h +++ b/testhal/KINETIS/FRDM-KL26Z/PWM/chconf.h @@ -27,6 +27,7 @@ #define _CHCONF_H_
#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_5_0_
/*===========================================================================*/
/**
diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h index c7ed185..9c9a479 100644 --- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h +++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/chconf.h @@ -27,6 +27,7 @@ #define _CHCONF_H_
#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_5_0_
/*===========================================================================*/
/**
diff --git a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/usbcfg.c b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/usbcfg.c index 3093640..0ec1c62 100644 --- a/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/usbcfg.c +++ b/testhal/KINETIS/FRDM-KL26Z/USB_SERIAL/usbcfg.c @@ -262,8 +262,6 @@ 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:
@@ -280,15 +278,25 @@ static void usb_event(USBDriver *usbp, usbevent_t event) { chSysUnlockFromISR();
return;
+ case USB_EVENT_RESET:
+ /* Falls into. */
+ case USB_EVENT_UNCONFIGURED:
+ /* Falls into. */
case USB_EVENT_SUSPEND:
chSysLockFromISR();
/* Disconnection event on suspend.*/
- sduDisconnectI(&SDU1);
+ sduSuspendHookI(&SDU1);
chSysUnlockFromISR();
return;
case USB_EVENT_WAKEUP:
+ chSysLockFromISR();
+
+ /* Disconnection event on suspend */
+ sduWakeupHookI(&SDU1);
+
+ chSysUnlockFromISR();
return;
case USB_EVENT_STALLED:
return;
|