From 6d0f43f2913d20b5ae20b2d7a9d968d593239d4c Mon Sep 17 00:00:00 2001 From: George Oikonomou Date: Sun, 29 Oct 2017 03:07:47 +0000 Subject: [PATCH] Remove stub instances of uart1.h Some platforms provide this header file because some examples used to assume its presence. Now that the examples no longer make this assumption, those stub headers are no longer required. --- arch/cpu/cc2538/dev/uart1.h | 51 ------------------------------ arch/cpu/cc26xx-cc13xx/dev/uart1.h | 51 ------------------------------ arch/cpu/native/dev/uart1.h | 31 ------------------ arch/platform/cooja/dev/uart1.h | 31 ------------------ 4 files changed, 164 deletions(-) delete mode 100644 arch/cpu/cc2538/dev/uart1.h delete mode 100644 arch/cpu/cc26xx-cc13xx/dev/uart1.h delete mode 100644 arch/cpu/native/dev/uart1.h delete mode 100644 arch/platform/cooja/dev/uart1.h diff --git a/arch/cpu/cc2538/dev/uart1.h b/arch/cpu/cc2538/dev/uart1.h deleted file mode 100644 index 7493ea048..000000000 --- a/arch/cpu/cc2538/dev/uart1.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/ - * 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 of the copyright holder 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 HOLDER 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. - */ -/** - * \addtogroup cc2538-uart - * @{ - * - * \file - * This file really only exists because some examples rely on it. - * - * For instance, some examples do uart1_set_input(f). We re-write this to - * uart_set_input - */ -#ifndef UART1_H_ -#define UART1_H_ - -#include "dev/uart.h" - -#define BAUD2UBR(x) x -#define uart1_set_input(f) uart_set_input(UART1_CONF_UART, f) - -#endif /* UART1_H_ */ - -/** @} */ diff --git a/arch/cpu/cc26xx-cc13xx/dev/uart1.h b/arch/cpu/cc26xx-cc13xx/dev/uart1.h deleted file mode 100644 index 76dcdcdbe..000000000 --- a/arch/cpu/cc26xx-cc13xx/dev/uart1.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2012, Texas Instruments Incorporated - http://www.ti.com/ - * 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 of the copyright holder 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 HOLDER 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. - */ -/** - * \addtogroup cc26xx-uart - * @{ - * - * \file - * This file really only exists because some examples rely on it. - * - * For instance, some examples do uart1_set_input(f). We re-write this to - * uart_set_input - */ -#ifndef UART1_H_ -#define UART1_H_ - -#include "dev/cc26xx-uart.h" - -#define BAUD2UBR(x) x -#define uart1_set_input(f) cc26xx_uart_set_input(f) - -#endif /* UART1_H_ */ - -/** @} */ diff --git a/arch/cpu/native/dev/uart1.h b/arch/cpu/native/dev/uart1.h deleted file mode 100644 index 69b96e574..000000000 --- a/arch/cpu/native/dev/uart1.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copied from mc1322x/dev/cpu. - - This file exists as a work-around for the hardware dependant calls - to slip_arch_init. - - Current the prototype for slip_arch_init is slip_arch_init(urb) - - and a typical call is something like - slip_arch_init(BAUD2URB(115200)) - - BAUD2UBR is hardware specific, however. Furthermore, for the sky - platform it's typically defined with #include "dev/uart1.h" (see - rpl-boarder-router/slip-bridge.c), a sky specific file. dev/uart1.h - includes msp430.h which includes the sky contiki-conf.h which - defines BAUD2UBR. - - To me, the correct think to pass is simply the baudrate and have the - hardware specific conversion happen inside slip_arch_init. - - Notably, most implementations just ignore the passed parameter - anyway. (except AVR) - - */ - -#ifndef DEV_UART1_H -#define DEV_UART1_H - -#define BAUD2UBR(x) x - -#endif diff --git a/arch/platform/cooja/dev/uart1.h b/arch/platform/cooja/dev/uart1.h deleted file mode 100644 index 69b96e574..000000000 --- a/arch/platform/cooja/dev/uart1.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copied from mc1322x/dev/cpu. - - This file exists as a work-around for the hardware dependant calls - to slip_arch_init. - - Current the prototype for slip_arch_init is slip_arch_init(urb) - - and a typical call is something like - slip_arch_init(BAUD2URB(115200)) - - BAUD2UBR is hardware specific, however. Furthermore, for the sky - platform it's typically defined with #include "dev/uart1.h" (see - rpl-boarder-router/slip-bridge.c), a sky specific file. dev/uart1.h - includes msp430.h which includes the sky contiki-conf.h which - defines BAUD2UBR. - - To me, the correct think to pass is simply the baudrate and have the - hardware specific conversion happen inside slip_arch_init. - - Notably, most implementations just ignore the passed parameter - anyway. (except AVR) - - */ - -#ifndef DEV_UART1_H -#define DEV_UART1_H - -#define BAUD2UBR(x) x - -#endif