Re: [Xen-devel] [PATCHv2 1/5] xen: rename ns16550-uart.h to 8250-uart.h and fix some typos

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Wed, 2013-08-07 at 14:55 +0100, Julien Grall wrote:
> On 08/07/2013 02:14 PM, Chen Baozi wrote:
> > Since UARTs on OMAP5 & Allwinner's SoC are not ns16550 but only 8250
> > compatible, rename ns16550-uart.h to 8250-uart.h, which is a more pervasive
> > name. At the same time, fix some typos, which have redundance UART_
> > prefixes in some macros.
> > 
> > Signed-off-by: Chen Baozi <baozich@xxxxxxxxx>
> Acked-by: Julien Grall <julien.grall@xxxxxxxxxx>

This common code change needs Keir's ack.

> > ---
> >  xen/drivers/char/ns16550.c                      |  2 +-
> >  xen/include/xen/{ns16550-uart.h => 8250-uart.h} | 18 +++++++++---------
> >  2 files changed, 10 insertions(+), 10 deletions(-)
> >  rename xen/include/xen/{ns16550-uart.h => 8250-uart.h} (89%)
> > 
> > diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
> > index e085a64..6082c85 100644
> > --- a/xen/drivers/char/ns16550.c
> > +++ b/xen/drivers/char/ns16550.c
> > @@ -19,7 +19,7 @@
> >  #include <xen/iocap.h>
> >  #include <xen/pci.h>
> >  #include <xen/pci_regs.h>
> > -#include <xen/ns16550-uart.h>
> > +#include <xen/8250-uart.h>
> >  #include <asm/io.h>
> >  #ifdef CONFIG_X86
> >  #include <asm/fixmap.h>
> > diff --git a/xen/include/xen/ns16550-uart.h b/xen/include/xen/8250-uart.h
> > similarity index 89%
> > rename from xen/include/xen/ns16550-uart.h
> > rename to xen/include/xen/8250-uart.h
> > index 232cef9..7287364 100644
> > --- a/xen/include/xen/ns16550-uart.h
> > +++ b/xen/include/xen/8250-uart.h
> > @@ -1,5 +1,5 @@
> >  /*
> > - * xen/include/xen/ns16550-uart.h
> > + * xen/include/xen/8250-uart.h
> >   *
> >   * This header is extracted from driver/char/ns16550.c
> >   *
> > @@ -19,8 +19,8 @@
> >   * GNU General Public License for more details.
> >   */
> >  
> > -#ifndef __XEN_NS16550_UART_H__
> > -#define __XEN_NS16550_UART_H__
> > +#ifndef __XEN_8250_UART_H__
> > +#define __XEN_8250_UART_H__
> >  
> >  /* Register offsets */
> >  #define UART_RBR          0x00    /* receive buffer       */
> > @@ -43,11 +43,11 @@
> >  
> >  /* Interrupt Identificatiegister */
> >  #define UART_IIR_NOINT    0x01    /* no interrupt pending */
> > -#define UART_UART_IIR_IMA 0x06    /* interrupt identity:  */
> > -#define UART_UART_IIR_LSI 0x06    /*  - rx line status    */
> > -#define UART_UART_IIR_RDA 0x04    /*  - rx data recv'd    */
> > -#define UART_UART_IIR_THR 0x02    /*  - tx reg. empty     */
> > -#define UART_UART_IIR_MSI 0x00    /*  - MODEM status      */
> > +#define UART_IIR_IMA      0x06    /* interrupt identity:  */
> > +#define UART_IIR_LSI      0x06    /*  - rx line status    */
> > +#define UART_IIR_RDA      0x04    /*  - rx data recv'd    */
> > +#define UART_IIR_THR      0x02    /*  - tx reg. empty     */
> > +#define UART_IIR_MSI      0x00    /*  - MODEM status      */
> >  
> >  /* FIFO Control Register */
> >  #define UART_FCR_ENABLE   0x01    /* enable FIFO          */
> > @@ -92,7 +92,7 @@
> >  #define RESUME_DELAY      MILLISECS(10)
> >  #define RESUME_RETRIES    100
> >  
> > -#endif /* __XEN_NS16550_UART_H__ */
> > +#endif /* __XEN_8250_UART_H__ */
> >  
> >  /*
> >   * Local variables:
> > 
> 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel