/* Generic serial interface routines
- Copyright (C) 1992-2002, 2004-2012 Free Software Foundation, Inc.
+ Copyright (C) 1992-2013 Free Software Foundation, Inc.
This file is part of GDB.
#include "serial.h"
#include "gdb_string.h"
#include "gdbcmd.h"
+#include "cli/cli-utils.h"
extern void _initialize_serial (void);
/* Is serial being debugged? */
-static int global_serial_debug_p;
+static unsigned int global_serial_debug_p;
/* Linked list of serial I/O handlers. */
static struct serial_ops *serial_ops_list = NULL;
+/* 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. */
serial_ops_list = optable;
}
+/* 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 *
ops = serial_interface_lookup ("pipe");
/* Discard ``|'' and any space before the command itself. */
++open_name;
- while (isspace (*open_name))
- ++open_name;
+ open_name = skip_spaces_const (open_name);
}
/* Check for a colon, suggesting an IP address/port pair.
Do this *after* checking for all the interesting prefixes. We
scb->bufcnt = 0;
scb->bufp = scb->buf;
scb->error_fd = -1;
+ scb->refcnt = 1;
/* `...->open (...)' would get expanded by the open(2) syscall macro. */
if ((*scb->ops->open) (scb, open_name))
}
scb->name = xstrdup (name);
+ scb->next = scb_base;
scb->debug_p = 0;
scb->async_state = 0;
scb->async_handler = NULL;
scb->async_context = NULL;
+ scb_base = scb;
if (serial_logfile != NULL)
{
scb->bufcnt = 0;
scb->bufp = scb->buf;
scb->error_fd = -1;
+ scb->refcnt = 1;
scb->name = NULL;
+ scb->next = scb_base;
scb->debug_p = 0;
scb->async_state = 0;
scb->async_handler = NULL;
scb->async_context = NULL;
+ scb_base = scb;
if ((ops->fdopen) != NULL)
(*ops->fdopen) (scb, fd);
if (scb->name)
xfree (scb->name);
- xfree (scb);
+ /* For serial_is_open. */
+ scb->bufp = NULL;
+
+ if (scb_base == scb)
+ scb_base = scb_base->next;
+ else
+ for (tmp_scb = scb_base; tmp_scb; tmp_scb = tmp_scb->next)
+ {
+ if (tmp_scb->next != scb)
+ continue;
+
+ tmp_scb->next = tmp_scb->next->next;
+ break;
+ }
+
+ 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
-serial_write (struct serial *scb, const char *str, int len)
+serial_write (struct serial *scb, const void *buf, size_t count)
{
if (serial_logfp != NULL)
{
- int count;
+ const char *str = buf;
+ size_t c;
- for (count = 0; count < len; count++)
- serial_logchar (serial_logfp, 'w', str[count] & 0xff, 0);
+ for (c = 0; c < count; c++)
+ serial_logchar (serial_logfp, 'w', str[c] & 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. */
}
if (serial_debug_p (scb))
{
- int count;
+ const char *str = buf;
+ size_t c;
- for (count = 0; count < len; count++)
+ for (c = 0; c < count; c++)
{
fprintf_unfiltered (gdb_stdlog, "[");
serial_logchar (gdb_stdlog, 'w', str[count] & 0xff, 0);
gdb_flush (gdb_stdlog);
}
- return (scb->ops->write (scb, str, len));
+ return (scb->ops->write (scb, buf, count));
}
void
scb->ops->async (scb, handler != NULL);
}
-int
-deprecated_serial_fd (struct serial *scb)
-{
- /* FIXME: should this output a warning that deprecated code is being
- called? */
- if (scb->fd < 0)
- {
- internal_error (__FILE__, __LINE__,
- _("serial: FD not valid"));
- }
- return scb->fd; /* sigh */
-}
-
void
serial_debug (struct serial *scb, int debug_p)
{
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);
}