libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct can compiler error and warnings

This commit is contained in:
Aubr.Cool 2015-06-30 14:12:30 +08:00
parent a1e1c84b6a
commit b3f0737a99
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/drivers/can/can.c
View File

@ -607,11 +607,15 @@ static rt_err_t rt_can_control(struct rt_device *dev,
*/ */
static void cantimeout(void* arg) static void cantimeout(void* arg)
{ {
#ifdef RT_CAN_USING_LED
rt_uint32_t ledonflag = 0; rt_uint32_t ledonflag = 0;
#endif /*RT_CAN_USING_LED*/
rt_can_t can = (rt_can_t)arg; rt_can_t can = (rt_can_t)arg;
rt_device_control((rt_device_t)can,RT_CAN_CMD_GET_STATUS,(void* )&can->status); rt_device_control((rt_device_t)can,RT_CAN_CMD_GET_STATUS,(void* )&can->status);
if(can->timerinitflag == 1) { if(can->timerinitflag == 1) {
ledonflag = 1; #ifdef RT_CAN_USING_LED
ledonflag = 1;
#endif /*RT_CAN_USING_LED*/
can->timerinitflag = 0xFF; can->timerinitflag = 0xFF;
} }
#ifdef RT_CAN_USING_LED #ifdef RT_CAN_USING_LED
@ -713,17 +717,12 @@ rt_err_t rt_hw_can_register(struct rt_can_device *can,
device->user_data = data; device->user_data = data;
can->timerinitflag = 0; can->timerinitflag = 0;
if(can->config.rcvled != RT_NULL || rt_timer_init(&can->timer,
can->config.sndled != RT_NULL || name,
can->config.errled != RT_NULL) cantimeout,
{ (void*)can,
rt_timer_init(&can->timer, can->config.ticks,
name, RT_TIMER_FLAG_PERIODIC);
cantimeout,
(void*)can,
can->config.ticks,
RT_TIMER_FLAG_PERIODIC);
}
/* register a character device */ /* register a character device */
return rt_device_register(device, name, RT_DEVICE_FLAG_RDWR); return rt_device_register(device, name, RT_DEVICE_FLAG_RDWR);
} }