* ser-e7kpc.c: New file to support the E7000 with the PC ISA

	bus interface.
	* serial.c (serial_open): Notice device "pc".
	* remote-e7000.c: Fix copyright date.
	(expect): Compare \n and \r the same.
	(e7000_open): Allow pc as a serial port
	* sh/sh.mt: Add ser-e7kpc.
	* h8300/h8300hms.mt: Add ser-e7kpc.
	* main.c (proc_wait): Don't wait if using go32.

3 files changed, 425 insertions, 2 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 5fd93f0..8ae4173 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -251,6 +251,7 @@ rs6000-nat.c
 rs6000-pinsn.c
 rs6000-tdep.c
 saber.suppress
+ser-e7kpc.c
 ser-go32.c
 ser-tcp.c
 ser-unix.c
diff --git a/gdb/ser-e7kpc.c b/gdb/ser-e7kpc.c
new file mode 100644
index 0000000..55d96a5
--- /dev/null
+++ b/gdb/ser-e7kpc.c
@@ -0,0 +1,420 @@
+/* Remote serial interface using Hitachi E7000 PC ISA card in a PC
+
+   Copyright 1994 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   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.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+#ifdef __GO32__
+#include "defs.h"
+#include "serial.h"
+#include <sys/dos.h>
+
+
+
+static int e7000pc_open PARAMS ((serial_t scb, const char *name));
+static void e7000pc_raw PARAMS ((serial_t scb));
+static int e7000pc_readchar PARAMS ((serial_t scb, int timeout));
+static int e7000pc_setbaudrate PARAMS ((serial_t scb, int rate));
+static int e7000pc_write PARAMS ((serial_t scb, const char *str, int len));
+static void e7000pc_close PARAMS ((serial_t scb));
+static serial_ttystate e7000pc_get_tty_state PARAMS ((serial_t scb));
+static int e7000pc_set_tty_state PARAMS ((serial_t scb, serial_ttystate state));
+static char *aptr PARAMS ((short p));
+
+static int dos_async_init PARAMS ((int port));
+static void dos_async_tx PARAMS ((const char c));
+static int dos_async_rx PARAMS (());
+
+
+
+#define OFF_DPD 	0x0000
+#define OFF_DDP 	0x1000
+#define OFF_CPD 	0x2000
+#define OFF_CDP 	0x2400
+#define OFF_FA  	0x3000
+#define OFF_FB  	0x3002
+#define OFF_FC  	0x3004
+#define OFF_IRQTOD	0x3008
+#define OFF_IRQTOP 	0x300a
+#define OFF_READY  	0x300c
+#define OFF_PON    	0x300e
+
+#define IDLE       0x0000           
+#define CMD_CI     0x4349           
+#define CMD_CO     0x434f           
+#define CMD_LO     0x4c4f           
+#define CMD_LS     0x4c53           
+#define CMD_SV     0x5356           
+#define CMD_SS     0x5353           
+#define CMD_OK     0x4f4b           
+#define CMD_ER     0x4552           
+#define CMD_NF     0x4e46           
+#define CMD_AB     0x4142           
+#define CMD_ED     0x4544           
+#define CMD_CE     0x4345           
+
+static unsigned long fa;
+static unsigned long irqtod;
+static unsigned long ready;
+static unsigned long fb;
+static unsigned long cpd ;
+static unsigned long cdp ;
+static unsigned long ready;
+static unsigned long pon;
+static unsigned long irqtop;
+static unsigned long board_at;
+
+#define SET_BYTE(x,y)   { char _buf = y;dosmemput(&_buf,1, x);}
+#define SET_WORD(x,y)   { short _buf = y;dosmemput(&_buf,2, x);}
+#define GET_BYTE(x)     ( dosmemget(x,1,&bb), bb)
+#define GET_WORD(x)     ( dosmemget(x,2,&sb), sb)
+
+static unsigned char bb;
+static unsigned short sb;
+
+
+static struct sw 
+{
+  int sw;
+  int addr;
+} sigs[] = {
+  {0x14, 0xd0000},
+  {0x15, 0xd4000},
+  {0x16, 0xd8000},
+  {0x17, 0xdc000},
+  0};
+
+static int
+e7000pc_init ()
+{
+  /* Look around in memory for the board's signature */
+
+  int try;
+  
+  for (try = 0; sigs[try].sw; try++)
+
+    {
+      int val;
+      board_at = sigs[try].addr;
+      fa = board_at + OFF_FA;
+      fb = board_at + OFF_FB;
+      cpd = board_at + OFF_CPD;
+      cdp = board_at + OFF_CDP;
+      ready =board_at + OFF_READY;
+      pon = board_at + OFF_PON;	      
+      irqtop = board_at + OFF_IRQTOP;
+      irqtod = board_at + OFF_IRQTOD;
+      
+      val = GET_WORD (ready);
+
+      if (val == (0xaaa0  | sigs[try].sw))
+	{
+	  if (GET_BYTE (pon) & 0xf)
+	    {
+	      SET_BYTE(fa, 0);
+	      SET_BYTE (fb, 0);
+
+	      SET_BYTE (irqtop, 1); /* Disable interrupts from e7000 */
+	      SET_WORD (ready, 1);
+	      printf_filtered ("\nConnected to the E7000PC at address 0x%x\n", 
+			       sigs[try].addr);
+	      return 1;	      
+	    }
+	  error ("The E7000 PC board is working, but the E7000 is turned off.\n");
+	  return 0;
+	}
+    }
+
+  error ("GDB cannot connect to the E7000 PC board, check that it is installed\n\
+and that the switch settings are correct.  Some other DOS programs can \n\
+stop the board from working.  Try starting from a very minimal boot, \n\
+perhaps you need to disable EMM386 over the region where the board has\n\
+its I/O space, remove other unneeded cards, etc etc\n");
+  return 0;
+
+}
+
+static int pbuf_size;
+static int pbuf_index;
+
+static 
+int 
+e7000_get ()
+{
+  static char pbuf[1000];
+  char tmp[1000];
+  int x;
+  if (pbuf_index < pbuf_size) 
+    {
+      x = pbuf[pbuf_index++];
+    }
+  else if ((GET_BYTE (fb)  & 1))
+    {
+      int i;
+      pbuf_size = GET_WORD(cdp + 2);
+
+      dosmemget (cdp + 8, pbuf_size + 1, tmp);
+
+      /* Tell the E7000 we've eaten */
+      SET_BYTE(fb,0);	
+      /* Swap it around */
+      for (i = 0; i < pbuf_size; i++) 
+	{
+	  pbuf[i] = tmp[i^1];
+	}
+      pbuf_index = 0;
+      x =  pbuf[pbuf_index++];
+    }
+  else 
+    { 
+      x = -1;
+    }
+  return x;
+}
+
+static int
+dosasync_read (fd, buf, len, timeout)
+     int fd;
+     char *buf;
+     int len;
+     int timeout;
+
+{
+  long now;
+  long then;
+  int i = 0;
+  int p;
+
+  /* Then look for some more if we're still hungry */
+  time (&now);
+  then = now + timeout;
+  while (i < len)
+    {
+      int ch = e7000_get();
+      
+      /* While there's room in the buffer, and we've already
+	 read the stuff in, suck it over */
+      if (ch != -1) 
+	{
+	  buf[i++] = ch;
+	  while (i < len && pbuf_index < pbuf_size )
+	    {
+	      ch = e7000_get();
+	      if (ch == -1)
+		break;
+	      buf[i++] = ch;
+	    }
+	}
+
+      time (&now);
+
+      if (timeout == 0)
+	return i;
+      if (now >= then && timeout > 0)
+	{
+	  return i;
+	}
+    }
+  return len;
+}
+
+
+static int
+dosasync_write (fd, buf, len)
+     int fd;
+     const char *buf;
+     int len;
+{
+  int i;
+  char dummy[1000];  
+
+  
+  /* Construct copy locally */
+  ((short *)dummy)[0] = CMD_CI;
+  ((short *)dummy)[1] = len;
+  ((short *)dummy)[2] = 0;
+  ((short *)dummy)[3] = 0;
+  for (i = 0; i < len ; i++) 
+    {
+      dummy[8 + i ^ 1] = buf[i];
+    }
+
+  /* Wait for the card to get ready */
+  while ((GET_BYTE(fa) & 1) != 0)
+    ;
+
+  /* Blast onto the ISA card */
+  dosmemput (dummy, 8 + len + 1,  cpd);
+
+  SET_BYTE(fa, 1);
+  SET_BYTE(irqtod, 1); /* Interrupt the E7000 */
+
+  return len;
+}
+
+static int
+e7000pc_open (scb, name)
+     serial_t scb;
+     const char *name;
+{
+  if (strncasecmp (name, "pc", 2) != 0)
+    {
+      errno = ENOENT;
+      return -1;
+    }
+
+  scb->fd = e7000pc_init ();
+
+  if (!scb->fd)
+    return -1;
+
+  return 0;
+}
+
+static int
+e7000pc_noop (scb)
+     serial_t scb;
+{
+  return 0;
+}
+
+static void
+e7000pc_raw (scb)
+     serial_t scb;
+{
+  /* Always in raw mode */
+}
+
+static int
+e7000pc_readchar (scb, timeout)
+     serial_t scb;
+     int timeout;
+{
+  char buf;
+
+ top:
+
+  if (dosasync_read (scb->fd, &buf, 1, timeout))
+    {
+      if (buf == 0) goto top;
+      return buf;
+    }
+  else
+    return SERIAL_TIMEOUT;
+}
+
+struct e7000pc_ttystate {
+  int dummy;
+};
+
+/* e7000pc_{get set}_tty_state() are both dummys to fill out the function
+   vector.  Someday, they may do something real... */
+
+static serial_ttystate
+e7000pc_get_tty_state (scb)
+     serial_t scb;
+{
+  struct e7000pc_ttystate *state;
+
+  state = (struct e7000pc_ttystate *) xmalloc (sizeof *state);
+
+  return (serial_ttystate) state;
+}
+
+static int
+e7000pc_set_tty_state (scb, ttystate)
+     serial_t scb;
+     serial_ttystate ttystate;
+{
+  return 0;
+}
+
+static int
+e7000pc_noflush_set_tty_state (scb, new_ttystate, old_ttystate)
+     serial_t scb;
+     serial_ttystate new_ttystate;
+     serial_ttystate old_ttystate;
+{
+  return 0;
+}
+
+static void
+e7000pc_print_tty_state (scb, ttystate)
+     serial_t scb;
+     serial_ttystate ttystate;
+{
+  /* Nothing to print.  */
+  return;
+}
+
+static int
+e7000pc_setbaudrate (scb, rate)
+     serial_t scb;
+     int rate;
+{
+  return 0;
+}
+
+static int
+e7000pc_write (scb, str, len)
+     serial_t scb;
+     const char *str;
+     int len;
+{
+  dosasync_write (scb->fd, str, len);
+
+  return 0;
+}
+
+static void
+e7000pc_close (scb)
+     serial_t scb;
+{
+}
+
+static struct serial_ops e7000pc_ops =
+{
+  "pc",
+  0,
+  e7000pc_open,
+  e7000pc_close,
+  e7000pc_readchar,
+  e7000pc_write,
+  e7000pc_noop,			/* flush output */
+  e7000pc_noop,			/* flush input */
+  e7000pc_noop,			/* send break -- currently used only for nindy */
+  e7000pc_raw,
+  e7000pc_get_tty_state,
+  e7000pc_set_tty_state,
+  e7000pc_print_tty_state,
+  e7000pc_noflush_set_tty_state,
+  e7000pc_setbaudrate,
+};
+
+void
+_initialize_ser_e7000pc ()
+{
+  serial_add_interface (&e7000pc_ops);
+}
+#else
+
+void
+_initialize_ser_e7000pc ()
+{
+
+}
+#endif
diff --git a/gdb/serial.c b/gdb/serial.c
index be4aa65..631f0f3 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -52,13 +52,15 @@ serial_add_interface(optable)
 /* Open up a device or a network socket, depending upon the syntax of NAME. */
 
 serial_t
-serial_open(name)
+serial_open (name)
      const char *name;
 {
   serial_t scb;
   struct serial_ops *ops;
 
-  if (strchr (name, ':'))
+  if (strcmp (name, "pc") == 0)
+    ops = serial_interface_lookup ("pc");
+  else if (strchr (name, ':'))
     ops = serial_interface_lookup ("tcp");
   else
     ops = serial_interface_lookup ("hardwire");