Merge pull request #109 from funnydog/kinetis-fixes

Kinetis fixes
This commit is contained in:
Fabio Utzig 2016-12-17 10:49:29 -02:00 committed by GitHub
commit 4b1ccfcd68
6 changed files with 52 additions and 10 deletions

View File

@ -262,8 +262,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:
@ -280,6 +278,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into. */
case USB_EVENT_UNCONFIGURED:
/* Falls into. */
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR(); chSysLockFromISR();
@ -289,6 +291,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
chSysLockFromISR();
/* Disconnection event on suspend */
sduWakeupHookI(&SDU1);
chSysUnlockFromISR();
return; return;
case USB_EVENT_STALLED: case USB_EVENT_STALLED:
return; return;

View File

@ -315,6 +315,8 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
osalSysUnlockFromISR(); osalSysUnlockFromISR();
return; return;
case USB_EVENT_UNCONFIGURED:
return;
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:

View File

@ -262,8 +262,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:
@ -280,6 +278,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into. */
case USB_EVENT_UNCONFIGURED:
/* Falls into. */
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR(); chSysLockFromISR();
@ -289,6 +291,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
chSysLockFromISR();
/* Disconnection event on suspend */
sduWakeupHookI(&SDU1);
chSysUnlockFromISR();
return; return;
case USB_EVENT_STALLED: case USB_EVENT_STALLED:
return; return;

View File

@ -262,8 +262,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:
@ -280,6 +278,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into. */
case USB_EVENT_UNCONFIGURED:
/* Falls into. */
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR(); chSysLockFromISR();
@ -289,6 +291,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
chSysLockFromISR();
/* Disconnection event on suspend */
sduWakeupHookI(&SDU1);
chSysUnlockFromISR();
return; return;
case USB_EVENT_STALLED: case USB_EVENT_STALLED:
return; return;

View File

@ -262,8 +262,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:
@ -280,6 +278,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into. */
case USB_EVENT_UNCONFIGURED:
/* Falls into. */
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR(); chSysLockFromISR();
@ -289,6 +291,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
chSysLockFromISR();
/* Disconnection event on suspend */
sduWakeupHookI(&SDU1);
chSysUnlockFromISR();
return; return;
case USB_EVENT_STALLED: case USB_EVENT_STALLED:
return; return;

View File

@ -262,8 +262,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:
@ -280,6 +278,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_RESET:
/* Falls into. */
case USB_EVENT_UNCONFIGURED:
/* Falls into. */
case USB_EVENT_SUSPEND: case USB_EVENT_SUSPEND:
chSysLockFromISR(); chSysLockFromISR();
@ -289,6 +291,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
chSysUnlockFromISR(); chSysUnlockFromISR();
return; return;
case USB_EVENT_WAKEUP: case USB_EVENT_WAKEUP:
chSysLockFromISR();
/* Disconnection event on suspend */
sduWakeupHookI(&SDU1);
chSysUnlockFromISR();
return; return;
case USB_EVENT_STALLED: case USB_EVENT_STALLED:
return; return;