Copyright and licence for CAN timing calculation functions changed

After an analysis of the code and discussion with author, we were allowed
to use this code as we want and need.

We thing that the code does not differ from the original Pavel Pisas
code enough to be patentable, but it works better for our CAN implementation.

Fixes #979

Signed-off-by: Michal Horn <hornmich@fel.cvut.cz>

diff --git a/rpp/src/rpp/can.c b/rpp/src/rpp/can.c
index 2e3e9d0032614bcdf7dac3da9cea103ba16afaa8..a26febc8fda6258f0d4c72a6ffdfcd93e9e624b6 100644 (file)
--- a/rpp/src/rpp/can.c
+++ b/rpp/src/rpp/can.c
@@ -325,8 +325,6 @@ static int8_t can_set_timing(canBASE_t *controller, const struct rpp_can_timing_
 
 /* This code has been taken from can-calc-bit-timing.c */
 /* can-calc-bit-timing.c: Calculate CAN bit timing parameters
- *
- * Copyright (C) 2008 Wolfgang Grandegger <wg@grandegger.com>
  *
  * Derived from:
  *   can_baud.c - CAN baudrate calculation
@@ -335,7 +333,8 @@ static int8_t can_set_timing(canBASE_t *controller, const struct rpp_can_timing_
  *   Copyright 2005      Stanislav Marek
  *   email:pisa@cmp.felk.cvut.cz
  *
- *   This software is released under the GPL-License.
+ *   With permission from Pavel Pisa to distribute the code and
+ *   software under other license than GPL.
  */
 static int can_update_spt(int phase_seg2_min, int phase_seg2_max, int prop_seg_max, int phase_seg1_max,
                          int sampl_pt, int tseg, int *tseg1, int *tseg2)
@@ -355,8 +354,6 @@ static int can_update_spt(int phase_seg2_min, int phase_seg2_max, int prop_seg_m
 
 /* This code has been taken from can-calc-bit-timing.c */
 /* can-calc-bit-timing.c: Calculate CAN bit timing parameters
- *
- * Copyright (C) 2008 Wolfgang Grandegger <wg@grandegger.com>
  *
  * Derived from:
  *   can_baud.c - CAN baudrate calculation
@@ -365,7 +362,8 @@ static int can_update_spt(int phase_seg2_min, int phase_seg2_max, int prop_seg_m
  *   Copyright 2005      Stanislav Marek
  *   email:pisa@cmp.felk.cvut.cz
  *
- *   This software is released under the GPL-License.
+ *   With permission from Pavel Pisa to distribute the code and
+ *   software under other license than GPL.
  */
 static int8_t can_calculate_timing(const struct rpp_can_ctrl_config cfg, struct rpp_can_timing_cfg *timing) {
        static const int prop_seg_min = 1;