From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lb0-f177.google.com ([209.85.217.177]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UigsF-0002AR-9L for barebox@lists.infradead.org; Sat, 01 Jun 2013 08:09:16 +0000 Received: by mail-lb0-f177.google.com with SMTP id o10so2387430lbi.36 for ; Sat, 01 Jun 2013 01:08:52 -0700 (PDT) Date: Sat, 1 Jun 2013 12:07:48 +0400 From: "antonynpavlov@gmail.com" Message-Id: <20130601120748.b43bc182517396a9b492736e@gmail.com> In-Reply-To: <1370073169-29009-7-git-send-email-antonynpavlov@gmail.com> References: <1370073169-29009-1-git-send-email-antonynpavlov@gmail.com> <1370073169-29009-7-git-send-email-antonynpavlov@gmail.com> Mime-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 6/6] MIPS: unificate ns16550 debug_ll support code To: Sascha Hauer Cc: barebox@lists.infradead.org On Sat, 1 Jun 2013 11:52:49 +0400 Antony Pavlov wrote: Sorry, not "unificate" but "unify". > This commit moves the C debug_ll code from > the MIPS header file to > the MIPS header file, > so the C code and the asm code can use the same > register address macros. > = > Signed-off-by: Antony Pavlov > --- > arch/mips/include/asm/debug_ll_ns16550.h | 15 ++++++++++ > arch/mips/include/debug_ll_ns16550.h | 37 -------------------= ------ > arch/mips/mach-malta/include/mach/debug_ll.h | 2 +- > arch/mips/mach-xburst/include/mach/debug_ll.h | 2 +- > 4 files changed, 17 insertions(+), 39 deletions(-) > delete mode 100644 arch/mips/include/debug_ll_ns16550.h > = > diff --git a/arch/mips/include/asm/debug_ll_ns16550.h b/arch/mips/include= /asm/debug_ll_ns16550.h > index 5dd1b39..f00f348 100644 > --- a/arch/mips/include/asm/debug_ll_ns16550.h > +++ b/arch/mips/include/asm/debug_ll_ns16550.h > @@ -48,6 +48,20 @@ > = > #define UART_LSR_THRE 0x20 /* Xmit holding register empty */ > = > +#ifndef __ASSEMBLY__ > +/* > + * C macros > + */ > + > +#include > + > +static __inline__ void PUTC_LL(char ch) > +{ > + while (!(__raw_readb((u8 *)DEBUG_LL_UART_ADDR + UART_LSR) & UART_LSR_TH= RE)) > + ; > + __raw_writeb(ch, (u8 *)DEBUG_LL_UART_ADDR + UART_THR); > +} > +#else /* __ASSEMBLY__ */ > /* > * Macros for use in assembly language code > */ > @@ -96,5 +110,6 @@ > debug_ll_ns16550_outc '\n' > #endif /* CONFIG_DEBUG_LL */ > .endm > +#endif /* __ASSEMBLY__ */ > = > #endif /* __INCLUDE_MIPS_ASM_DEBUG_LL_NS16550_H__ */ > diff --git a/arch/mips/include/debug_ll_ns16550.h b/arch/mips/include/deb= ug_ll_ns16550.h > deleted file mode 100644 > index e9c7ecf..0000000 > --- a/arch/mips/include/debug_ll_ns16550.h > +++ /dev/null > @@ -1,37 +0,0 @@ > -/* > - * Copyright (C) 2012 Antony Pavlov > - * > - * This file is part of barebox. > - * See file CREDITS for list of people who contributed to this project. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 > - * as published by the Free Software Foundation. > - * > - * 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. > - * > - */ > - > -/** @file > - * This file contains declaration for early output support > - */ > -#ifndef __INCLUDE_ARCH_DEBUG_LL_NS16550_H__ > -#define __INCLUDE_ARCH_DEBUG_LL_NS16550_H__ > - > -#include > - > -#define rbr (0 << DEBUG_LL_UART_SHIFT) > -#define lsr (5 << DEBUG_LL_UART_SHIFT) > - > -#define LSR_THRE 0x20 /* Xmit holding register empty */ > - > -static __inline__ void PUTC_LL(char ch) > -{ > - while (!(__raw_readb((u8 *)DEBUG_LL_UART_ADDR + lsr) & LSR_THRE)); > - __raw_writeb(ch, (u8 *)DEBUG_LL_UART_ADDR + rbr); > -} > - > -#endif /* __INCLUDE_ARCH_DEBUG_LL_NS16550_H__ */ > diff --git a/arch/mips/mach-malta/include/mach/debug_ll.h b/arch/mips/mac= h-malta/include/mach/debug_ll.h > index 3a91c93..3e8b01b 100644 > --- a/arch/mips/mach-malta/include/mach/debug_ll.h > +++ b/arch/mips/mach-malta/include/mach/debug_ll.h > @@ -23,6 +23,6 @@ > = > #include > = > -#include > +#include > = > #endif /* __INCLUDE_ARCH_DEBUG_LL_H__ */ > diff --git a/arch/mips/mach-xburst/include/mach/debug_ll.h b/arch/mips/ma= ch-xburst/include/mach/debug_ll.h > index f260e65..6c3c980 100644 > --- a/arch/mips/mach-xburst/include/mach/debug_ll.h > +++ b/arch/mips/mach-xburst/include/mach/debug_ll.h > @@ -22,6 +22,6 @@ > * This File contains declaration for early output support > */ > #include > -#include > +#include > = > #endif /* __MACH_XBURST_DEBUG_LL__ */ > -- = > 1.7.10.4 > = -- = --=A0 Best regards, =A0 Antony Pavlov _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox