d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert to use CONSOLE_DRIVER() macro:

Browse Source 
Remove cngetc, rename cncheckc to cngetc (fix GDB console accordingly)
This commit is contained in:
Poul-Henning Kamp 2006-05-26 11:21:52 +00:00
parent 9dd2370db6
commit 3fc7129ed1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=158947
1 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/dev/sio/sio.c
View File

@ -2276,12 +2276,10 @@ static void siocntxwait(Port_t iobase);
static cn_probe_t sio_cnprobe;
static cn_init_t sio_cninit;
static cn_term_t sio_cnterm;
static cn_checkc_t sio_cncheckc;
static cn_getc_t sio_cngetc;
static cn_putc_t sio_cnputc;
CONS_DRIVER(sio, sio_cnprobe, sio_cninit, sio_cnterm, sio_cngetc, sio_cncheckc,
sio_cnputc, NULL);
CONSOLE_DRIVER(sio);
static void
siocntxwait(iobase)
@ -2500,7 +2498,7 @@ sio_cnterm(cp)
}
static int
sio_cncheckc(struct consdev *cd)
sio_cngetc(struct consdev *cd)
{
int c;
Port_t iobase;
@ -2530,36 +2528,6 @@ sio_cncheckc(struct consdev *cd)
return (c);
}
static int
sio_cngetc(struct consdev *cd)
{
int c;
Port_t iobase;
int s;
struct siocnstate sp;
speed_t speed;
if (cd != NULL && cd->cn_unit == siocnunit) {
iobase = siocniobase;
speed = comdefaultrate;
} else {
#ifdef GDB
iobase = siogdbiobase;
speed = gdbdefaultrate;
#else
return (-1);
#endif
}
s = spltty();
siocnopen(&sp, iobase, speed);
while (!(inb(iobase + com_lsr) & LSR_RXRDY))
;
c = inb(iobase + com_data);
siocnclose(&sp, iobase);
splx(s);
return (c);
}
static void
sio_cnputc(struct consdev *cd, int c)
{
@ -2607,10 +2575,9 @@ static gdb_probe_f siogdbprobe;
static gdb_init_f siogdbinit;
static gdb_term_f siogdbterm;
static gdb_getc_f siogdbgetc;
static gdb_checkc_f siogdbcheckc;
static gdb_putc_f siogdbputc;
GDB_DBGPORT(sio, siogdbprobe, siogdbinit, siogdbterm, siogdbcheckc,
GDB_DBGPORT(sio, siogdbprobe, siogdbinit, siogdbterm, NULL,
siogdbgetc, siogdbputc);
static int
@ -2635,16 +2602,15 @@ siogdbputc(int c)
sio_cnputc(NULL, c);
}
static int
siogdbcheckc(void)
{
return (sio_cncheckc(NULL));
}
static int
siogdbgetc(void)
{
return (sio_cngetc(NULL));
int c;
do
c = sio_cngetc(NULL);
while (c == -1);
return (c);
}
#endif