/* Generic serial interface routines
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1992-2002, 2004-2012 Free Software Foundation, Inc.
This file is part of GDB.
extern void _initialize_serial (void);
-/* Is serial being debugged? */
+/* Is serial being debugged? */
-static int global_serial_debug_p;
+static unsigned int global_serial_debug_p;
-/* Linked list of serial I/O handlers */
+/* Linked list of serial I/O handlers. */
static struct serial_ops *serial_ops_list = NULL;
-/* This is the last serial stream opened. Used by connect command. */
-
-static struct serial *last_serial_opened = NULL;
-
-/* Pointer to list of scb's. */
+/* Pointer to list of scb's. */
static struct serial *scb_base;
/* Non-NULL gives filename which contains a recording of the remote session,
- suitable for playback by gdbserver. */
+ suitable for playback by gdbserver. */
static char *serial_logfile = NULL;
static struct ui_file *serial_logfp = NULL;
static struct serial_ops *serial_interface_lookup (const char *);
-static void serial_logchar (struct ui_file *stream, int ch_type, int ch, int timeout);
+static void serial_logchar (struct ui_file *stream,
+ int ch_type, int ch, int timeout);
static const char logbase_hex[] = "hex";
static const char logbase_octal[] = "octal";
static const char logbase_ascii[] = "ascii";
-static const char *logbase_enums[] =
+static const char *const logbase_enums[] =
{logbase_hex, logbase_octal, logbase_ascii, NULL};
static const char *serial_logbase = logbase_ascii;
\f
static int serial_current_type = 0;
-/* Log char CH of type CHTYPE, with TIMEOUT */
+/* Log char CH of type CHTYPE, with TIMEOUT. */
/* Define bogus char to represent a BREAK. Should be careful to choose a value
that can't be confused with a normal char, or an error code. */
fputs_unfiltered ("\\v", stream);
break;
default:
- fprintf_unfiltered (stream, isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF);
+ fprintf_unfiltered (stream,
+ isprint (ch) ? "%c" : "\\x%02x", ch & 0xFF);
break;
}
}
fputs_unfiltered (cmd, serial_logfp);
/* Make sure that the log file is as up-to-date as possible,
- in case we are getting ready to dump core or something. */
+ in case we are getting ready to dump core or something. */
gdb_flush (serial_logfp);
}
serial_ops_list = optable;
}
-/* Open up a device or a network socket, depending upon the syntax of NAME. */
+/* Return the open serial device for FD, if found, or NULL if FD is
+ not already opened. */
+
+struct serial *
+serial_for_fd (int fd)
+{
+ struct serial *scb;
+
+ for (scb = scb_base; scb; scb = scb->next)
+ if (scb->fd == fd)
+ return scb;
+
+ return NULL;
+}
+
+/* Open up a device or a network socket, depending upon the syntax of NAME. */
struct serial *
serial_open (const char *name)
struct serial_ops *ops;
const char *open_name = name;
- for (scb = scb_base; scb; scb = scb->next)
- if (scb->name && strcmp (scb->name, name) == 0)
- {
- scb->refcnt++;
- return scb;
- }
-
if (strcmp (name, "pc") == 0)
ops = serial_interface_lookup ("pc");
else if (strncmp (name, "lpt", 3) == 0)
scb->bufcnt = 0;
scb->bufp = scb->buf;
scb->error_fd = -1;
+ scb->refcnt = 1;
- /* `...->open (...)' would get expanded by an the open(2) syscall macro. */
+ /* `...->open (...)' would get expanded by the open(2) syscall macro. */
if ((*scb->ops->open) (scb, open_name))
{
xfree (scb);
scb->name = xstrdup (name);
scb->next = scb_base;
- scb->refcnt = 1;
scb->debug_p = 0;
scb->async_state = 0;
scb->async_handler = NULL;
scb->async_context = NULL;
scb_base = scb;
- last_serial_opened = scb;
-
if (serial_logfile != NULL)
{
serial_logfp = gdb_fopen (serial_logfile, "w");
return scb;
}
-/* Return the open serial device for FD, if found, or NULL if FD
- is not already opened. */
-
-struct serial *
-serial_for_fd (int fd)
-{
- struct serial *scb;
-
- for (scb = scb_base; scb; scb = scb->next)
- if (scb->fd == fd)
- return scb;
-
- return NULL;
-}
-
/* Open a new serial stream using a file handle, using serial
interface ops OPS. */
{
struct serial *scb;
- scb = serial_for_fd (fd);
- if (scb)
- {
- scb->refcnt++;
- return scb;
- }
-
if (!ops)
{
ops = serial_interface_lookup ("terminal");
scb->bufcnt = 0;
scb->bufp = scb->buf;
scb->error_fd = -1;
+ scb->refcnt = 1;
scb->name = NULL;
scb->next = scb_base;
- scb->refcnt = 1;
scb->debug_p = 0;
scb->async_state = 0;
scb->async_handler = NULL;
else
scb->fd = fd;
- last_serial_opened = scb;
-
return scb;
}
{
struct serial *tmp_scb;
- last_serial_opened = NULL;
-
if (serial_logfp)
{
fputs_unfiltered ("\nEnd of log\n", serial_logfp);
serial_current_type = 0;
- /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr? */
+ /* XXX - What if serial_logfp == gdb_stdout or gdb_stderr? */
ui_file_delete (serial_logfp);
serial_logfp = NULL;
}
-/* This is bogus. It's not our fault if you pass us a bad scb...! Rob, you
- should fix your code instead. */
-
- if (!scb)
- return;
-
- scb->refcnt--;
- if (scb->refcnt > 0)
- return;
-
- /* ensure that the FD has been taken out of async mode */
+ /* ensure that the FD has been taken out of async mode. */
if (scb->async_handler != NULL)
serial_async (scb, NULL, NULL);
if (scb->name)
xfree (scb->name);
+ /* For serial_is_open. */
+ scb->bufp = NULL;
+
if (scb_base == scb)
scb_base = scb_base->next;
else
break;
}
- xfree (scb);
+ serial_unref (scb);
}
void
do_serial_close (scb, 0);
}
+int
+serial_is_open (struct serial *scb)
+{
+ return scb->bufp != NULL;
+}
+
+void
+serial_ref (struct serial *scb)
+{
+ scb->refcnt++;
+}
+
+void
+serial_unref (struct serial *scb)
+{
+ --scb->refcnt;
+ if (scb->refcnt == 0)
+ xfree (scb);
+}
+
int
serial_readchar (struct serial *scb, int timeout)
{
int ch;
/* FIXME: cagney/1999-10-11: Don't enable this check until the ASYNC
- code is finished. */
+ code is finished. */
if (0 && serial_is_async_p (scb) && timeout < 0)
internal_error (__FILE__, __LINE__,
_("serial_readchar: blocking read in async mode"));
serial_logchar (serial_logfp, 'r', ch, timeout);
/* Make sure that the log file is as up-to-date as possible,
- in case we are getting ready to dump core or something. */
+ in case we are getting ready to dump core or something. */
gdb_flush (serial_logfp);
}
if (serial_debug_p (scb))
serial_logchar (serial_logfp, 'w', str[count] & 0xff, 0);
/* Make sure that the log file is as up-to-date as possible,
- in case we are getting ready to dump core or something. */
+ in case we are getting ready to dump core or something. */
gdb_flush (serial_logfp);
}
if (serial_debug_p (scb))
return scb->ops->get_tty_state (scb);
}
+serial_ttystate
+serial_copy_tty_state (struct serial *scb, serial_ttystate ttystate)
+{
+ return scb->ops->copy_tty_state (scb, ttystate);
+}
+
int
serial_set_tty_state (struct serial *scb, serial_ttystate ttystate)
{
deprecated_serial_fd (struct serial *scb)
{
/* FIXME: should this output a warning that deprecated code is being
- called? */
+ called? */
if (scb->fd < 0)
{
internal_error (__FILE__, __LINE__,
return 0;
}
-#if 0
-/* 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
- obviously won't cut it for MSDOS.
-
- 2) Use something like select. This assumes that stdin and
- 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 */
-
-/* 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 struct serial *tty_desc; /* Controlling terminal */
-
-static void
-cleanup_tty (serial_ttystate ttystate)
-{
- printf_unfiltered ("\r\n[Exiting connect mode]\r\n");
- serial_set_tty_state (tty_desc, ttystate);
- xfree (ttystate);
- serial_close (tty_desc);
-}
-
-static void
-connect_command (char *args, int fromtty)
-{
- int c;
- char cur_esc = 0;
- serial_ttystate ttystate;
- struct serial *port_desc; /* TTY port */
-
- dont_repeat ();
-
- if (args)
- fprintf_unfiltered (gdb_stderr, "This command takes no args. They have been ignored.\n");
-
- printf_unfiltered ("[Entering connect mode. Use ~. or ~^D to escape]\n");
-
- tty_desc = serial_fdopen (0);
- port_desc = last_serial_opened;
-
- ttystate = serial_get_tty_state (tty_desc);
-
- serial_raw (tty_desc);
- serial_raw (port_desc);
-
- make_cleanup (cleanup_tty, ttystate);
-
- while (1)
- {
- int mask;
-
- mask = serial_wait_2 (tty_desc, port_desc, -1);
-
- if (mask & 2)
- { /* tty input */
- char cx;
-
- while (1)
- {
- c = serial_readchar (tty_desc, 0);
-
- if (c == SERIAL_TIMEOUT)
- break;
-
- if (c < 0)
- perror_with_name (_("connect"));
-
- cx = c;
- serial_write (port_desc, &cx, 1);
-
- switch (cur_esc)
- {
- case 0:
- if (c == '\r')
- cur_esc = c;
- break;
- case '\r':
- if (c == '~')
- cur_esc = c;
- else
- cur_esc = 0;
- break;
- case '~':
- if (c == '.' || c == '\004')
- return;
- else
- cur_esc = 0;
- }
- }
- }
-
- if (mask & 1)
- { /* Port input */
- char cx;
-
- while (1)
- {
- c = serial_readchar (port_desc, 0);
-
- if (c == SERIAL_TIMEOUT)
- break;
-
- if (c < 0)
- perror_with_name (_("connect"));
-
- cx = c;
-
- serial_write (tty_desc, &cx, 1);
- }
- }
- }
-}
-#endif /* 0 */
-
/* Serial set/show framework. */
static struct cmd_list_element *serial_set_cmdlist;
static void
serial_set_cmd (char *args, int from_tty)
{
- printf_unfiltered ("\"set serial\" must be followed by the name of a command.\n");
+ printf_unfiltered ("\"set serial\" must be followed "
+ "by the name of a command.\n");
help_list (serial_set_cmdlist, "set serial ", -1, gdb_stdout);
}
NULL, /* FIXME: i18n: */
&setlist, &showlist);
- add_setshow_zinteger_cmd ("serial", class_maintenance,
- &global_serial_debug_p, _("\
+ add_setshow_zuinteger_cmd ("serial", class_maintenance,
+ &global_serial_debug_p, _("\
Set serial debugging."), _("\
Show serial debugging."), _("\
When non-zero, serial port debugging is enabled."),
- NULL,
- NULL, /* FIXME: i18n: */
- &setdebuglist, &showdebuglist);
+ NULL,
+ NULL, /* FIXME: i18n: */
+ &setdebuglist, &showdebuglist);
}
projects / deliverable / binutils-gdb.git / blobdiff