From 7eeba7b8ca3aac5653bc92f7e7511b8719045210 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 11 Jun 2018 12:26:44 -0400
Subject: [PATCH] systemlib delete unused board_serial
---
src/drivers/px4fmu/fmu.cpp | 1 -
src/modules/systemlib/CMakeLists.txt | 1 -
src/modules/systemlib/board_serial.c | 55 ----------------------
src/modules/systemlib/board_serial.h | 51 --------------------
src/modules/uavcan/uavcan_main.cpp | 1 -
src/modules/uavcan/uavcan_servers.cpp | 1 -
src/modules/uavcanesc/uavcanesc_main.cpp | 1 -
src/modules/uavcannode/uavcannode_main.cpp | 1 -
8 files changed, 112 deletions(-)
delete mode 100644 src/modules/systemlib/board_serial.c
delete mode 100644 src/modules/systemlib/board_serial.h
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp
index de6d5b548c..f7d2548317 100644
--- a/src/drivers/px4fmu/fmu.cpp
+++ b/src/drivers/px4fmu/fmu.cpp
@@ -56,7 +56,6 @@
#include <px4_getopt.h>
#include <px4_log.h>
#include <px4_module.h>
-#include <systemlib/board_serial.h>
#include <systemlib/circuit_breaker.h>
#include <lib/mixer/mixer.h>
#include <parameters/param.h>
diff --git a/src/modules/systemlib/CMakeLists.txt b/src/modules/systemlib/CMakeLists.txt
index 940e9c68fe..56bce98846 100644
--- a/src/modules/systemlib/CMakeLists.txt
+++ b/src/modules/systemlib/CMakeLists.txt
@@ -33,7 +33,6 @@
set(SRCS
airspeed.cpp
- board_serial.c
circuit_breaker.cpp
conversions.c
cpuload.c
diff --git a/src/modules/systemlib/board_serial.c b/src/modules/systemlib/board_serial.c
deleted file mode 100644
index 497c4e963f..0000000000
--- a/src/modules/systemlib/board_serial.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
- *
- * Copyright (c) 2012-2014 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/**
- * @file board_serial.h
- * Read off the board serial
- *
- * @author Lorenz Meier <lm@inf.ethz.ch>
- * @author David "Buzz" Bussenschutt <davidbuzz@gmail.com>
- *
- */
-
-#include <px4_config.h>
-#include <string.h>
-#include "board_serial.h"
-
-int get_board_serial(uuid_byte_t serialid)
-{
-#if defined(BOARD_OVERRIDE_UUID)
- memcpy(serialid, BOARD_OVERRIDE_UUID, PX4_CPU_UUID_BYTE_LENGTH);
-#else
- board_get_uuid(serialid);
-#endif
- return 0;
-}
diff --git a/src/modules/systemlib/board_serial.h b/src/modules/systemlib/board_serial.h
deleted file mode 100644
index a94077b5fd..0000000000
--- a/src/modules/systemlib/board_serial.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
- *
- * Copyright (c) 2012-2014, 2017 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/**
- * @file board_serial.h
- * Read off the board serial
- *
- * @author Lorenz Meier <lm@inf.ethz.ch>
- * @author David "Buzz" Bussenschutt <davidbuzz@gmail.com>
- *
- */
-
-#pragma once
-
-#include <px4_config.h>
-
-__BEGIN_DECLS
-
-__EXPORT int get_board_serial(uuid_byte_t serialid);
-
-__END_DECLS
diff --git a/src/modules/uavcan/uavcan_main.cpp b/src/modules/uavcan/uavcan_main.cpp
index 5d72e0d16a..f7fa2689a1 100644
--- a/src/modules/uavcan/uavcan_main.cpp
+++ b/src/modules/uavcan/uavcan_main.cpp
@@ -51,7 +51,6 @@
#include <systemlib/err.h>
#include <parameters/param.h>
#include <lib/mixer/mixer.h>
-#include <systemlib/board_serial.h>
#include <version/version.h>
#include <arch/board/board.h>
#include <arch/chip/chip.h>
diff --git a/src/modules/uavcan/uavcan_servers.cpp b/src/modules/uavcan/uavcan_servers.cpp
index 1fc8da265c..43cdf6e442 100644
--- a/src/modules/uavcan/uavcan_servers.cpp
+++ b/src/modules/uavcan/uavcan_servers.cpp
@@ -44,7 +44,6 @@
#include <systemlib/err.h>
#include <parameters/param.h>
#include <lib/mixer/mixer.h>
-#include <systemlib/board_serial.h>
#include <version/version.h>
#include <arch/board/board.h>
#include <arch/chip/chip.h>
diff --git a/src/modules/uavcanesc/uavcanesc_main.cpp b/src/modules/uavcanesc/uavcanesc_main.cpp
index 596899992f..e93b3724ed 100644
--- a/src/modules/uavcanesc/uavcanesc_main.cpp
+++ b/src/modules/uavcanesc/uavcanesc_main.cpp
@@ -44,7 +44,6 @@
#include <systemlib/err.h>
#include <parameters/param.h>
#include <lib/mixer/mixer.h>
-#include <systemlib/board_serial.h>
#include <version/version.h>
#include <arch/board/board.h>
#include <arch/chip/chip.h>
diff --git a/src/modules/uavcannode/uavcannode_main.cpp b/src/modules/uavcannode/uavcannode_main.cpp
index 390273ada8..3d3eba6f46 100644
--- a/src/modules/uavcannode/uavcannode_main.cpp
+++ b/src/modules/uavcannode/uavcannode_main.cpp
@@ -47,7 +47,6 @@
#include <systemlib/err.h>
#include <parameters/param.h>
#include <lib/mixer/mixer.h>
-#include <systemlib/board_serial.h>
#include <version/version.h>
__BEGIN_DECLS
#include <nuttx/board.h>
--
GitLab