From a196c81c19ca89cbd11439a7174546c4b7849671 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 28 Jun 2001 03:33:26 +0000 Subject: [PATCH] Exterminate ser-ocd.c. --- gdb/ChangeLog | 8 ++ gdb/Makefile.in | 4 +- gdb/NEWS | 3 +- gdb/TODO | 4 - gdb/config/powerpc/ppc-eabi.mt | 2 +- gdb/config/powerpc/ppc-sim.mt | 2 +- gdb/config/powerpc/ppcle-eabi.mt | 2 +- gdb/config/powerpc/ppcle-sim.mt | 2 +- gdb/ser-ocd.c | 186 ------------------------------- 9 files changed, 15 insertions(+), 198 deletions(-) delete mode 100644 gdb/ser-ocd.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1c9abd6cda..d8c68c150eb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2001-06-27 Andrew Cagney + + * ser-ocd.c: Delete file. + * Makefile.in (ALLDEPFILES): Remove ser-ocd.c + (ser-ocd.o): Delete target. + * TODO: Update. + * NEWS: Update. + 2001-06-27 Andrew Cagney * MAINTAINERS (Write After Approval): Sort. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 180a67282b7..46bd68d6c76 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1173,7 +1173,7 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \ remote-st.c remote-utils.c dcache.c \ remote-udi.c remote-vx.c remote-vx29k.c \ rs6000-nat.c rs6000-tdep.c \ - ser-go32.c ser-pipe.c ser-ocd.c ser-tcp.c \ + ser-go32.c ser-pipe.c ser-tcp.c \ sh-tdep.c solib.c sparc-nat.c \ sparc-tdep.c sparcl-tdep.c sun3-nat.c \ symm-tdep.c symm-nat.c \ @@ -1937,8 +1937,6 @@ ser-go32.o: ser-go32.c $(defs_h) serial.h ser-mac.o: ser-mac.c $(defs_h) serial.h -ser-ocd.o: ser-ocd.c $(defs_h) serial.h $(gdb_string_h) - ser-pipe.o: ser-pipe.c $(defs_h) serial.h $(gdb_string_h) ser-unix.h ser-tcp.o: ser-tcp.c $(defs_h) serial.h $(gdb_string_h) ser-unix.h diff --git a/gdb/NEWS b/gdb/NEWS index 30ebc30440e..e1d2e0dc25e 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -37,13 +37,14 @@ been commented out. Unless there is activity to revive these configurations, the next release of GDB will have their sources permanently REMOVED. -* REMOVED configurations +* REMOVED configurations and files Altos 3068 m68*-altos-* Convex c1-*-*, c2-*-* Pyramid pyramid-*-* ARM RISCix arm-*-* (as host) Tahoe tahoe-*-* +ser-ocd.c *-*-* * Other news: diff --git a/gdb/TODO b/gdb/TODO index 6c83f79083c..2b7a46b98ca 100644 --- a/gdb/TODO +++ b/gdb/TODO @@ -26,10 +26,6 @@ and most likely also: -- -Obsolete ser-ocd.c. - --- - Wow, three bug reports for the same problem in one day! We should probably make fixing this a real priority :-). diff --git a/gdb/config/powerpc/ppc-eabi.mt b/gdb/config/powerpc/ppc-eabi.mt index a142c86dc5b..2751e1d0baf 100644 --- a/gdb/config/powerpc/ppc-eabi.mt +++ b/gdb/config/powerpc/ppc-eabi.mt @@ -1,3 +1,3 @@ # Target: PowerPC running eabi -TDEPFILES= ser-ocd.o rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-linux-tdep.o +TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-linux-tdep.o TM_FILE= tm-ppc-eabi.h diff --git a/gdb/config/powerpc/ppc-sim.mt b/gdb/config/powerpc/ppc-sim.mt index a798d10a64d..a647cadd9d7 100644 --- a/gdb/config/powerpc/ppc-sim.mt +++ b/gdb/config/powerpc/ppc-sim.mt @@ -1,5 +1,5 @@ # Target: PowerPC running eabi and including the simulator -TDEPFILES= ser-ocd.o rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-linux-tdep.o +TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-linux-tdep.o TM_FILE= tm-ppc-eabi.h SIM_OBS = remote-sim.o diff --git a/gdb/config/powerpc/ppcle-eabi.mt b/gdb/config/powerpc/ppcle-eabi.mt index 6de3f1d98fd..202c6b1c8f0 100644 --- a/gdb/config/powerpc/ppcle-eabi.mt +++ b/gdb/config/powerpc/ppcle-eabi.mt @@ -1,3 +1,3 @@ # Target: PowerPC running eabi in little endian mode -TDEPFILES= ser-ocd.o rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o ppc-bdm.o ocd.o ppc-linux-tdep.o +TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o ppc-bdm.o ocd.o ppc-linux-tdep.o TM_FILE= tm-ppcle-eabi.h diff --git a/gdb/config/powerpc/ppcle-sim.mt b/gdb/config/powerpc/ppcle-sim.mt index 401a809586f..e3be0d8d4f4 100644 --- a/gdb/config/powerpc/ppcle-sim.mt +++ b/gdb/config/powerpc/ppcle-sim.mt @@ -1,5 +1,5 @@ # Target: PowerPC running eabi in little endian mode under the simulator -TDEPFILES= ser-ocd.o rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o ppc-bdm.o ocd.o ppc-linux-tdep.o +TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o ppc-bdm.o ocd.o ppc-linux-tdep.o TM_FILE= tm-ppcle-eabi.h SIM_OBS = remote-sim.o diff --git a/gdb/ser-ocd.c b/gdb/ser-ocd.c deleted file mode 100644 index 88ba1d1fedf..00000000000 --- a/gdb/ser-ocd.c +++ /dev/null @@ -1,186 +0,0 @@ -/* Remote serial interface for Macraigor Systems implementation of - On-Chip Debugging using serial target box or serial wiggler - - Copyright 1994, 1997, 1998, 1999, 2000, 2001 - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include "defs.h" -#include "serial.h" - -#ifdef _WIN32 -#include -#endif - -#ifdef _WIN32 -/* On Windows, this function pointer is initialized to a function in - the wiggler DLL. */ -static int (*dll_do_command) (const char *, char *); -#endif - -static int -ocd_open (serial_t scb, const char *name) -{ -#ifdef _WIN32 - /* Find the wiggler DLL which talks to the board. */ - if (dll_do_command == NULL) - { - HINSTANCE handle; - - /* FIXME: Should the user be able to configure this? */ - handle = LoadLibrary ("Wigglers.dll"); - if (handle == NULL) - error ("Can't load Wigglers.dll"); - - dll_do_command = ((int (*) (const char *, char *)) - GetProcAddress (handle, "do_command")); - if (dll_do_command == NULL) - error ("Can't find do_command function in Wigglers.dll"); - } -#else - /* No wiggler DLLs on Unix yet, fail. */ - error ("Wiggler library not available for this type of host."); -#endif /* _WIN32 */ - return 0; -} - -static int -ocd_noop (serial_t scb) -{ - return 0; -} - -static void -ocd_raw (serial_t scb) -{ - /* Always in raw mode */ -} - -/* We need a buffer to store responses from the Wigglers.dll */ -#define WIGGLER_BUFF_SIZE 512 -unsigned char from_wiggler_buffer[WIGGLER_BUFF_SIZE]; -unsigned char *wiggler_buffer_ptr; /* curr spot in buffer */ - -static int -ocd_readchar (serial_t scb, int timeout) -{ - /* Catch attempts at reading past the end of the buffer */ - if (wiggler_buffer_ptr > - (from_wiggler_buffer + (sizeof (char *) * WIGGLER_BUFF_SIZE))) - error ("ocd_readchar asked to read past the end of the buffer!"); - - return (int) *wiggler_buffer_ptr++; /* return curr char and increment ptr */ -} - -struct ocd_ttystate -{ - int dummy; -}; - -/* ocd_{get set}_tty_state() are both dummys to fill out the function - vector. Someday, they may do something real... */ - -static serial_ttystate -ocd_get_tty_state (serial_t scb) -{ - struct ocd_ttystate *state; - - state = (struct ocd_ttystate *) xmalloc (sizeof *state); - - return (serial_ttystate) state; -} - -static int -ocd_set_tty_state (serial_t scb, serial_ttystate ttystate) -{ - return 0; -} - -static int -ocd_noflush_set_tty_state (serial_t scb, serial_ttystate new_ttystate, - serial_ttystate old_ttystate) -{ - return 0; -} - -static void -ocd_print_tty_state (serial_t scb, - serial_ttystate ttystate, - struct ui_file *stream) -{ - /* Nothing to print. */ - return; -} - -static int -ocd_setbaudrate (serial_t scb, int rate) -{ - return 0; -} - -static int -ocd_setstopbits (serial_t scb, int rate) -{ - return 0; -} - -static int -ocd_write (serial_t scb, const char *str, int len) -{ -#ifdef _WIN32 - /* send packet to Wigglers.dll and store response so we can give it to - remote-wiggler.c when get_packet is run */ - dll_do_command (str, from_wiggler_buffer); - wiggler_buffer_ptr = from_wiggler_buffer; -#endif - - return 0; -} - -static void -ocd_close (serial_t scb) -{ -} - -static struct serial_ops ocd_ops = -{ - "ocd", - 0, - ocd_open, - ocd_close, - ocd_readchar, - ocd_write, - ocd_noop, /* flush output */ - ocd_noop, /* flush input */ - ocd_noop, /* send break -- currently used only for nindy */ - ocd_raw, - ocd_get_tty_state, - ocd_set_tty_state, - ocd_print_tty_state, - ocd_noflush_set_tty_state, - ocd_setbaudrate, - ocd_setstopbits, - ocd_noop, /* wait for output to drain */ -}; - -void -_initialize_ser_ocd_bdm (void) -{ - serial_add_interface (&ocd_ops); -} -- 2.30.2