isotp: add tool support for ISO 15765-2:2015 with CAN FD

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

diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index d97ebe6bcfa2374d654dd10bddb2fcbe4a4a4be0..36ff1e97024690b8e59abb27a852e05bd2327999 100644 (file)
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -9,7 +9,10 @@
  *   Copyright 2005      Stanislav Marek
  *   email:pisa@cmp.felk.cvut.cz
  *
- *   This software is released under the GPL-License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
  */
 
 #include <errno.h>
@@ -26,7 +29,7 @@
 #define ENOTSUPP       524     /* Operation is not supported */
 #endif
 
-/* usefull defines */
+/* useful defines */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 #define do_div(a,b) a = (a) / (b)
@@ -192,13 +195,30 @@ static void printf_btr_mcp251x(struct can_bittiming *bt, int hdr)
        if (hdr) {
                printf("CNF1 CNF2 CNF3");
        } else {
-               cnf1 = ((bt->sjw - 1) << 6) | bt->brp;
+               cnf1 = ((bt->sjw - 1) << 6) | (bt->brp - 1);
                cnf2 = 0x80 | ((bt->phase_seg1 - 1) << 3) | (bt->prop_seg - 1);
                cnf3 = bt->phase_seg2 - 1;
                printf("0x%02x 0x%02x 0x%02x", cnf1, cnf2, cnf3);
        }
 }
 
+static void printf_btr_ti_hecc(struct can_bittiming *bt, int hdr)
+{
+       if (hdr) {
+               printf("%10s", "CANBTC");
+       } else {
+               uint32_t can_btc;
+
+               can_btc = (bt->phase_seg2 - 1) & 0x7;
+               can_btc |= ((bt->phase_seg1 + bt->prop_seg - 1)
+                           & 0xF) << 3;
+               can_btc |= ((bt->sjw - 1) & 0x3) << 8;
+               can_btc |= ((bt->brp - 1) & 0xFF) << 16;
+
+               printf("0x%08x", can_btc);
+       }
+}
+
 static struct can_bittiming_const can_calc_consts[] = {
        {
                .name = "sja1000",
@@ -397,6 +417,20 @@ static struct can_bittiming_const can_calc_consts[] = {
                .ref_clk = 16000000,
                .printf_btr = printf_btr_mcp251x,
        },
+       {
+               .name = "ti_hecc",
+               .tseg1_min = 1,
+               .tseg1_max = 16,
+               .tseg2_min = 1,
+               .tseg2_max = 8,
+               .sjw_max = 4,
+               .brp_min = 1,
+               .brp_max = 256,
+               .brp_inc = 1,
+
+               .ref_clk = 13000000,
+               .printf_btr = printf_btr_ti_hecc,
+       }
 };
 
 static long common_bitrates[] = {