diff options
author | Ira W. Snyder <iws@ovro.caltech.edu> | 2012-07-18 18:33:18 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-07-20 11:49:05 -0400 |
commit | 3b5c6b9e49f78f07ebcd34b38c1185e57a0fd9eb (patch) | |
tree | 8b15fe983e725690a0ed49a98e5b5816ded49459 /drivers/net/can/janz-ican3.c | |
parent | 30df5888e4a244093c1b403b55ef889c97824f7b (diff) |
can: janz-ican3: add support for one shot mode
The Janz VMOD-ICAN3 hardware has support for one shot packet
transmission. This means that a packet will be attempted to be sent
once, with no automatic retries.
The SocketCAN core has a controller-wide setting for this mode:
CAN_CTRLMODE_ONE_SHOT. The Janz VMOD-ICAN3 hardware supports this flag
on a per-packet level, but the SocketCAN core does not.
Signed-off-by: Ira W. Snyder <iws@ovro.caltech.edu>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/janz-ican3.c')
-rw-r--r-- | drivers/net/can/janz-ican3.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index e06ec403521..98ee4381991 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c | |||
@@ -116,6 +116,7 @@ | |||
116 | #define ICAN3_BUSERR_QUOTA_MAX 255 | 116 | #define ICAN3_BUSERR_QUOTA_MAX 255 |
117 | 117 | ||
118 | /* Janz ICAN3 CAN Frame Conversion */ | 118 | /* Janz ICAN3 CAN Frame Conversion */ |
119 | #define ICAN3_SNGL 0x02 | ||
119 | #define ICAN3_ECHO 0x10 | 120 | #define ICAN3_ECHO 0x10 |
120 | #define ICAN3_EFF_RTR 0x40 | 121 | #define ICAN3_EFF_RTR 0x40 |
121 | #define ICAN3_SFF_RTR 0x10 | 122 | #define ICAN3_SFF_RTR 0x10 |
@@ -848,6 +849,10 @@ static void can_frame_to_ican3(struct ican3_dev *mod, | |||
848 | desc->data[0] |= cf->can_dlc; | 849 | desc->data[0] |= cf->can_dlc; |
849 | desc->data[1] |= ICAN3_ECHO; | 850 | desc->data[1] |= ICAN3_ECHO; |
850 | 851 | ||
852 | /* support single transmission (no retries) mode */ | ||
853 | if (mod->can.ctrlmode & CAN_CTRLMODE_ONE_SHOT) | ||
854 | desc->data[1] |= ICAN3_SNGL; | ||
855 | |||
851 | if (cf->can_id & CAN_RTR_FLAG) | 856 | if (cf->can_id & CAN_RTR_FLAG) |
852 | desc->data[0] |= ICAN3_EFF_RTR; | 857 | desc->data[0] |= ICAN3_EFF_RTR; |
853 | 858 | ||
@@ -1810,7 +1815,8 @@ static int __devinit ican3_probe(struct platform_device *pdev) | |||
1810 | mod->can.do_set_mode = ican3_set_mode; | 1815 | mod->can.do_set_mode = ican3_set_mode; |
1811 | mod->can.do_get_berr_counter = ican3_get_berr_counter; | 1816 | mod->can.do_get_berr_counter = ican3_get_berr_counter; |
1812 | mod->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | 1817 | mod->can.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES |
1813 | | CAN_CTRLMODE_BERR_REPORTING; | 1818 | | CAN_CTRLMODE_BERR_REPORTING |
1819 | | CAN_CTRLMODE_ONE_SHOT; | ||
1814 | 1820 | ||
1815 | /* find our IRQ number */ | 1821 | /* find our IRQ number */ |
1816 | mod->irq = platform_get_irq(pdev, 0); | 1822 | mod->irq = platform_get_irq(pdev, 0); |