X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fremote-nrom.c;h=9b6b0477fcb90e51eebfa2ce7452736f5bafcadd;hb=39f770628a4eaf018fec8d55684bf2ec16ada9cc;hp=ccd2f0de97bd9fbf4785a5013ade11109c635d53;hpb=dc9e099fc0eced486ae2b49455c9da113c11f4ff;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/remote-nrom.c b/gdb/remote-nrom.c
index ccd2f0de97..9b6b0477fc 100644
--- a/gdb/remote-nrom.c
+++ b/gdb/remote-nrom.c
@@ -1,5 +1,6 @@
 /* Remote debugging with the XLNT Designs, Inc (XDI) NetROM.
-   Copyright 1990, 1991, 1992, 1995 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1995, 1998, 1999, 2000
+   Free Software Foundation, Inc.
    Contributed by:
    Roger Moyers 
    XLNT Designs, Inc.
@@ -37,11 +38,11 @@
 #define DEFAULT_NETROM_LOAD_PORT    1236
 #define DEFAULT_NETROM_CONTROL_PORT 1237
 
-static void nrom_close PARAMS ((int quitting));
+static void nrom_close (int quitting);
 
 /* New commands.  */
 
-static void nrom_passthru PARAMS ((char *, int));
+static void nrom_passthru (char *, int);
 
 /* We talk to the NetROM over these sockets.  */
 
@@ -61,13 +62,12 @@ extern struct target_ops nrom_ops;
    don't match.  */
 
 static int
-expect (string)
-     char *string;
+expect (char *string)
 {
   char *p = string;
   int c;
 
-  immediate_quit = 1;
+  immediate_quit++;
 
   while (1)
     {
@@ -77,8 +77,7 @@ expect (string)
 	{
 	  if (*p == '\0')
 	    {
-	      immediate_quit = 0;
-
+	      immediate_quit--;
 	      return 0;
 	    }
 	}
@@ -93,15 +92,13 @@ expect (string)
 }
 
 static void
-nrom_kill ()
+nrom_kill (void)
 {
   nrom_close (0);
 }
 
 static serial_t
-open_socket (name, port)
-     char *name;
-     int port;
+open_socket (char *name, int port)
 {
   char sockname[100];
   serial_t desc;
@@ -115,7 +112,7 @@ open_socket (name, port)
 }
 
 static void
-load_cleanup ()
+load_cleanup (void)
 {
   SERIAL_CLOSE (load_desc);
   load_desc = NULL;
@@ -124,9 +121,7 @@ load_cleanup ()
 /* Download a file specified in ARGS to the netROM.  */
 
 static void
-nrom_load (args, fromtty)
-     char *args;
-     int fromtty;
+nrom_load (char *args, int fromtty)
 {
   int fd, rd_amt, fsize;
   bfd *pbfd;
@@ -210,9 +205,7 @@ nrom_load (args, fromtty)
 /* Open a connection to the remote NetROM devices.  */
 
 static void
-nrom_open (name, from_tty)
-     char *name;
-     int from_tty;
+nrom_open (char *name, int from_tty)
 {
   int errn;
 
@@ -238,8 +231,7 @@ or IP address of the NetROM device you wish to use.");
 /* Close out all files and local state before this target loses control. */
 
 static void
-nrom_close (quitting)
-     int quitting;
+nrom_close (int quitting)
 {
   if (load_desc)
     SERIAL_CLOSE (load_desc);
@@ -250,9 +242,7 @@ nrom_close (quitting)
 /* Pass arguments directly to the NetROM. */
 
 static void
-nrom_passthru (args, fromtty)
-     char *args;
-     int fromtty;
+nrom_passthru (char *args, int fromtty)
 {
   char buf[1024];
 
@@ -262,7 +252,7 @@ nrom_passthru (args, fromtty)
 }
 
 static void
-nrom_mourn ()
+nrom_mourn (void)
 {
   unpush_target (&nrom_ops);
   generic_mourn_inferior ();
@@ -327,7 +317,6 @@ init_nrom_ops (void)
   nrom_ops.to_thread_alive = 0;
   nrom_ops.to_stop = 0;
   nrom_ops.to_pid_to_exec_file = NULL;
-  nrom_ops.to_core_file_to_sym_file = NULL;
   nrom_ops.to_stratum = download_stratum;
   nrom_ops.DONT_USE = NULL;
   nrom_ops.to_has_all_memory = 1;
@@ -338,10 +327,10 @@ init_nrom_ops (void)
   nrom_ops.to_sections = NULL;
   nrom_ops.to_sections_end = NULL;
   nrom_ops.to_magic = OPS_MAGIC;
-};
+}
 
 void
-_initialize_remote_nrom ()
+_initialize_remote_nrom (void)
 {
   init_nrom_ops ();
   add_target (&nrom_ops);