If serial debugging in the boot monitor / kernel is enabled, don't touch

the serial line in use for it (mostly so that input isn't eaten by tty).

diff --git a/drivers/tty/rs232.c b/drivers/tty/rs232.c
index 8bc70599fe9c81910b883df5ecce2e9b3bd1123b..aed377b251d1288c8161228d6ddbc31ff97aba53 100644 (file)
--- a/drivers/tty/rs232.c
+++ b/drivers/tty/rs232.c
@@ -445,9 +445,19 @@ tty_t *tp;                 /* which TTY */
   int line;
   port_t this_8250;
   int irq;
+  char l[10];
 
   /* Associate RS232 and TTY structures. */
   line = tp - &tty_table[NR_CONS];
+
+  /* See if kernel debugging is enabled; if so, don't initialize this
+   * serial line, making tty not look at the irq and returning ENXIO
+   * for all requests on it from userland. (The kernel will use it.)
+   */
+  if(env_get_param(SERVARNAME, l, sizeof(l)-1) == OK && atoi(l) == line) {
+     return;
+  }
+
   rs = tp->tty_priv = &rs_lines[line];
   rs->tty = tp;