fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / arch / cris / arch-v10 / kernel / debugport.c
index 012c302..2b536ca 100644 (file)
  *    init_etrax_debug()
  *
  * $Log: debugport.c,v $
+ * Revision 1.27  2005/06/10 10:34:14  starvik
+ * Real console support
+ *
+ * Revision 1.26  2005/06/07 07:06:07  starvik
+ * Added LF->CR translation to make ETRAX customers happy.
+ *
+ * Revision 1.25  2005/03/08 08:56:47  mikaelam
+ * Do only set index as port->index if port is defined, otherwise use the index from the command line
+ *
+ * Revision 1.24  2005/01/19 10:26:33  mikaelam
+ * Return the cris serial driver in console device driver callback function
+ *
+ * Revision 1.23  2005/01/14 10:12:17  starvik
+ * KGDB on separate port.
+ * Console fixes from 2.4.
+ *
+ * Revision 1.22  2005/01/11 16:06:13  starvik
+ * typo
+ *
+ * Revision 1.21  2005/01/11 13:49:14  starvik
+ * Added raw_printk to be used where we don't trust the console.
+ *
+ * Revision 1.20  2004/12/27 11:18:32  starvik
+ * Merge of Linux 2.6.10 (not functional yet).
+ *
+ * Revision 1.19  2004/10/21 07:26:16  starvik
+ * Made it possible to specify console settings on kernel command line.
+ *
+ * Revision 1.18  2004/10/19 13:07:37  starvik
+ * Merge of Linux 2.6.9
+ *
+ * Revision 1.17  2004/09/29 10:33:46  starvik
+ * Resolved a dealock when printing debug from kernel.
+ *
+ * Revision 1.16  2004/08/24 06:12:19  starvik
+ * Whitespace cleanup
+ *
+ * Revision 1.15  2004/08/16 12:37:19  starvik
+ * Merge of Linux 2.6.8
+ *
+ * Revision 1.14  2004/05/17 13:11:29  starvik
+ * Disable DMA until real serial driver is up
+ *
+ * Revision 1.13  2004/05/14 07:58:01  starvik
+ * Merge of changes from 2.4
+ *
+ * Revision 1.12  2003/09/11 07:29:49  starvik
+ * Merge of Linux 2.6.0-test5
+ *
  * Revision 1.11  2003/07/07 09:53:36  starvik
  * Revert all the 2.5.74 merge changes to make the console work again
  *
  *
  */
 
-#include <linux/config.h>
 #include <linux/console.h>
 #include <linux/init.h>
 #include <linux/major.h>
 #include <linux/delay.h>
-
+#include <linux/tty.h>
 #include <asm/system.h>
 #include <asm/arch/svinto.h>
 #include <asm/io.h>             /* Get SIMCOUT. */
 
-/* Which serial-port is our debug port ? */
-
-#if defined(CONFIG_ETRAX_DEBUG_PORT0) || defined(CONFIG_ETRAX_DEBUG_PORT_NULL)
-#define DEBUG_PORT_IDX 0
-#define DEBUG_OCMD R_DMA_CH6_CMD
-#define DEBUG_FIRST R_DMA_CH6_FIRST
-#define DEBUG_OCLRINT R_DMA_CH6_CLR_INTR
-#define DEBUG_STATUS R_DMA_CH6_STATUS
-#define DEBUG_READ R_SERIAL0_READ
-#define DEBUG_WRITE R_SERIAL0_TR_DATA
-#define DEBUG_TR_CTRL R_SERIAL0_TR_CTRL
-#define DEBUG_REC_CTRL R_SERIAL0_REC_CTRL
-#define DEBUG_IRQ IO_STATE(R_IRQ_MASK1_SET, ser0_data, set)
-#define DEBUG_DMA_IRQ_CLR IO_STATE(R_IRQ_MASK2_CLR, dma6_descr, clr)
-#endif
+struct dbg_port
+{
+  unsigned int index;
+  const volatile unsigned* read;
+  volatile char* write;
+  volatile unsigned* xoff;
+  volatile char* baud;
+  volatile char* tr_ctrl;
+  volatile char* rec_ctrl;
+  unsigned long irq;
+  unsigned int started;
+  unsigned long baudrate;
+  unsigned char parity;
+  unsigned int bits;
+};
 
-#ifdef CONFIG_ETRAX_DEBUG_PORT1
-#define DEBUG_PORT_IDX 1
-#define DEBUG_OCMD R_DMA_CH8_CMD
-#define DEBUG_FIRST R_DMA_CH8_FIRST
-#define DEBUG_OCLRINT R_DMA_CH8_CLR_INTR
-#define DEBUG_STATUS R_DMA_CH8_STATUS
-#define DEBUG_READ R_SERIAL1_READ
-#define DEBUG_WRITE R_SERIAL1_TR_DATA
-#define DEBUG_TR_CTRL R_SERIAL1_TR_CTRL
-#define DEBUG_REC_CTRL R_SERIAL1_REC_CTRL
-#define DEBUG_IRQ IO_STATE(R_IRQ_MASK1_SET, ser1_data, set)
-#define DEBUG_DMA_IRQ_CLR IO_STATE(R_IRQ_MASK2_CLR, dma8_descr, clr)
-#endif
+struct dbg_port ports[]=
+{
+  {
+    0,
+    R_SERIAL0_READ,
+    R_SERIAL0_TR_DATA,
+    R_SERIAL0_XOFF,
+    R_SERIAL0_BAUD,
+    R_SERIAL0_TR_CTRL,
+    R_SERIAL0_REC_CTRL,
+    IO_STATE(R_IRQ_MASK1_SET, ser0_data, set),
+    0,
+    115200,
+    'N',
+    8
+  },
+  {
+    1,
+    R_SERIAL1_READ,
+    R_SERIAL1_TR_DATA,
+    R_SERIAL1_XOFF,
+    R_SERIAL1_BAUD,
+    R_SERIAL1_TR_CTRL,
+    R_SERIAL1_REC_CTRL,
+    IO_STATE(R_IRQ_MASK1_SET, ser1_data, set),
+    0,
+    115200,
+    'N',
+    8
+  },
+  {
+    2,
+    R_SERIAL2_READ,
+    R_SERIAL2_TR_DATA,
+    R_SERIAL2_XOFF,
+    R_SERIAL2_BAUD,
+    R_SERIAL2_TR_CTRL,
+    R_SERIAL2_REC_CTRL,
+    IO_STATE(R_IRQ_MASK1_SET, ser2_data, set),
+    0,
+    115200,
+    'N',
+    8
+  },
+  {
+    3,
+    R_SERIAL3_READ,
+    R_SERIAL3_TR_DATA,
+    R_SERIAL3_XOFF,
+    R_SERIAL3_BAUD,
+    R_SERIAL3_TR_CTRL,
+    R_SERIAL3_REC_CTRL,
+    IO_STATE(R_IRQ_MASK1_SET, ser3_data, set),
+    0,
+    115200,
+    'N',
+    8
+  }
+};
 
-#ifdef CONFIG_ETRAX_DEBUG_PORT2
-#define DEBUG_PORT_IDX 2
-#define DEBUG_OCMD R_DMA_CH2_CMD
-#define DEBUG_FIRST R_DMA_CH2_FIRST
-#define DEBUG_OCLRINT R_DMA_CH2_CLR_INTR
-#define DEBUG_STATUS R_DMA_CH2_STATUS
-#define DEBUG_READ R_SERIAL2_READ
-#define DEBUG_WRITE R_SERIAL2_TR_DATA
-#define DEBUG_TR_CTRL R_SERIAL2_TR_CTRL
-#define DEBUG_REC_CTRL R_SERIAL2_REC_CTRL
-#define DEBUG_IRQ IO_STATE(R_IRQ_MASK1_SET, ser2_data, set)
-#define DEBUG_DMA_IRQ_CLR IO_STATE(R_IRQ_MASK2_CLR, dma2_descr, clr)
+extern struct tty_driver *serial_driver;
+
+struct dbg_port* port =
+#if defined(CONFIG_ETRAX_DEBUG_PORT0)
+  &ports[0];
+#elif defined(CONFIG_ETRAX_DEBUG_PORT1)
+  &ports[1];
+#elif defined(CONFIG_ETRAX_DEBUG_PORT2)
+  &ports[2];
+#elif defined(CONFIG_ETRAX_DEBUG_PORT3)
+  &ports[3];
+#else
+  NULL;
 #endif
 
-#ifdef CONFIG_ETRAX_DEBUG_PORT3
-#define DEBUG_PORT_IDX 3
-#define DEBUG_OCMD R_DMA_CH4_CMD
-#define DEBUG_FIRST R_DMA_CH4_FIRST
-#define DEBUG_OCLRINT R_DMA_CH4_CLR_INTR
-#define DEBUG_STATUS R_DMA_CH4_STATUS
-#define DEBUG_READ R_SERIAL3_READ
-#define DEBUG_WRITE R_SERIAL3_TR_DATA
-#define DEBUG_TR_CTRL R_SERIAL3_TR_CTRL
-#define DEBUG_REC_CTRL R_SERIAL3_REC_CTRL
-#define DEBUG_IRQ IO_STATE(R_IRQ_MASK1_SET, ser3_data, set)
-#define DEBUG_DMA_IRQ_CLR IO_STATE(R_IRQ_MASK2_CLR, dma4_descr, clr)
+static struct dbg_port* kgdb_port =
+#if defined(CONFIG_ETRAX_KGDB_PORT0)
+  &ports[0];
+#elif defined(CONFIG_ETRAX_KGDB_PORT1)
+  &ports[1];
+#elif defined(CONFIG_ETRAX_KGDB_PORT2)
+  &ports[2];
+#elif defined(CONFIG_ETRAX_KGDB_PORT3)
+  &ports[3];
+#else
+  NULL;
 #endif
 
-#define MIN_SIZE 32 /* Size that triggers the FIFO to flush characters to interface */
-
-/* Write a string of count length to the console (debug port) using DMA, polled
- * for completion. Interrupts are disabled during the whole process. Some
- * caution needs to be taken to not interfere with ttyS business on this port.
- */
-
-static void 
-console_write(struct console *co, const char *buf, unsigned int len)
+static void
+start_port(struct dbg_port* p)
 {
+       unsigned long rec_ctrl = 0;
+       unsigned long tr_ctrl = 0;
 
-       static struct etrax_dma_descr descr;
-       static struct etrax_dma_descr descr2;
-       static char tmp_buf[MIN_SIZE];
-       static int tmp_size = 0;
-
-       unsigned long flags; 
-       
-#ifdef CONFIG_ETRAX_DEBUG_PORT_NULL
-        /* no debug printout at all */
-        return;
-#endif
-
-#ifdef CONFIG_SVINTO_SIM
-       /* no use to simulate the serial debug output */
-       SIMCOUT(buf,len);
-       return;
-#endif
-       
-       local_save_flags(flags);
-       local_irq_disable();
-
-#ifdef CONFIG_ETRAX_KGDB
-       /* kgdb needs to output debug info using the gdb protocol */
-       putDebugString(buf, len);
-       local_irq_restore(flags);
-       return;
-#endif
+       if (!p)
+               return;
 
-       /* To make this work together with the real serial port driver
-        * we have to make sure that everything is flushed when we leave
-        * here. The following steps are made to assure this:
-        * 1. Wait until DMA stops, FIFO is empty and serial port pipeline empty.
-        * 2. Write at least half the FIFO to trigger flush to serial port.
-        * 3. Wait until DMA stops, FIFO is empty and serial port pipeline empty.
-         */
+       if (p->started)
+               return;
+       p->started = 1;
 
-       /* Do we have enough characters to make the DMA/FIFO happy? */
-       if (tmp_size + len < MIN_SIZE)
+       if (p->index == 0)
        {
-               int size = min((int)(MIN_SIZE - tmp_size),(int)len);
-               memcpy(&tmp_buf[tmp_size], buf, size);
-               tmp_size += size;
-               len -= size;
-        
-               /* Pad with space if complete line */
-               if (tmp_buf[tmp_size-1] == '\n')
-               {
-                       memset(&tmp_buf[tmp_size-1], ' ', MIN_SIZE - tmp_size);
-                       tmp_buf[MIN_SIZE - 1] = '\n';
-                       tmp_size = MIN_SIZE;
-                       len = 0;
-               }
-               else
-               {
-                  /* Wait for more characters */
-                       local_irq_restore(flags);
-                       return;
-               }
+               genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma6);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma6, unused);
+       }
+       else if (p->index == 1)
+       {
+               genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma8);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma8, usb);
+       }
+       else if (p->index == 2)
+       {
+               genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma2);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma2, par0);
+               genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma3);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma3, par0);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, ser2, select);
+       }
+       else
+       {
+               genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma4);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma4, par1);
+               genconfig_shadow &= ~IO_MASK(R_GEN_CONFIG, dma5);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, dma5, par1);
+               genconfig_shadow |= IO_STATE(R_GEN_CONFIG, ser3, select);
        }
 
-       /* make sure the transmitter is enabled. 
-        * NOTE: this overrides any setting done in ttySx, to 8N1, no auto-CTS.
-        * in the future, move the tr/rec_ctrl shadows from etrax100ser.c to
-        * shadows.c and use it here as well...
-        */
+       *R_GEN_CONFIG = genconfig_shadow;
 
-       *DEBUG_TR_CTRL = 0x40;
-       while(*DEBUG_OCMD & 7); /* Until DMA is not running */
-       while(*DEBUG_STATUS & 0x7f); /* wait until output FIFO is empty as well */
-       udelay(200); /* Wait for last two characters to leave the serial transmitter */
+       *p->xoff =
+               IO_STATE(R_SERIAL0_XOFF, tx_stop, enable) |
+               IO_STATE(R_SERIAL0_XOFF, auto_xoff, disable) |
+               IO_FIELD(R_SERIAL0_XOFF, xoff_char, 0);
 
-       if (tmp_size)
+       switch (p->baudrate)
+       {
+       case 0:
+       case 115200:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c115k2Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c115k2Hz);
+               break;
+       case 1200:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c1200Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c1200Hz);
+               break;
+       case 2400:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c2400Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c2400Hz);
+               break;
+       case 4800:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c4800Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c4800Hz);
+               break;
+       case 9600:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c9600Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c9600Hz);
+                 break;
+       case 19200:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c19k2Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c19k2Hz);
+                break;
+       case 38400:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c38k4Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c38k4Hz);
+               break;
+       case 57600:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c57k6Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c57k6Hz);
+               break;
+       default:
+               *p->baud =
+                 IO_STATE(R_SERIAL0_BAUD, tr_baud, c115k2Hz) |
+                 IO_STATE(R_SERIAL0_BAUD, rec_baud, c115k2Hz);
+                 break;
+        }
+
+       if (p->parity == 'E') {
+               rec_ctrl =
+                 IO_STATE(R_SERIAL0_REC_CTRL, rec_par, even) |
+                 IO_STATE(R_SERIAL0_REC_CTRL, rec_par_en, enable);
+               tr_ctrl =
+                 IO_STATE(R_SERIAL0_TR_CTRL, tr_par, even) |
+                 IO_STATE(R_SERIAL0_TR_CTRL, tr_par_en, enable);
+       } else if (p->parity == 'O') {
+               rec_ctrl =
+                 IO_STATE(R_SERIAL0_REC_CTRL, rec_par, odd) |
+                 IO_STATE(R_SERIAL0_REC_CTRL, rec_par_en, enable);
+               tr_ctrl =
+                 IO_STATE(R_SERIAL0_TR_CTRL, tr_par, odd) |
+                 IO_STATE(R_SERIAL0_TR_CTRL, tr_par_en, enable);
+       } else {
+               rec_ctrl =
+                 IO_STATE(R_SERIAL0_REC_CTRL, rec_par, even) |
+                 IO_STATE(R_SERIAL0_REC_CTRL, rec_par_en, disable);
+               tr_ctrl =
+                 IO_STATE(R_SERIAL0_TR_CTRL, tr_par, even) |
+                 IO_STATE(R_SERIAL0_TR_CTRL, tr_par_en, disable);
+       }
+       if (p->bits == 7)
        {
-               descr.ctrl = len ?  0 : d_eop | d_wait | d_eol;
-               descr.sw_len = tmp_size;
-               descr.buf = virt_to_phys(tmp_buf);
-               descr.next = virt_to_phys(&descr2);
-               descr2.ctrl = d_eop | d_wait | d_eol;
-               descr2.sw_len = len;
-               descr2.buf = virt_to_phys((char*)buf);
+               rec_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_bitnr, rec_7bit);
+               tr_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_bitnr, tr_7bit);
        }
        else
        {
-               descr.ctrl = d_eop | d_wait | d_eol;
-               descr.sw_len = len;
-               descr.buf = virt_to_phys((char*)buf);
+               rec_ctrl |= IO_STATE(R_SERIAL0_REC_CTRL, rec_bitnr, rec_8bit);
+               tr_ctrl |= IO_STATE(R_SERIAL0_TR_CTRL, tr_bitnr, tr_8bit);
        }
 
-       *DEBUG_FIRST = virt_to_phys(&descr); /* write to R_DMAx_FIRST */
-       *DEBUG_OCMD = 1;       /* dma command start -> R_DMAx_CMD */
-
-       /* wait until the output dma channel is ready again */
-       while(*DEBUG_OCMD & 7);
-       while(*DEBUG_STATUS & 0x7f);
-       udelay(200);
+       *p->rec_ctrl =
+               IO_STATE(R_SERIAL0_REC_CTRL, dma_err, stop) |
+               IO_STATE(R_SERIAL0_REC_CTRL, rec_enable, enable) |
+               IO_STATE(R_SERIAL0_REC_CTRL, rts_, active) |
+               IO_STATE(R_SERIAL0_REC_CTRL, sampling, middle) |
+               IO_STATE(R_SERIAL0_REC_CTRL, rec_stick_par, normal) |
+               rec_ctrl;
+
+       *p->tr_ctrl =
+               IO_FIELD(R_SERIAL0_TR_CTRL, txd, 0) |
+               IO_STATE(R_SERIAL0_TR_CTRL, tr_enable, enable) |
+               IO_STATE(R_SERIAL0_TR_CTRL, auto_cts, disabled) |
+               IO_STATE(R_SERIAL0_TR_CTRL, stop_bits, one_bit) |
+               IO_STATE(R_SERIAL0_TR_CTRL, tr_stick_par, normal) |
+               tr_ctrl;
+}
 
-       tmp_size = 0;
+static void
+console_write_direct(struct console *co, const char *buf, unsigned int len)
+{
+       int i;
+       unsigned long flags;
+       local_irq_save(flags);
+
+        if (!port)
+               return;
+
+       /* Send data */
+       for (i = 0; i < len; i++) {
+               /* LF -> CRLF */
+               if (buf[i] == '\n') {
+                       while (!(*port->read & IO_MASK(R_SERIAL0_READ, tr_ready)))
+                       ;
+                       *port->write = '\r';
+               }
+               /* Wait until transmitter is ready and send.*/
+               while (!(*port->read & IO_MASK(R_SERIAL0_READ, tr_ready)))
+                       ;
+               *port->write = buf[i];
+       }
        local_irq_restore(flags);
 }
 
+int raw_printk(const char *fmt, ...)
+{
+       static char buf[1024];
+       int printed_len;
+       static int first = 1;
+       if (first) {
+               /* Force reinitialization of the port to get manual mode. */
+               port->started = 0;
+               start_port(port);
+               first = 0;
+       }
+       va_list args;
+       va_start(args, fmt);
+       printed_len = vsnprintf(buf, sizeof(buf), fmt, args);
+       va_end(args);
+       console_write_direct(NULL, buf, strlen(buf));
+       return printed_len;
+}
+
+static void
+console_write(struct console *co, const char *buf, unsigned int len)
+{
+       if (!port)
+               return;
+
+#ifdef CONFIG_SVINTO_SIM
+       /* no use to simulate the serial debug output */
+       SIMCOUT(buf, len);
+       return;
+#endif
+
+        console_write_direct(co, buf, len);
+}
+
 /* legacy function */
 
 void
@@ -247,10 +437,13 @@ int
 getDebugChar(void)
 {
        unsigned long readval;
-       
+
+       if (!kgdb_port)
+               return 0;
+
        do {
-               readval = *DEBUG_READ;
-       } while(!(readval & IO_MASK(R_SERIAL0_READ, data_avail)));
+               readval = *kgdb_port->read;
+       } while (!(readval & IO_MASK(R_SERIAL0_READ, data_avail)));
 
        return (readval & IO_MASK(R_SERIAL0_READ, data_in));
 }
@@ -260,9 +453,12 @@ getDebugChar(void)
 void
 putDebugChar(int val)
 {
-       while(!(*DEBUG_READ & IO_MASK(R_SERIAL0_READ, tr_ready))) ;
-;
-       *DEBUG_WRITE = val;
+       if (!kgdb_port)
+               return;
+
+       while (!(*kgdb_port->read & IO_MASK(R_SERIAL0_READ, tr_ready)))
+               ;
+       *kgdb_port->write = val;
 }
 
 /* Enable irq for receiving chars on the debug port, used by kgdb */
@@ -270,46 +466,184 @@ putDebugChar(int val)
 void
 enableDebugIRQ(void)
 {
-       *R_IRQ_MASK1_SET = DEBUG_IRQ;
+       if (!kgdb_port)
+               return;
+
+       *R_IRQ_MASK1_SET = kgdb_port->irq;
        /* use R_VECT_MASK directly, since we really bypass Linux normal
         * IRQ handling in kgdb anyway, we don't need to use enable_irq
         */
        *R_VECT_MASK_SET = IO_STATE(R_VECT_MASK_SET, serial, set);
 
-       *DEBUG_REC_CTRL = IO_STATE(R_SERIAL0_REC_CTRL, rec_enable, enable);
+       *kgdb_port->rec_ctrl = IO_STATE(R_SERIAL0_REC_CTRL, rec_enable, enable);
 }
 
-static kdev_t 
-console_device(struct console *c)
+static int __init
+console_setup(struct console *co, char *options)
 {
-         return mk_kdev(TTY_MAJOR, 64 + c->index);
+       char* s;
+
+       if (options) {
+               port = &ports[co->index];
+               port->baudrate = 115200;
+                port->parity = 'N';
+                port->bits = 8;
+               port->baudrate = simple_strtoul(options, NULL, 10);
+               s = options;
+               while(*s >= '0' && *s <= '9')
+                       s++;
+               if (*s) port->parity = *s++;
+               if (*s) port->bits   = *s++ - '0';
+               port->started = 0;
+               start_port(0);
+       }
+       return 0;
 }
 
-static int __init 
-console_setup(struct console *co, char *options)
+/* This is a dummy serial device that throws away anything written to it.
+ * This is used when no debug output is wanted.
+ */
+static struct tty_driver dummy_driver;
+
+static int dummy_open(struct tty_struct *tty, struct file * filp)
 {
-        return 0;
+       return 0;
+}
+
+static void dummy_close(struct tty_struct *tty, struct file * filp)
+{
+}
+
+static int dummy_write(struct tty_struct * tty,
+                       const unsigned char *buf, int count)
+{
+       return count;
+}
+
+static int
+dummy_write_room(struct tty_struct *tty)
+{
+       return 8192;
+}
+
+void __init
+init_dummy_console(void)
+{
+       memset(&dummy_driver, 0, sizeof(struct tty_driver));
+       dummy_driver.driver_name = "serial";
+       dummy_driver.name = "ttyS";
+       dummy_driver.major = TTY_MAJOR;
+       dummy_driver.minor_start = 68;
+       dummy_driver.num = 1;       /* etrax100 has 4 serial ports */
+       dummy_driver.type = TTY_DRIVER_TYPE_SERIAL;
+       dummy_driver.subtype = SERIAL_TYPE_NORMAL;
+       dummy_driver.init_termios = tty_std_termios;
+       dummy_driver.init_termios.c_cflag =
+               B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
+       dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+
+       dummy_driver.open = dummy_open;
+       dummy_driver.close = dummy_close;
+       dummy_driver.write = dummy_write;
+       dummy_driver.write_room = dummy_write_room;
+       if (tty_register_driver(&dummy_driver))
+               panic("Couldn't register dummy serial driver\n");
+}
+
+static struct tty_driver*
+etrax_console_device(struct console* co, int *index)
+{
+       if (port)
+               *index = port->index;
+        return port ? serial_driver : &dummy_driver;
 }
 
 static struct console sercons = {
-       .name    = "ttyS",
-       .write   = console_write,
-       .read    = NULL,
-       .device  = console_device,
-       .unblank = NULL,
-       .setup   = console_setup,
-       .flags   = CON_PRINTBUFFER,
-       .index   = DEBUG_PORT_IDX,
-       .cflag   = 0,
-       .next    = NULL
+       name : "ttyS",
+       write: console_write,
+       read : NULL,
+       device : etrax_console_device,
+       unblank : NULL,
+       setup : console_setup,
+       flags : CON_PRINTBUFFER,
+       index : -1,
+       cflag : 0,
+       next : NULL
+};
+static struct console sercons0 = {
+       name : "ttyS",
+       write: console_write,
+       read : NULL,
+       device : etrax_console_device,
+       unblank : NULL,
+       setup : console_setup,
+       flags : CON_PRINTBUFFER,
+       index : 0,
+       cflag : 0,
+       next : NULL
 };
 
+static struct console sercons1 = {
+       name : "ttyS",
+       write: console_write,
+       read : NULL,
+       device : etrax_console_device,
+       unblank : NULL,
+       setup : console_setup,
+       flags : CON_PRINTBUFFER,
+       index : 1,
+       cflag : 0,
+       next : NULL
+};
+static struct console sercons2 = {
+       name : "ttyS",
+       write: console_write,
+       read : NULL,
+       device : etrax_console_device,
+       unblank : NULL,
+       setup : console_setup,
+       flags : CON_PRINTBUFFER,
+       index : 2,
+       cflag : 0,
+       next : NULL
+};
+static struct console sercons3 = {
+       name : "ttyS",
+       write: console_write,
+       read : NULL,
+       device : etrax_console_device,
+       unblank : NULL,
+       setup : console_setup,
+       flags : CON_PRINTBUFFER,
+       index : 3,
+       cflag : 0,
+       next : NULL
+};
 /*
  *      Register console (for printk's etc)
  */
 
-void __init 
+int __init
 init_etrax_debug(void)
 {
+       static int first = 1;
+
+       if (!first) {
+               unregister_console(&sercons);
+               register_console(&sercons0);
+               register_console(&sercons1);
+               register_console(&sercons2);
+               register_console(&sercons3);
+                init_dummy_console();
+               return 0;
+       }
+
+       first = 0;
        register_console(&sercons);
+       start_port(port);
+#ifdef CONFIG_ETRAX_KGDB
+       start_port(kgdb_port);
+#endif
+       return 0;
 }
+__initcall(init_etrax_debug);