Merge pull request #517 from aozima/pulls

Pulls
This commit is contained in:
Bernard Xiong 2015-07-08 21:10:05 +08:00
commit dee31a7103
2 changed files with 945 additions and 827 deletions

File diff suppressed because it is too large Load Diff

View File

@ -37,15 +37,15 @@
enum CANBAUD enum CANBAUD
{ {
CAN1MBaud = 0, /* 1 MBit/sec */ CAN1MBaud = 1000UL * 1000,/* 1 MBit/sec */
CAN800kBaud, /* 800 kBit/sec */ CAN800kBaud = 1000UL * 800, /* 800 kBit/sec */
CAN500kBaud, /* 500 kBit/sec */ CAN500kBaud = 1000UL * 500, /* 500 kBit/sec */
CAN250kBaud, /* 250 kBit/sec */ CAN250kBaud = 1000UL * 250, /* 250 kBit/sec */
CAN125kBaud, /* 125 kBit/sec */ CAN125kBaud = 1000UL * 125, /* 125 kBit/sec */
CAN100kBaud, /* 100 kBit/sec */ CAN100kBaud = 1000UL * 100, /* 100 kBit/sec */
CAN50kBaud, /* 50 kBit/sec */ CAN50kBaud = 1000UL * 50, /* 50 kBit/sec */
CAN20kBaud, /* 20 kBit/sec */ CAN20kBaud = 1000UL * 20, /* 20 kBit/sec */
CAN10kBaud /* 10 kBit/sec */ CAN10kBaud = 1000UL * 10 /* 10 kBit/sec */
}; };
#define RT_CAN_MODE_NORMAL 0 #define RT_CAN_MODE_NORMAL 0