From d713d57904dea546eec1428b432aac676bd4e1f2 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Tue, 9 Jan 2018 02:25:36 -0800 Subject: [PATCH] AP_HAL_Linux: update software license referencing UAVCAN submodule --- libraries/AP_HAL_Linux/CAN.cpp | 23 ++++++++++++++++++--- libraries/AP_HAL_Linux/CAN.h | 37 +++++++++++++--------------------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/libraries/AP_HAL_Linux/CAN.cpp b/libraries/AP_HAL_Linux/CAN.cpp index 8ece053dd5..c1fe6785b3 100644 --- a/libraries/AP_HAL_Linux/CAN.cpp +++ b/libraries/AP_HAL_Linux/CAN.cpp @@ -1,8 +1,25 @@ /* - * Copyright (C) 2014-2015 Pavel Kirienko - * Ilia Sheremet + 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +/* + * Many thanks to members of the UAVCAN project: + * Pavel Kirienko + * Ilia Sheremet * - * Modification for Ardupilot + * license info can be found in the uavcan submodule located: + * modules/uavcan/libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp */ #include diff --git a/libraries/AP_HAL_Linux/CAN.h b/libraries/AP_HAL_Linux/CAN.h index 497abd89c0..8d1295ba22 100644 --- a/libraries/AP_HAL_Linux/CAN.h +++ b/libraries/AP_HAL_Linux/CAN.h @@ -1,38 +1,29 @@ -/* This code was taken from UAVCAN project, which uses The MIT License (MIT). - - Copyright (c) 2014 Pavel Kirienko - - Permission is hereby granted, free of charge, to any person obtaining a copy of - this software and associated documentation files (the "Software"), to deal in - the Software without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - the Software, and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ -/* This code was modified to use with ArduPilot project, which uses 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 3 of the License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + You should have received a copy of the GNU General Public License along with this program. If not, see . +*/ + +/* + * Many thanks to members of the UAVCAN project: + * Pavel Kirienko + * Ilia Sheremet + * + * license info can be found in the uavcan submodule located: + * modules/uavcan/LICENSE + * modules/uavcan/libuavcan_drivers/linux/include/uavcan_linux/socketcan.hpp */ + #pragma once #include "AP_HAL_Linux.h"