riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7790 from OTAkeys/pr/fix_can_set_get_filters

Browse Source 
can/device: wake up device before getting/setting filters
This commit is contained in:
Martine Lenders 2017-11-06 11:01:53 +01:00 committed by GitHub
commit 772ee47e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/can/device.c
View File

@ -185,6 +185,18 @@ static void pm_reset(candev_dev_t *candev_dev, uint32_t value)
} }
#endif #endif
static void wake_up(candev_dev_t *candev_dev)
{
candev_t *dev = candev_dev->dev;
if (dev->state == CAN_STATE_BUS_OFF || dev->state == CAN_STATE_SLEEPING) {
DEBUG("can device: waking up driver\n");
power_up(candev_dev);
}
#ifdef MODULE_CAN_PM
pm_reset(candev_dev, candev_dev->tx_wakeup_timeout);
#endif
}
static void *_can_device_thread(void *args) static void *_can_device_thread(void *args)
{ {
candev_dev_t *candev_dev = (candev_dev_t *) args; candev_dev_t *candev_dev = (candev_dev_t *) args;
@ -244,14 +256,9 @@ static void *_can_device_thread(void *args)
break; break;
case CAN_MSG_SEND_FRAME: case CAN_MSG_SEND_FRAME:
DEBUG("can device: CAN_MSG_SEND_FRAME received\n"); DEBUG("can device: CAN_MSG_SEND_FRAME received\n");
wake_up(candev_dev);
/* read incoming pkt */
pkt = (can_pkt_t *) msg.content.ptr; pkt = (can_pkt_t *) msg.content.ptr;
if (dev->state == CAN_STATE_BUS_OFF || dev->state == CAN_STATE_SLEEPING) {
DEBUG("can device: waking up driver\n");
power_up(candev_dev);
}
#ifdef MODULE_CAN_PM
pm_reset(candev_dev, candev_dev->tx_wakeup_timeout);
#endif
dev->driver->send(dev, &pkt->frame); dev->driver->send(dev, &pkt->frame);
break; break;
case CAN_MSG_SET: case CAN_MSG_SET:
@ -278,6 +285,7 @@ static void *_can_device_thread(void *args)
break; break;
case CAN_MSG_SET_FILTER: case CAN_MSG_SET_FILTER:
DEBUG("can device: CAN_MSG_SET_FILTER received\n"); DEBUG("can device: CAN_MSG_SET_FILTER received\n");
wake_up(candev_dev);
/* set filter for device driver */ /* set filter for device driver */
res = dev->driver->set_filter(dev, msg.content.ptr); res = dev->driver->set_filter(dev, msg.content.ptr);
/* send reply to calling thread */ /* send reply to calling thread */
@ -287,6 +295,7 @@ static void *_can_device_thread(void *args)
break; break;
case CAN_MSG_REMOVE_FILTER: case CAN_MSG_REMOVE_FILTER:
DEBUG("can device: CAN_MSG_REMOVE_FILTER received\n"); DEBUG("can device: CAN_MSG_REMOVE_FILTER received\n");
wake_up(candev_dev);
/* set filter for device driver */ /* set filter for device driver */
res = dev->driver->remove_filter(dev, msg.content.ptr); res = dev->driver->remove_filter(dev, msg.content.ptr);
/* send reply to calling thread */ /* send reply to calling thread */