slcan_attach: Print the name of the assigned netdevice after attaching the tty.

[sojka/can-utils.git] / can-calc-bit-timing.c

diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index a060ae53245d504016d641da7c19c141eb712d26..f8c04baa316698742ab3990860a4e726c095a964 100644 (file)
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -170,6 +170,21 @@ static void printf_btr_at91(struct can_bittiming *bt, int hdr)
        }
 }
 
+static void printf_btr_flexcan(struct can_bittiming *bt, int hdr)
+{
+       if (hdr) {
+               printf("%10s", "CAN_CTRL");
+       } else {
+               uint32_t ctrl = (((bt->brp        - 1) << 24) |
+                                ((bt->sjw        - 1) << 22) |
+                                ((bt->phase_seg1 - 1) << 19) |
+                                ((bt->phase_seg2 - 1) << 16) |
+                                ((bt->prop_seg   - 1) <<  0));
+
+               printf("0x%08x", ctrl);
+       }
+}
+
 static void printf_btr_mcp251x(struct can_bittiming *bt, int hdr)
 {
        uint8_t cnf1, cnf2, cnf3;
@@ -184,21 +199,6 @@ static void printf_btr_mcp251x(struct can_bittiming *bt, int hdr)
        }
 }
 
-static void printf_btr_rtcantl1(struct can_bittiming *bt, int hdr)
-{
-       uint16_t bcr0, bcr1;
-
-       if (hdr) {
-               printf("__BCR0 __BCR1");
-       } else {
-               bcr1 = ((((bt->prop_seg + bt->phase_seg1 - 1) & 0x0F) << 12) |
-                       (((bt->phase_seg2 - 1) & 0x07) << 8) |
-                       (((bt->sjw - 1) & 0x03) << 4));
-               bcr0 =  ((bt->brp - 1) & 0xFF);
-               printf("0x%04x 0x%04x", bcr0, bcr1);
-       }
-}
-
 static struct can_bittiming_const can_calc_consts[] = {
        {
                .name = "sja1000",
@@ -225,9 +225,51 @@ static struct can_bittiming_const can_calc_consts[] = {
                .brp_max = 64,
                .brp_inc = 1,
 
+               .ref_clk = 32000000,
+               .printf_btr = printf_btr_sja1000,
+       },
+       {
+               .name = "mscan",
+               .tseg1_min = 4,
+               .tseg1_max = 16,
+               .tseg2_min = 2,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 1,
+               .brp_max = 64,
+               .brp_inc = 1,
+
                .ref_clk = 33000000,
                .printf_btr = printf_btr_sja1000,
        },
+       {
+               .name = "mscan",
+               .tseg1_min = 4,
+               .tseg1_max = 16,
+               .tseg2_min = 2,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 1,
+               .brp_max = 64,
+               .brp_inc = 1,
+
+               .ref_clk = 33300000,
+               .printf_btr = printf_btr_sja1000,
+       },
+       {
+               .name = "mscan",
+               .tseg1_min = 4,
+               .tseg1_max = 16,
+               .tseg2_min = 2,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 1,
+               .brp_max = 64,
+               .brp_inc = 1,
+
+               .ref_clk = 33333333,
+               .printf_btr = printf_btr_sja1000,
+       },
        {
                .name = "at91",
                .tseg1_min = 4,
@@ -242,6 +284,49 @@ static struct can_bittiming_const can_calc_consts[] = {
                .ref_clk = 100000000,
                .printf_btr = printf_btr_at91,
        },
+       {
+               .name = "at91",
+               .tseg1_min = 4,
+               .tseg1_max = 16,
+               .tseg2_min = 2,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 2,
+               .brp_max = 128,
+               .brp_inc = 1,
+
+               /* real world clock as found on the ronetix PM9263 */
+               .ref_clk = 99532800,
+               .printf_btr = printf_btr_at91,
+       },
+       {
+               .name = "flexcan",
+               .tseg1_min = 4,
+               .tseg1_max = 16,
+               .tseg2_min = 2,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 1,
+               .brp_max = 256,
+               .brp_inc = 1,
+
+               .ref_clk = 49875000,
+               .printf_btr = printf_btr_flexcan,
+       },
+       {
+               .name = "flexcan",
+               .tseg1_min = 4,
+               .tseg1_max = 16,
+               .tseg2_min = 2,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 1,
+               .brp_max = 256,
+               .brp_inc = 1,
+
+               .ref_clk = 66500000,
+               .printf_btr = printf_btr_flexcan,
+       },
        {
                .name = "mcp251x",
                .tseg1_min = 3,
@@ -253,22 +338,22 @@ static struct can_bittiming_const can_calc_consts[] = {
                .brp_max = 64,
                .brp_inc = 1,
 
-               .ref_clk = 16000000,
+               .ref_clk = 8000000,
                .printf_btr = printf_btr_mcp251x,
        },
        {
-               .name = "rtcantl1",
-               .tseg1_min = 4,
+               .name = "mcp251x",
+               .tseg1_min = 3,
                .tseg1_max = 16,
                .tseg2_min = 2,
                .tseg2_max = 8,
                .sjw_max = 4,
                .brp_min = 1,
-               .brp_max = 256,
+               .brp_max = 64,
                .brp_inc = 1,
 
-               .ref_clk = 8000000,
-               .printf_btr = printf_btr_rtcantl1,
+               .ref_clk = 16000000,
+               .printf_btr = printf_btr_mcp251x,
        },
 };