* ocd.c (ocd_open): Do not try to open the "ocd" device.

* serial.c (serial_open): Delete check for "ocd".
Fix PR gdb/349.

3 files changed, 8 insertions, 26 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4220695f73e..71268f3118a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2002-02-23  Andrew Cagney  <ac131313@redhat.com>
 
+	* ocd.c (ocd_open): Do not try to open the "ocd" device.
+	* serial.c (serial_open): Delete check for "ocd".
+	Fix PR gdb/349.
+
 	* Makefile.in (linux-thread.o): Delete target.
 	* linux-thread.c: Delete file.
 
diff --git a/gdb/ocd.c b/gdb/ocd.c
index 3364a912e76..6834eea648f 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -291,29 +291,9 @@ device the OCD device is attached to (e.g. /dev/ttya).");
 
   unpush_target (current_ops);
 
-  if (strncmp (name, "wiggler", 7) == 0)
-    {
-      ocd_desc = serial_open ("ocd");
-      if (!ocd_desc)
-	perror_with_name (name);
-
-      buf[0] = OCD_LOG_FILE;
-      buf[1] = 1;		/* open new or overwrite existing WIGGLERS.LOG */
-      ocd_put_packet (buf, 2);
-      p = ocd_get_packet (buf[0], &pktlen, remote_timeout);
-
-      buf[0] = OCD_SET_CONNECTION;
-      buf[1] = 0x01;		/* atoi (name[11]); */
-      ocd_put_packet (buf, 2);
-      p = ocd_get_packet (buf[0], &pktlen, remote_timeout);
-    }
-  else
-    /* not using Wigglers.dll */
-    {
-      ocd_desc = serial_open (name);
-      if (!ocd_desc)
-	perror_with_name (name);
-    }
+  ocd_desc = serial_open (name);
+  if (!ocd_desc)
+    perror_with_name (name);
 
   if (baud_rate != -1)
     {
diff --git a/gdb/serial.c b/gdb/serial.c
index 0e349f78af4..22964eb3f98 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -185,9 +185,7 @@ serial_open (const char *name)
 	return scb;
       }
 
-  if (strcmp (name, "ocd") == 0)
-    ops = serial_interface_lookup ("ocd");
-  else if (strcmp (name, "pc") == 0)
+  if (strcmp (name, "pc") == 0)
     ops = serial_interface_lookup ("pc");
   else if (strchr (name, ':'))
     ops = serial_interface_lookup ("tcp");