ia64/xen-unstable

changeset 5820:208a3afc9353

Make ns16550 rework on tiger4 box


Signed-off-by Kevin Tian <kevin.tian@intel.com>
author fred@localhost.localdomain
date Thu Jul 28 07:33:34 2005 -0800 (2005-07-28)
parents 34460b45204a
children a4196568095c
files xen/arch/ia64/pcdp.c xen/arch/ia64/xensetup.c
line diff
     1.1 --- a/xen/arch/ia64/pcdp.c	Thu Jul 28 07:29:12 2005 -0800
     1.2 +++ b/xen/arch/ia64/pcdp.c	Thu Jul 28 07:33:34 2005 -0800
     1.3 @@ -24,11 +24,11 @@ static int __init
     1.4  setup_serial_console(struct pcdp_uart *uart)
     1.5  {
     1.6  #ifdef XEN
     1.7 -	extern struct ns16550_defaults ns16550_com1;
     1.8 -	ns16550_com1.baud = uart->baud;
     1.9 -	ns16550_com1.io_base = uart->addr.address;
    1.10 +	extern struct ns16550_defaults ns16550_com;
    1.11 +	ns16550_com.baud = uart->baud;
    1.12 +	ns16550_com.io_base = uart->addr.address;
    1.13  	if (uart->bits)
    1.14 -		ns16550_com1.data_bits = uart->bits;
    1.15 +		ns16550_com.data_bits = uart->bits;
    1.16  	return 0;
    1.17  #else
    1.18  #ifdef CONFIG_SERIAL_8250_CONSOLE
     2.1 --- a/xen/arch/ia64/xensetup.c	Thu Jul 28 07:29:12 2005 -0800
     2.2 +++ b/xen/arch/ia64/xensetup.c	Thu Jul 28 07:33:34 2005 -0800
     2.3 @@ -130,7 +130,7 @@ void early_cmdline_parse(char **cmdline_
     2.4      return;
     2.5  }
     2.6  
     2.7 -struct ns16550_defaults ns16550_com1 = {
     2.8 +struct ns16550_defaults ns16550_com = {
     2.9      .data_bits = 8,
    2.10      .parity    = 'n',
    2.11      .stop_bits = 1
    2.12 @@ -158,7 +158,14 @@ void start_kernel(void)
    2.13  
    2.14      /* We initialise the serial devices very early so we can get debugging. */
    2.15      if (running_on_sim) hpsim_serial_init();
    2.16 -    else ns16550_init(0, &ns16550_com1);
    2.17 +    else {
    2.18 +	ns16550_com.io_base = 0x3f8;
    2.19 +	ns16550_com.irq     = 4;
    2.20 +	ns16550_init(0, &ns16550_com);
    2.21 +	ns16550_com.io_base = 0x2f8;
    2.22 +	ns16550_com.irq     = 3;
    2.23 +	ns16550_init(1, &ns16550_com);
    2.24 +    }
    2.25      serial_init_preirq();
    2.26  
    2.27      init_console();