mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
Remove count for NSIO. The only places it was used it were incorrect.
(alpha-gdbstub.c got sync'ed up a bit with the i386 version)
This commit is contained in:
parent
246449f3e3
commit
8ab109d131
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=71880
@ -105,17 +105,8 @@
|
||||
|
||||
#include <setjmp.h>
|
||||
|
||||
/* #include "sio.h" */
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#include "sio.h"
|
||||
|
||||
#if NSIO == 0
|
||||
void
|
||||
gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
{
|
||||
}
|
||||
#else
|
||||
/************************************************************************/
|
||||
|
||||
void gdb_handle_exception (db_regs_t *, int, int);
|
||||
@ -135,6 +126,9 @@ extern jmp_buf db_jmpbuf;
|
||||
be named the same as the standard versions, so that the address `strlen'
|
||||
is unambiguous... */
|
||||
|
||||
#define strlen gdb_strlen
|
||||
#define strcpy gdb_strcpy
|
||||
|
||||
static int
|
||||
strlen (const char *s)
|
||||
{
|
||||
@ -155,26 +149,21 @@ strcpy (char *dst, const char *src)
|
||||
return retval;
|
||||
}
|
||||
|
||||
/* XXX sio always uses its major with minor 0 no matter what we specify. */
|
||||
#define REMOTE_DEV 0
|
||||
|
||||
static int
|
||||
putDebugChar (int c) /* write a single character */
|
||||
{
|
||||
#if NSIO > 0
|
||||
siogdbputc (c);
|
||||
#endif
|
||||
if (gdbdev == NODEV)
|
||||
return 0;
|
||||
(*gdb_putc)(gdbdev, c);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
getDebugChar (void) /* read and return a single char */
|
||||
{
|
||||
#if NSIO > 0
|
||||
return siogdbgetc ();
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
if (gdbdev == NODEV)
|
||||
return -1;
|
||||
return (*gdb_getc)(gdbdev);
|
||||
}
|
||||
|
||||
static const char hexchars[]="0123456789abcdef";
|
||||
@ -635,6 +624,8 @@ gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
|
||||
while (1)
|
||||
{
|
||||
if (gdbdev == NODEV) /* somebody's removed it */
|
||||
return 1; /* get out of here */
|
||||
remcomOutBuffer[0] = 0;
|
||||
|
||||
getpacket (remcomInBuffer);
|
||||
@ -750,4 +741,3 @@ gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
putpacket (remcomOutBuffer);
|
||||
}
|
||||
}
|
||||
#endif /* NSIO > 0 */
|
||||
|
@ -102,17 +102,10 @@
|
||||
|
||||
#include <setjmp.h>
|
||||
|
||||
#include "sio.h"
|
||||
#include "opt_ddb.h"
|
||||
|
||||
int gdb_handle_exception (db_regs_t *, int, int);
|
||||
|
||||
#if NSIO == 0
|
||||
int
|
||||
gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
{
|
||||
}
|
||||
#else
|
||||
/************************************************************************/
|
||||
|
||||
extern jmp_buf db_jmpbuf;
|
||||
@ -626,4 +619,3 @@ gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif /* NSIO > 0 */
|
||||
|
@ -208,7 +208,7 @@ isa/atkbdc_isa.c optional atkbdc
|
||||
isa/fd.c optional fdc
|
||||
isa/ppc.c optional ppc
|
||||
isa/psm.c optional psm
|
||||
isa/sio.c count sio
|
||||
isa/sio.c optional sio
|
||||
isa/syscons_isa.c optional sc
|
||||
isa/vga_isa.c optional vga
|
||||
kern/subr_diskmbr.c standard
|
||||
|
@ -353,7 +353,7 @@ isa/atkbdc_isa.c optional atkbdc
|
||||
isa/fd.c optional fdc
|
||||
isa/ppc.c optional ppc
|
||||
isa/psm.c optional psm
|
||||
isa/sio.c count sio
|
||||
isa/sio.c optional sio
|
||||
isa/syscons_isa.c optional sc
|
||||
isa/vga_isa.c optional vga
|
||||
kern/imgact_aout.c standard
|
||||
|
@ -81,7 +81,7 @@ isa/atkbdc_isa.c optional atkbdc
|
||||
isa/fd.c optional fdc
|
||||
isa/ppc.c optional ppc
|
||||
isa/psm.c optional psm
|
||||
isa/sio.c count sio
|
||||
isa/sio.c optional sio
|
||||
isa/syscons_isa.c optional sc
|
||||
isa/vga_isa.c optional vga
|
||||
kern/subr_diskmbr.c standard
|
||||
|
@ -365,7 +365,7 @@ pc98/pc98/ppc.c optional ppc
|
||||
pc98/pc98/scgdcrndr.c optional sc gdc
|
||||
pc98/pc98/scterm-sck.c optional sc
|
||||
pc98/pc98/scvtbpc98.c optional sc
|
||||
pc98/pc98/sio.c count sio
|
||||
pc98/pc98/sio.c optional sio
|
||||
pc98/pc98/spkr.c optional speaker
|
||||
pc98/pc98/syscons.c optional sc
|
||||
pc98/pc98/syscons_pc98.c optional sc
|
||||
|
@ -41,7 +41,6 @@
|
||||
#include "opt_sio.h"
|
||||
#include "card.h"
|
||||
#include "pci.h"
|
||||
#include "sio.h"
|
||||
|
||||
/*
|
||||
* Serial driver, based on 386BSD-0.1 com driver.
|
||||
|
@ -102,17 +102,10 @@
|
||||
|
||||
#include <setjmp.h>
|
||||
|
||||
#include "sio.h"
|
||||
#include "opt_ddb.h"
|
||||
|
||||
int gdb_handle_exception (db_regs_t *, int, int);
|
||||
|
||||
#if NSIO == 0
|
||||
int
|
||||
gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
{
|
||||
}
|
||||
#else
|
||||
/************************************************************************/
|
||||
|
||||
extern jmp_buf db_jmpbuf;
|
||||
@ -626,4 +619,3 @@ gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif /* NSIO > 0 */
|
||||
|
@ -105,17 +105,8 @@
|
||||
|
||||
#include <setjmp.h>
|
||||
|
||||
/* #include "sio.h" */
|
||||
#include "opt_ddb.h"
|
||||
|
||||
#include "sio.h"
|
||||
|
||||
#if NSIO == 0
|
||||
void
|
||||
gdb_handle_exception (db_regs_t *raw_regs, int type, int code)
|
||||
{
|
||||
}
|
||||
#else
|
||||
/************************************************************************/
|
||||
|
||||
void gdb_handle_exception (db_regs_t *, int);
|
||||
@ -130,10 +121,9 @@ extern jmp_buf db_jmpbuf;
|
||||
/* Create private copies of common functions used by the stub. This prevents
|
||||
nasty interactions between app code and the stub (for instance if user steps
|
||||
into strlen, etc..) */
|
||||
/* XXX this is fairly bogus. strlen() and strcpy() should be reentrant,
|
||||
and are reentrant under FreeBSD. In any case, our versions should not
|
||||
be named the same as the standard versions, so that the address `strlen'
|
||||
is unambiguous... */
|
||||
|
||||
#define strlen gdb_strlen
|
||||
#define strcpy gdb_strcpy
|
||||
|
||||
static int
|
||||
strlen (const char *s)
|
||||
@ -585,4 +575,3 @@ gdb_handle_exception (db_regs_t *raw_regs, int vector)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#endif /* NSIO > 0 */
|
||||
|
@ -41,7 +41,6 @@
|
||||
#include "opt_sio.h"
|
||||
#include "card.h"
|
||||
#include "pci.h"
|
||||
#include "sio.h"
|
||||
|
||||
/*
|
||||
* Serial driver, based on 386BSD-0.1 com driver.
|
||||
|
@ -41,7 +41,6 @@
|
||||
#include "opt_sio.h"
|
||||
#include "card.h"
|
||||
#include "pci.h"
|
||||
#include "sio.h"
|
||||
|
||||
/*
|
||||
* Serial driver, based on 386BSD-0.1 com driver.
|
||||
|
@ -41,7 +41,6 @@
|
||||
#include "opt_sio.h"
|
||||
#include "card.h"
|
||||
#include "pci.h"
|
||||
#include "sio.h"
|
||||
|
||||
/*
|
||||
* Serial driver, based on 386BSD-0.1 com driver.
|
||||
|
Loading…
Reference in New Issue
Block a user