projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* serial.h (SERIAL_ASYNC): Delete.
[binutils-gdb.git]
/
gdb
/
serial.c
diff --git
a/gdb/serial.c
b/gdb/serial.c
index 01c15c6da892e5f910c86fd923604f1fa08e6022..3442a4bd79fca587d649f23e68e95cc5056f5950 100644
(file)
--- a/
gdb/serial.c
+++ b/
gdb/serial.c
@@
-1,5
+1,7
@@
/* Generic serial interface routines
/* Generic serial interface routines
- Copyright 1992, 1993, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+
+ Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-36,11
+38,11
@@
static struct serial_ops *serial_ops_list = NULL;
/* This is the last serial stream opened. Used by connect command. */
/* This is the last serial stream opened. Used by connect command. */
-static s
erial_t
last_serial_opened = NULL;
+static s
truct serial *
last_serial_opened = NULL;
/* Pointer to list of scb's. */
/* Pointer to list of scb's. */
-static s
erial_t
scb_base;
+static s
truct serial *
scb_base;
/* Non-NULL gives filename which contains a recording of the remote session,
suitable for playback by gdbserver. */
/* Non-NULL gives filename which contains a recording of the remote session,
suitable for playback by gdbserver. */
@@
-56,8
+58,10
@@
static const char logbase_ascii[] = "ascii";
static const char *logbase_enums[] =
{logbase_hex, logbase_octal, logbase_ascii, NULL};
static const char *serial_logbase = logbase_ascii;
static const char *logbase_enums[] =
{logbase_hex, logbase_octal, logbase_ascii, NULL};
static const char *serial_logbase = logbase_ascii;
-
\f
+#undef XMALLOC
+#define XMALLOC(TYPE) ((TYPE*) xmalloc (sizeof (TYPE)))
+
\f
static int serial_current_type = 0;
static int serial_current_type = 0;
@@
-167,10
+171,10
@@
serial_add_interface (struct serial_ops *optable)
/* Open up a device or a network socket, depending upon the syntax of NAME. */
/* Open up a device or a network socket, depending upon the syntax of NAME. */
-s
erial_t
+s
truct serial *
serial_open (const char *name)
{
serial_open (const char *name)
{
- s
erial_t
scb;
+ s
truct serial *
scb;
struct serial_ops *ops;
const char *open_name = name;
struct serial_ops *ops;
const char *open_name = name;
@@
-200,7
+204,7
@@
serial_open (const char *name)
if (!ops)
return NULL;
if (!ops)
return NULL;
- scb =
(serial_t) xmalloc (sizeof (struct _serial_t)
);
+ scb =
XMALLOC (struct serial
);
scb->ops = ops;
scb->ops = ops;
@@
-213,7
+217,7
@@
serial_open (const char *name)
return NULL;
}
return NULL;
}
- scb->name =
strsave
(name);
+ scb->name =
xstrdup
(name);
scb->next = scb_base;
scb->refcnt = 1;
scb->debug_p = 0;
scb->next = scb_base;
scb->refcnt = 1;
scb->debug_p = 0;
@@
-234,10
+238,10
@@
serial_open (const char *name)
return scb;
}
return scb;
}
-s
erial_t
+s
truct serial *
serial_fdopen (const int fd)
{
serial_fdopen (const int fd)
{
- s
erial_t
scb;
+ s
truct serial *
scb;
struct serial_ops *ops;
for (scb = scb_base; scb; scb = scb->next)
struct serial_ops *ops;
for (scb = scb_base; scb; scb = scb->next)
@@
-252,7
+256,7
@@
serial_fdopen (const int fd)
if (!ops)
return NULL;
if (!ops)
return NULL;
- scb =
(serial_t) xmalloc (sizeof (struct _serial_t)
);
+ scb =
XMALLOC (struct serial
);
scb->ops = ops;
scb->ops = ops;
@@
-276,9
+280,9
@@
serial_fdopen (const int fd)
}
static void
}
static void
-do_serial_close (s
erial_t
scb, int really_close)
+do_serial_close (s
truct serial *
scb, int really_close)
{
{
- s
erial_t
tmp_scb;
+ s
truct serial *
tmp_scb;
last_serial_opened = NULL;
last_serial_opened = NULL;
@@
-328,26
+332,27
@@
do_serial_close (serial_t scb, int really_close)
}
void
}
void
-serial_close (s
erial_t
scb)
+serial_close (s
truct serial *
scb)
{
do_serial_close (scb, 1);
}
void
{
do_serial_close (scb, 1);
}
void
-serial_un_fdopen (s
erial_t
scb)
+serial_un_fdopen (s
truct serial *
scb)
{
do_serial_close (scb, 0);
}
int
{
do_serial_close (scb, 0);
}
int
-serial_readchar (s
erial_t
scb, int timeout)
+serial_readchar (s
truct serial *
scb, int timeout)
{
int ch;
/* FIXME: cagney/1999-10-11: Don't enable this check until the ASYNC
code is finished. */
{
int ch;
/* FIXME: cagney/1999-10-11: Don't enable this check until the ASYNC
code is finished. */
- if (0 && SERIAL_IS_ASYNC_P (scb) && timeout < 0)
- internal_error ("serial_readchar: blocking read in async mode");
+ if (0 && serial_is_async_p (scb) && timeout < 0)
+ internal_error (__FILE__, __LINE__,
+ "serial_readchar: blocking read in async mode");
ch = scb->ops->readchar (scb, timeout);
if (serial_logfp != NULL)
ch = scb->ops->readchar (scb, timeout);
if (serial_logfp != NULL)
@@
-358,7
+363,7
@@
serial_readchar (serial_t scb, int timeout)
in case we are getting ready to dump core or something. */
gdb_flush (serial_logfp);
}
in case we are getting ready to dump core or something. */
gdb_flush (serial_logfp);
}
- if (
SERIAL_DEBUG_P
(scb))
+ if (
serial_debug_p
(scb))
{
fprintf_unfiltered (gdb_stdlog, "[");
serial_logchar (gdb_stdlog, 'r', ch, timeout);
{
fprintf_unfiltered (gdb_stdlog, "[");
serial_logchar (gdb_stdlog, 'r', ch, timeout);
@@
-370,7
+375,7
@@
serial_readchar (serial_t scb, int timeout)
}
int
}
int
-serial_write (s
erial_t
scb, const char *str, int len)
+serial_write (s
truct serial *
scb, const char *str, int len)
{
if (serial_logfp != NULL)
{
{
if (serial_logfp != NULL)
{
@@
-388,39
+393,39
@@
serial_write (serial_t scb, const char *str, int len)
}
void
}
void
-serial_printf (s
erial_t
desc, const char *format,...)
+serial_printf (s
truct serial *
desc, const char *format,...)
{
va_list args;
char *buf;
va_start (args, format);
{
va_list args;
char *buf;
va_start (args, format);
- vasprintf (&buf, format, args);
-
SERIAL_WRITE
(desc, buf, strlen (buf));
+
x
vasprintf (&buf, format, args);
+
serial_write
(desc, buf, strlen (buf));
xfree (buf);
va_end (args);
}
int
xfree (buf);
va_end (args);
}
int
-serial_drain_output (s
erial_t
scb)
+serial_drain_output (s
truct serial *
scb)
{
return scb->ops->drain_output (scb);
}
int
{
return scb->ops->drain_output (scb);
}
int
-serial_flush_output (s
erial_t
scb)
+serial_flush_output (s
truct serial *
scb)
{
return scb->ops->flush_output (scb);
}
int
{
return scb->ops->flush_output (scb);
}
int
-serial_flush_input (s
erial_t
scb)
+serial_flush_input (s
truct serial *
scb)
{
return scb->ops->flush_input (scb);
}
int
{
return scb->ops->flush_input (scb);
}
int
-serial_send_break (s
erial_t
scb)
+serial_send_break (s
truct serial *
scb)
{
if (serial_logfp != NULL)
serial_logchar (serial_logfp, 'w', SERIAL_BREAK, 0);
{
if (serial_logfp != NULL)
serial_logchar (serial_logfp, 'w', SERIAL_BREAK, 0);
@@
-429,25
+434,25
@@
serial_send_break (serial_t scb)
}
void
}
void
-serial_raw (s
erial_t
scb)
+serial_raw (s
truct serial *
scb)
{
scb->ops->go_raw (scb);
}
serial_ttystate
{
scb->ops->go_raw (scb);
}
serial_ttystate
-serial_get_tty_state (s
erial_t
scb)
+serial_get_tty_state (s
truct serial *
scb)
{
return scb->ops->get_tty_state (scb);
}
int
{
return scb->ops->get_tty_state (scb);
}
int
-serial_set_tty_state (s
erial_t
scb, serial_ttystate ttystate)
+serial_set_tty_state (s
truct serial *
scb, serial_ttystate ttystate)
{
return scb->ops->set_tty_state (scb, ttystate);
}
void
{
return scb->ops->set_tty_state (scb, ttystate);
}
void
-serial_print_tty_state (s
erial_t
scb,
+serial_print_tty_state (s
truct serial *
scb,
serial_ttystate ttystate,
struct ui_file *stream)
{
serial_ttystate ttystate,
struct ui_file *stream)
{
@@
-455,7
+460,7
@@
serial_print_tty_state (serial_t scb,
}
int
}
int
-serial_noflush_set_tty_state (s
erial_t
scb,
+serial_noflush_set_tty_state (s
truct serial *
scb,
serial_ttystate new_ttystate,
serial_ttystate old_ttystate)
{
serial_ttystate new_ttystate,
serial_ttystate old_ttystate)
{
@@
-463,31
+468,31
@@
serial_noflush_set_tty_state (serial_t scb,
}
int
}
int
-serial_setbaudrate (s
erial_t
scb, int rate)
+serial_setbaudrate (s
truct serial *
scb, int rate)
{
return scb->ops->setbaudrate (scb, rate);
}
int
{
return scb->ops->setbaudrate (scb, rate);
}
int
-serial_setstopbits (s
erial_t
scb, int num)
+serial_setstopbits (s
truct serial *
scb, int num)
{
return scb->ops->setstopbits (scb, num);
}
int
{
return scb->ops->setstopbits (scb, num);
}
int
-serial_can_async_p (s
erial_t
scb)
+serial_can_async_p (s
truct serial *
scb)
{
return (scb->ops->async != NULL);
}
int
{
return (scb->ops->async != NULL);
}
int
-serial_is_async_p (s
erial_t
scb)
+serial_is_async_p (s
truct serial *
scb)
{
return (scb->ops->async != NULL) && (scb->async_handler != NULL);
}
void
{
return (scb->ops->async != NULL) && (scb->async_handler != NULL);
}
void
-serial_async (s
erial_t
scb,
+serial_async (s
truct serial *
scb,
serial_event_ftype *handler,
void *context)
{
serial_event_ftype *handler,
void *context)
{
@@
-500,35
+505,35
@@
serial_async (serial_t scb,
}
int
}
int
-deprecated_serial_fd (s
erial_t
scb)
+deprecated_serial_fd (s
truct serial *
scb)
{
/* FIXME: should this output a warning that deprecated code is being
called? */
if (scb->fd < 0)
{
{
/* FIXME: should this output a warning that deprecated code is being
called? */
if (scb->fd < 0)
{
- internal_error ("serial: FD not valid");
+ internal_error (__FILE__, __LINE__,
+ "serial: FD not valid");
}
return scb->fd; /* sigh */
}
void
}
return scb->fd; /* sigh */
}
void
-serial_debug (s
erial_t
scb, int debug_p)
+serial_debug (s
truct serial *
scb, int debug_p)
{
scb->debug_p = debug_p;
}
int
{
scb->debug_p = debug_p;
}
int
-serial_debug_p (s
erial_t
scb)
+serial_debug_p (s
truct serial *
scb)
{
return scb->debug_p || global_serial_debug_p;
}
#if 0
{
return scb->debug_p || global_serial_debug_p;
}
#if 0
-/*
- The connect command is #if 0 because I hadn't thought of an elegant
- way to wait for I/O on two serial_t's simultaneously. Two solutions
- came to mind:
+/* The connect command is #if 0 because I hadn't thought of an elegant
+ way to wait for I/O on two `struct serial *'s simultaneously. Two
+ solutions came to mind:
1) Fork, and have have one fork handle the to user direction,
and have the other hand the to target direction. This
1) Fork, and have have one fork handle the to user direction,
and have the other hand the to target direction. This
@@
-538,21
+543,20
@@
serial_debug_p (serial_t scb)
the target side can both be waited on via the same
mechanism. This may not be true for DOS, if GDB is
talking to the target via a TCP socket.
the target side can both be waited on via the same
mechanism. This may not be true for DOS, if GDB is
talking to the target via a TCP socket.
- -grossman, 8 Jun 93
- */
+ -grossman, 8 Jun 93 */
/* Connect the user directly to the remote system. This command acts just like
the 'cu' or 'tip' command. Use <CR>~. or <CR>~^D to break out. */
/* Connect the user directly to the remote system. This command acts just like
the 'cu' or 'tip' command. Use <CR>~. or <CR>~^D to break out. */
-static s
erial_t tty_desc;
/* Controlling terminal */
+static s
truct serial *tty_desc;
/* Controlling terminal */
static void
cleanup_tty (serial_ttystate ttystate)
{
printf_unfiltered ("\r\n[Exiting connect mode]\r\n");
static void
cleanup_tty (serial_ttystate ttystate)
{
printf_unfiltered ("\r\n[Exiting connect mode]\r\n");
-
SERIAL_SET_TTY_STATE
(tty_desc, ttystate);
+
serial_set_tty_state
(tty_desc, ttystate);
xfree (ttystate);
xfree (ttystate);
-
SERIAL_CLOSE
(tty_desc);
+
serial_close
(tty_desc);
}
static void
}
static void
@@
-561,7
+565,7
@@
connect_command (char *args, int fromtty)
int c;
char cur_esc = 0;
serial_ttystate ttystate;
int c;
char cur_esc = 0;
serial_ttystate ttystate;
- s
erial_t port_desc;
/* TTY port */
+ s
truct serial *port_desc;
/* TTY port */
dont_repeat ();
dont_repeat ();
@@
-570,13
+574,13
@@
connect_command (char *args, int fromtty)
printf_unfiltered ("[Entering connect mode. Use ~. or ~^D to escape]\n");
printf_unfiltered ("[Entering connect mode. Use ~. or ~^D to escape]\n");
- tty_desc =
SERIAL_FDOPEN
(0);
+ tty_desc =
serial_fdopen
(0);
port_desc = last_serial_opened;
port_desc = last_serial_opened;
- ttystate =
SERIAL_GET_TTY_STATE
(tty_desc);
+ ttystate =
serial_get_tty_state
(tty_desc);
-
SERIAL_RAW
(tty_desc);
-
SERIAL_RAW
(port_desc);
+
serial_raw
(tty_desc);
+
serial_raw
(port_desc);
make_cleanup (cleanup_tty, ttystate);
make_cleanup (cleanup_tty, ttystate);
@@
-584,7
+588,7
@@
connect_command (char *args, int fromtty)
{
int mask;
{
int mask;
- mask =
SERIAL_WAIT
_2 (tty_desc, port_desc, -1);
+ mask =
serial_wait
_2 (tty_desc, port_desc, -1);
if (mask & 2)
{ /* tty input */
if (mask & 2)
{ /* tty input */
@@
-592,7
+596,7
@@
connect_command (char *args, int fromtty)
while (1)
{
while (1)
{
- c =
SERIAL_READCHAR
(tty_desc, 0);
+ c =
serial_readchar
(tty_desc, 0);
if (c == SERIAL_TIMEOUT)
break;
if (c == SERIAL_TIMEOUT)
break;
@@
-601,7
+605,7
@@
connect_command (char *args, int fromtty)
perror_with_name ("connect");
cx = c;
perror_with_name ("connect");
cx = c;
-
SERIAL_WRITE
(port_desc, &cx, 1);
+
serial_write
(port_desc, &cx, 1);
switch (cur_esc)
{
switch (cur_esc)
{
@@
-630,7
+634,7
@@
connect_command (char *args, int fromtty)
while (1)
{
while (1)
{
- c =
SERIAL_READCHAR
(port_desc, 0);
+ c =
serial_readchar
(port_desc, 0);
if (c == SERIAL_TIMEOUT)
break;
if (c == SERIAL_TIMEOUT)
break;
@@
-640,7
+644,7
@@
connect_command (char *args, int fromtty)
cx = c;
cx = c;
-
SERIAL_WRITE
(tty_desc, &cx, 1);
+
serial_write
(tty_desc, &cx, 1);
}
}
}
}
}
}