summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorAubr.Cool <[email protected]>2015-06-30 14:12:30 +0800
committerAubr.Cool <[email protected]>2015-06-30 14:12:30 +0800
commitb3f0737a9994ae69fe630937de300b2e393df764 (patch)
tree4eef46b82bfa534d3c6c1efbf68585d7065dc079 /components
parenta1e1c84b6ada256ae8ea3ee0ec210dba5e607b5b (diff)
correct can compiler error and warnings
Diffstat (limited to 'components')
-rw-r--r--components/drivers/can/can.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/components/drivers/can/can.c b/components/drivers/can/can.c
index c31523c1a0..fc0d74877f 100644
--- a/components/drivers/can/can.c
+++ b/components/drivers/can/can.c
@@ -607,11 +607,15 @@ static rt_err_t rt_can_control(struct rt_device *dev,
*/
static void cantimeout(void* arg)
{
+ #ifdef RT_CAN_USING_LED
rt_uint32_t ledonflag = 0;
+ #endif /*RT_CAN_USING_LED*/
rt_can_t can = (rt_can_t)arg;
rt_device_control((rt_device_t)can,RT_CAN_CMD_GET_STATUS,(void* )&can->status);
if(can->timerinitflag == 1) {
- ledonflag = 1;
+ #ifdef RT_CAN_USING_LED
+ ledonflag = 1;
+ #endif /*RT_CAN_USING_LED*/
can->timerinitflag = 0xFF;
}
#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;
can->timerinitflag = 0;
- if(can->config.rcvled != RT_NULL ||
- can->config.sndled != RT_NULL ||
- can->config.errled != RT_NULL)
- {
- rt_timer_init(&can->timer,
- name,
- cantimeout,
- (void*)can,
- can->config.ticks,
- RT_TIMER_FLAG_PERIODIC);
- }
+ rt_timer_init(&can->timer,
+ name,
+ cantimeout,
+ (void*)can,
+ can->config.ticks,
+ RT_TIMER_FLAG_PERIODIC);
/* register a character device */
return rt_device_register(device, name, RT_DEVICE_FLAG_RDWR);
}