From f875744d56b3a41686ddc62ec6b2a194aa46d9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 8 Aug 2009 02:26:01 +0000 Subject: [PATCH] [ARM] Remove duplicate header. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32202 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/arch/arm/uart.h | 1 + src/system/boot/platform/u-boot/uart.h | 47 -------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 src/system/boot/platform/u-boot/uart.h diff --git a/headers/private/kernel/arch/arm/uart.h b/headers/private/kernel/arch/arm/uart.h index a3edc7f825..3c3826649e 100644 --- a/headers/private/kernel/arch/arm/uart.h +++ b/headers/private/kernel/arch/arm/uart.h @@ -31,6 +31,7 @@ extern "C" { void uart_init(void); void uart_init_early(void); +int uart_debug_port(void); int uart_putc(int port, char c); int uart_getc(int port, bool wait); diff --git a/src/system/boot/platform/u-boot/uart.h b/src/system/boot/platform/u-boot/uart.h deleted file mode 100644 index 3c3826649e..0000000000 --- a/src/system/boot/platform/u-boot/uart.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2008 Travis Geiselbrecht - * - * 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. - */ -#ifndef __DEV_UART_H -#define __DEV_UART_H - -//#include -#ifdef __cplusplus -extern "C" { -#endif - - -void uart_init(void); -void uart_init_early(void); -int uart_debug_port(void); - -int uart_putc(int port, char c); -int uart_getc(int port, bool wait); -void uart_flush_tx(int port); -void uart_flush_rx(int port); -void uart_init_port(int port, uint baud); - -#ifdef __cplusplus -} -#endif - -#endif -