2003-04-12 Andrew Cagney <cagney@redhat.com>

[binutils-gdb.git] / gdb / sh3-rom.c

diff --git a/gdb/sh3-rom.c b/gdb/sh3-rom.c
index c0f26df38a689476c65aad2363a63f2b350afca1..7d07fa53c801d4b5d9fad518afcdb791fbe5e2a7 100644 (file)
--- a/gdb/sh3-rom.c
+++ b/gdb/sh3-rom.c
@@ -27,8 +27,11 @@
 #include "srec.h"
 #include "arch-utils.h"
 #include "regcache.h"
+#include "gdb_string.h"
 
-static serial_t parallel;
+#include "sh-tdep.h"
+
+static struct serial *parallel;
 static int parallel_in_use;
 
 static void sh3_open (char *args, int from_tty);
@@ -120,7 +123,7 @@ sh3_supply_register (char *regname, int regnamelen, char *val, int vallen)
 }
 
 static void
-sh3_load (serial_t desc, char *file, int hashmark)
+sh3_load (struct serial *desc, char *file, int hashmark)
 {
   if (parallel_in_use)
     {
@@ -132,13 +135,13 @@ sh3_load (serial_t desc, char *file, int hashmark)
     {
       monitor_printf ("il;s:x\r");
       monitor_expect ("\005", NULL, 0);                /* Look for ENQ */
-      SERIAL_WRITE (desc, "\006", 1);  /* Send ACK */
+      serial_write (desc, "\006", 1);  /* Send ACK */
       monitor_expect ("LO x\r", NULL, 0);      /* Look for filename */
 
       load_srec (desc, file, 0, 80, SREC_ALL, hashmark, NULL);
 
       monitor_expect ("\005", NULL, 0);                /* Look for ENQ */
-      SERIAL_WRITE (desc, "\006", 1);  /* Send ACK */
+      serial_write (desc, "\006", 1);  /* Send ACK */
       monitor_expect_prompt (NULL, 0);
     }
 }
@@ -270,7 +273,7 @@ sh3_open (char *args, int from_tty)
 
   if (parallel_port_name)
     {
-      parallel = SERIAL_OPEN (parallel_port_name);
+      parallel = serial_open (parallel_port_name);
 
       if (!parallel)
        perror_with_name ("Unable to open parallel port.");
@@ -317,7 +320,7 @@ sh3e_open (char *args, int from_tty)
 
   if (parallel_port_name)
     {
-      parallel = SERIAL_OPEN (parallel_port_name);
+      parallel = serial_open (parallel_port_name);
 
       if (!parallel)
        perror_with_name ("Unable to open parallel port.");
@@ -335,7 +338,7 @@ sh3_close (int quitting)
   monitor_close (quitting);
   if (parallel_in_use)
     {
-      SERIAL_CLOSE (parallel);
+      serial_close (parallel);
       parallel_in_use = 0;
     }
 }