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

Merged from sys/isa/sio.c revision 1.315.

Browse Source
This commit is contained in:
kato 2000-09-22 12:56:55 +00:00
parent 158d490fae
commit ddd38e7c13
2 changed files with 52 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/pc98/cbus/sio.c
View File

@ -529,7 +529,9 @@ static volatile speed_t gdbdefaultrate = CONSPEED;
#endif
static u_int com_events; /* input chars + weighted output completions */
static Port_t siocniobase;
#ifndef __alpha__
static int siocnunit;
#endif
static Port_t siogdbiobase;
static int siogdbunit = -1;
static bool_t sio_registered;
@ -4213,13 +4215,22 @@ struct siocnstate {
u_char mcr;
};
#ifndef __alpha__
static speed_t siocngetspeed __P((Port_t, struct speedtab *));
#endif
static void siocnclose __P((struct siocnstate *sp, Port_t iobase));
static void siocnopen __P((struct siocnstate *sp, Port_t iobase, int speed));
static void siocntxwait __P((Port_t iobase));
#ifdef __alpha__
int siocnattach __P((int port, int speed));
int siogdbattach __P((int port, int speed));
int siogdbgetc __P((void));
void siogdbputc __P((int c));
#else
static cn_probe_t siocnprobe;
static cn_init_t siocninit;
#endif
static cn_checkc_t siocncheckc;
static cn_getc_t siocngetc;
static cn_putc_t siocnputc;
@ -4251,6 +4262,8 @@ siocntxwait(iobase)
;
}
#ifndef __alpha__
/*
* Read the serial port specified and try to figure out what speed
* it's currently running at. We're assuming the serial port has
@ -4287,6 +4300,8 @@ siocngetspeed(iobase, table)
return (0); /* didn't match anything sane */
}
#endif
static void
siocnopen(sp, iobase, speed)
struct siocnstate *sp;
@ -4354,6 +4369,8 @@ siocnclose(sp, iobase)
outb(iobase + com_ier, sp->ier);
}
#ifndef __alpha__
static void
siocnprobe(cp)
struct consdev *cp;
@ -4464,6 +4481,15 @@ siocnprobe(cp)
#endif
}
static void
siocninit(cp)
struct consdev *cp;
{
comconsole = DEV_TO_UNIT(cp->cn_dev);
}
#endif
#ifdef __alpha__
CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc, NULL);
@ -4556,13 +4582,6 @@ siogdbattach(port, speed)
#endif
static void
siocninit(cp)
struct consdev *cp;
{
comconsole = DEV_TO_UNIT(cp->cn_dev);
}
static int
siocncheckc(dev)
dev_t dev;

33
sys/pc98/pc98/sio.c
View File

@ -529,7 +529,9 @@ static volatile speed_t gdbdefaultrate = CONSPEED;
#endif
static u_int com_events; /* input chars + weighted output completions */
static Port_t siocniobase;
#ifndef __alpha__
static int siocnunit;
#endif
static Port_t siogdbiobase;
static int siogdbunit = -1;
static bool_t sio_registered;
@ -4213,13 +4215,22 @@ struct siocnstate {
u_char mcr;
};
#ifndef __alpha__
static speed_t siocngetspeed __P((Port_t, struct speedtab *));
#endif
static void siocnclose __P((struct siocnstate *sp, Port_t iobase));
static void siocnopen __P((struct siocnstate *sp, Port_t iobase, int speed));
static void siocntxwait __P((Port_t iobase));
#ifdef __alpha__
int siocnattach __P((int port, int speed));
int siogdbattach __P((int port, int speed));
int siogdbgetc __P((void));
void siogdbputc __P((int c));
#else
static cn_probe_t siocnprobe;
static cn_init_t siocninit;
#endif
static cn_checkc_t siocncheckc;
static cn_getc_t siocngetc;
static cn_putc_t siocnputc;
@ -4251,6 +4262,8 @@ siocntxwait(iobase)
;
}
#ifndef __alpha__
/*
* Read the serial port specified and try to figure out what speed
* it's currently running at. We're assuming the serial port has
@ -4287,6 +4300,8 @@ siocngetspeed(iobase, table)
return (0); /* didn't match anything sane */
}
#endif
static void
siocnopen(sp, iobase, speed)
struct siocnstate *sp;
@ -4354,6 +4369,8 @@ siocnclose(sp, iobase)
outb(iobase + com_ier, sp->ier);
}
#ifndef __alpha__
static void
siocnprobe(cp)
struct consdev *cp;
@ -4464,6 +4481,15 @@ siocnprobe(cp)
#endif
}
static void
siocninit(cp)
struct consdev *cp;
{
comconsole = DEV_TO_UNIT(cp->cn_dev);
}
#endif
#ifdef __alpha__
CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc, NULL);
@ -4556,13 +4582,6 @@ siogdbattach(port, speed)
#endif
static void
siocninit(cp)
struct consdev *cp;
{
comconsole = DEV_TO_UNIT(cp->cn_dev);
}
static int
siocncheckc(dev)
dev_t dev;