2003-11-22 Andrew Cagney <cagney@redhat.com>

[deliverable/binutils-gdb.git] / gdb / xmodem.c

diff --git a/gdb/xmodem.c b/gdb/xmodem.c
index 1ed9138f9c6dc5cc7324eb817924ffc36b372b59..7b8d77d105521673543c5779f98fc256b4199933 100644 (file)
--- a/gdb/xmodem.c
+++ b/gdb/xmodem.c
@@ -36,11 +36,11 @@ static int blknum;          /* XMODEM block number */
 static int crcflag;            /* Sez we are using CRC's instead of cksums */
 
 static int
-readchar (serial_t desc, int timeout)
+readchar (struct serial *desc, int timeout)
 {
   int c;
 
-  c = SERIAL_READCHAR (desc, timeout);
+  c = serial_readchar (desc, timeout);
 
   if (remote_debug > 0)
     fputc_unfiltered (c, gdb_stdlog);
@@ -109,7 +109,7 @@ docrc (unsigned char *p, int len)
    send NAK or CRC request.  */
 
 int
-xmodem_init_xfer (serial_t desc)
+xmodem_init_xfer (struct serial *desc)
 {
   int c;
   int i;
@@ -160,7 +160,7 @@ xmodem_init_xfer (serial_t desc)
  */
 
 void
-xmodem_send_packet (serial_t desc, unsigned char *packet, int len, int hashmark)
+xmodem_send_packet (struct serial *desc, unsigned char *packet, int len, int hashmark)
 {
   int i;
   int retries;
@@ -217,7 +217,7 @@ xmodem_send_packet (serial_t desc, unsigned char *packet, int len, int hashmark)
     {
       int c;
 
-      SERIAL_WRITE (desc, packet, pktlen);
+      serial_write (desc, packet, pktlen);
 
       c = readchar (desc, 3);
       switch (c)
@@ -238,7 +238,7 @@ xmodem_send_packet (serial_t desc, unsigned char *packet, int len, int hashmark)
        }
     }
 
-  SERIAL_WRITE (desc, "\004", 1);      /* Send an EOT */
+  serial_write (desc, "\004", 1);      /* Send an EOT */
 
   error ("xmodem_send_packet:  Excessive retries.");
 }
@@ -246,7 +246,7 @@ xmodem_send_packet (serial_t desc, unsigned char *packet, int len, int hashmark)
 /* Finish off the transfer.  Send out the EOT, and wait for an ACK.  */
 
 void
-xmodem_finish_xfer (serial_t desc)
+xmodem_finish_xfer (struct serial *desc)
 {
   int retries;
 
@@ -254,7 +254,7 @@ xmodem_finish_xfer (serial_t desc)
     {
       int c;
 
-      SERIAL_WRITE (desc, "\004", 1);  /* Send an EOT */
+      serial_write (desc, "\004", 1);  /* Send an EOT */
 
       c = readchar (desc, 3);
       switch (c)