PARAMS removal.

[binutils.git] / gdb / ser-mac.c

diff --git a/gdb/ser-mac.c b/gdb/ser-mac.c
index 250375ac7aca1425abe58fad2e481fcfc6c430ad..e5d34b6787e28f853ed7cf58a7d9fb2843cf76b3 100644 (file)
--- a/gdb/ser-mac.c
+++ b/gdb/ser-mac.c
@@ -1,5 +1,5 @@
 /* Remote serial interface for local (hardwired) serial ports for Macintosh.
-   Copyright 1994 Free Software Foundation, Inc.
+   Copyright 1994, 2000 Free Software Foundation, Inc.
    Contributed by Cygnus Support.  Written by Stan Shebs.
 
    This file is part of GDB.
@@ -16,7 +16,8 @@
 
    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.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 #include "serial.h"
@@ -34,15 +35,15 @@ struct mac_ttystate
     int bogus;
   };
 
-static int mac_open PARAMS ((serial_t scb, const char *name));
-static void mac_raw PARAMS ((serial_t scb));
-static int mac_readchar PARAMS ((serial_t scb, int timeout));
-static int mac_setbaudrate PARAMS ((serial_t scb, int rate));
-static int mac_write PARAMS ((serial_t scb, const char *str, int len));
-static void mac_close PARAMS ((serial_t scb));
-static serial_ttystate mac_get_tty_state PARAMS ((serial_t scb));
-static int mac_set_tty_state PARAMS ((serial_t scb, serial_ttystate state));
-static char *aptr PARAMS ((short p));
+static int mac_open (serial_t scb, const char *name);
+static void mac_raw (serial_t scb);
+static int mac_readchar (serial_t scb, int timeout);
+static int mac_setbaudrate (serial_t scb, int rate);
+static int mac_write (serial_t scb, const char *str, int len);
+static void mac_close (serial_t scb);
+static serial_ttystate mac_get_tty_state (serial_t scb);
+static int mac_set_tty_state (serial_t scb, serial_ttystate state);
+static char *aptr (short p);
 
 short input_refnum;
 short output_refnum;
@@ -60,7 +61,7 @@ mac_open (scb, name)
   /* Alloc buffer space first - that way any allocation failures are
      intercepted before the serial driver gets involved. */
   if (mac_input_buffer == NULL)
-    mac_input_buffer = (char *) xmalloc (256);
+    mac_input_buffer = (char *) xmalloc (4096);
   /* Match on a name and open a port. */
   if (strcmp (name, "modem") == 0)
     {
@@ -100,11 +101,11 @@ mac_open (scb, name)
       return (-1);
     }
   /* We got something open. */
-  if (1 /* using custom buffer */)
-    SerSetBuf (input_refnum, mac_input_buffer, 256);
+  if (1 /* using custom buffer */ )
+    SerSetBuf (input_refnum, mac_input_buffer, 4096);
   /* Set to a GDB-preferred state. */
-  SerReset (input_refnum,  stop10|noParity|data8|baud9600);
-  SerReset (output_refnum, stop10|noParity|data8|baud9600);
+  SerReset (input_refnum, stop10 | noParity | data8 | baud9600);
+  SerReset (output_refnum, stop10 | noParity | data8 | baud9600);
   {
     CntrlParam cb;
     struct SerShk *handshake;
@@ -120,7 +121,7 @@ mac_open (scb, name)
     handshake->evts = 0;
     handshake->fInX = 0;
     handshake->fDTR = 0;
-    err = PBControl ((ParmBlkPtr) &cb, 0);
+    err = PBControl ((ParmBlkPtr) & cb, 0);
     if (err < 0)
       return (-1);
   }
@@ -168,7 +169,7 @@ mac_readchar (scb, timeout)
     {
       cb.ioCRefNum = input_refnum;
       cb.csCode = 2;
-      err = PBStatus ((ParmBlkPtr) &cb, 0);
+      err = PBStatus ((ParmBlkPtr) & cb, 0);
       if (err < 0)
        return SERIAL_ERROR;
       n = *((long *) &cb.csParam[0]);
@@ -177,7 +178,7 @@ mac_readchar (scb, timeout)
          pb.ioRefNum = input_refnum;
          pb.ioBuffer = (Ptr) (scb->buf);
          pb.ioReqCount = (n > 64 ? 64 : n);
-         err = PBRead ((ParmBlkPtr) &pb, 0);
+         err = PBRead ((ParmBlkPtr) & pb, 0);
          if (err < 0)
            return SERIAL_ERROR;
          scb->bufcnt = pb.ioReqCount;
@@ -231,9 +232,9 @@ mac_noflush_set_tty_state (scb, new_ttystate, old_ttystate)
 }
 
 static void
-mac_print_tty_state (scb, ttystate)
-     serial_t scb;
-     serial_ttystate ttystate;
+mac_print_tty_state (serial_t scb,
+                    serial_ttystate ttystate,
+                    struct ui_file *stream)
 {
   /* Nothing to print.  */
   return;
@@ -243,23 +244,64 @@ mac_print_tty_state (scb, ttystate)
    to what the serial driver wants, we should use it.  Until
    we get one, this table will have to do.  */
 
-static struct {
+static struct
+{
   int real_rate;
   int bits;
-} mac_baud_rate_table[] = {
-  { 57600, baud57600 },
-  { 38400, 2 /* ??? */ },
-  { 19200, baud19200 },
-  { 9600, baud9600 },
-  { 7200, baud7200 },
-  { 4800, baud4800 },
-  { 3600, baud3600 },
-  { 2400, baud2400 },
-  { 1800, baud1800 },
-  { 1200, baud1200 },
-  { 600, baud600 },
-  { 300, baud300 },
-  { 0, 0 }
+}
+mac_baud_rate_table[] =
+{
+  {
+    57600, baud57600
+  }
+  ,
+  {
+    38400, 1
+  }
+  ,
+  {
+    19200, baud19200
+  }
+  ,
+  {
+    9600, baud9600
+  }
+  ,
+  {
+    7200, baud7200
+  }
+  ,
+  {
+    4800, baud4800
+  }
+  ,
+  {
+    3600, baud3600
+  }
+  ,
+  {
+    2400, baud2400
+  }
+  ,
+  {
+    1800, baud1800
+  }
+  ,
+  {
+    1200, baud1200
+  }
+  ,
+  {
+    600, baud600
+  }
+  ,
+  {
+    300, baud300
+  }
+  ,
+  {
+    0, 0
+  }
 };
 
 static int
@@ -277,8 +319,8 @@ mac_set_baud_rate (scb, rate)
          break;
        }
     }
-  SerReset (input_refnum,  stop10|noParity|data8|bits);
-  SerReset (output_refnum, stop10|noParity|data8|bits);
+  SerReset (input_refnum, stop10 | noParity | data8 | bits);
+  SerReset (output_refnum, stop10 | noParity | data8 | bits);
 }
 
 static int
@@ -307,7 +349,7 @@ mac_write (scb, str, len)
   pb.ioRefNum = output_refnum;
   pb.ioBuffer = (Ptr) str;
   pb.ioReqCount = len;
-  err = PBWrite ((ParmBlkPtr) &pb, 0);
+  err = PBWrite ((ParmBlkPtr) & pb, 0);
   if (err < 0)
     {
       return 1;
@@ -320,15 +362,15 @@ mac_close (serial_t scb)
 {
   if (input_refnum)
     {
-      if (1 /* custom buffer */)
+      if (1 /* custom buffer */ )
        SerSetBuf (input_refnum, mac_input_buffer, 0);
       CloseDriver (input_refnum);
       input_refnum = 0;
     }
   if (output_refnum)
     {
-      if (0 /* custom buffer */)
-       SetSetBuf (input_refnum, mac_output_buffer, 0);
+      if (0 /* custom buffer */ )
+       SerSetBuf (input_refnum, mac_output_buffer, 0);
       CloseDriver (output_refnum);
       output_refnum = 0;
     }
@@ -352,6 +394,7 @@ static struct serial_ops mac_ops =
   mac_noflush_set_tty_state,
   mac_set_baud_rate,
   mac_set_stop_bits,
+  mac_noop,                    /* wait for output to drain */
 };
 
 void