diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2009-11-16 07:57:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 06:54:04 -0500 |
| commit | 74ff60b29ec602322178d32cb2a82b24ddb884fc (patch) | |
| tree | a40c1fbec527711284eabfe18d9f50eb097e877f /drivers/net/can/mscan/mscan.c | |
| parent | 81593c1cea7afdcd653c77d626aa186993e39c91 (diff) | |
net/can/mscan: replace hardcoded values with defines
Not all hardcoded values have been replaced as this made the code quite
unreadable. IMHO this compromise serves the purpose of readability.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/mscan/mscan.c')
| -rw-r--r-- | drivers/net/can/mscan/mscan.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c index 20d1991b9094..263d1a9f0880 100644 --- a/drivers/net/can/mscan/mscan.c +++ b/drivers/net/can/mscan/mscan.c | |||
| @@ -211,18 +211,23 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 211 | 211 | ||
| 212 | rtr = frame->can_id & CAN_RTR_FLAG; | 212 | rtr = frame->can_id & CAN_RTR_FLAG; |
| 213 | 213 | ||
| 214 | /* RTR is always the lowest bit of interest, then IDs follow */ | ||
| 214 | if (frame->can_id & CAN_EFF_FLAG) { | 215 | if (frame->can_id & CAN_EFF_FLAG) { |
| 215 | can_id = (frame->can_id & CAN_EFF_MASK) << 1; | 216 | can_id = (frame->can_id & CAN_EFF_MASK) |
| 217 | << (MSCAN_EFF_RTR_SHIFT + 1); | ||
| 216 | if (rtr) | 218 | if (rtr) |
| 217 | can_id |= 1; | 219 | can_id |= 1 << MSCAN_EFF_RTR_SHIFT; |
| 218 | out_be16(®s->tx.idr3_2, can_id); | 220 | out_be16(®s->tx.idr3_2, can_id); |
| 219 | 221 | ||
| 220 | can_id >>= 16; | 222 | can_id >>= 16; |
| 221 | can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0) | (3 << 3); | 223 | /* EFF_FLAGS are inbetween the IDs :( */ |
| 224 | can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0) | ||
| 225 | | MSCAN_EFF_FLAGS; | ||
| 222 | } else { | 226 | } else { |
| 223 | can_id = (frame->can_id & CAN_SFF_MASK) << 5; | 227 | can_id = (frame->can_id & CAN_SFF_MASK) |
| 228 | << (MSCAN_SFF_RTR_SHIFT + 1); | ||
| 224 | if (rtr) | 229 | if (rtr) |
| 225 | can_id |= 1 << 4; | 230 | can_id |= 1 << MSCAN_SFF_RTR_SHIFT; |
| 226 | } | 231 | } |
| 227 | out_be16(®s->tx.idr1_0, can_id); | 232 | out_be16(®s->tx.idr1_0, can_id); |
| 228 | 233 | ||