/* We talk to the NetROM over these sockets. */
-static serial_t load_desc = NULL;
-static serial_t ctrl_desc = NULL;
+static struct serial *load_desc = NULL;
+static struct serial *ctrl_desc = NULL;
static int load_port = DEFAULT_NETROM_LOAD_PORT;
static int control_port = DEFAULT_NETROM_CONTROL_PORT;
while (1)
{
- c = SERIAL_READCHAR (ctrl_desc, 5);
+ c = serial_readchar (ctrl_desc, 5);
if (c == *p++)
{
nrom_close (0);
}
-static serial_t
+static struct serial *
open_socket (char *name, int port)
{
char sockname[100];
- serial_t desc;
+ struct serial *desc;
sprintf (sockname, "%s:%d", name, port);
- desc = SERIAL_OPEN (sockname);
+ desc = serial_open (sockname);
if (!desc)
perror_with_name (sockname);
static void
load_cleanup (void)
{
- SERIAL_CLOSE (load_desc);
+ serial_close (load_desc);
load_desc = NULL;
}
struct cleanup *old_chain;
/* Tell the netrom to get ready to download. */
- if (SERIAL_WRITE (ctrl_desc, downloadstring, strlen (downloadstring)))
+ if (serial_write (ctrl_desc, downloadstring, strlen (downloadstring)))
error ("nrom_load: control_send() of `%s' failed", downloadstring);
expect ("Waiting for a connection...\n");
bfd_get_section_contents (pbfd, section, buffer, fptr,
count);
- SERIAL_WRITE (load_desc, buffer, count);
+ serial_write (load_desc, buffer, count);
section_address += count;
fptr += count;
section_size -= count;
nrom_close (int quitting)
{
if (load_desc)
- SERIAL_CLOSE (load_desc);
+ serial_close (load_desc);
if (ctrl_desc)
- SERIAL_CLOSE (ctrl_desc);
+ serial_close (ctrl_desc);
}
/* Pass arguments directly to the NetROM. */
char buf[1024];
sprintf (buf, "%s\n", args);
- if (SERIAL_WRITE (ctrl_desc, buf, strlen (buf)))
+ if (serial_write (ctrl_desc, buf, strlen (buf)))
error ("nrom_reset: control_send() of `%s'failed", args);
}
nrom_ops.to_thread_alive = 0;
nrom_ops.to_stop = 0;
nrom_ops.to_pid_to_exec_file = NULL;
- nrom_ops.to_core_file_to_sym_file = NULL;
nrom_ops.to_stratum = download_stratum;
nrom_ops.DONT_USE = NULL;
nrom_ops.to_has_all_memory = 1;