mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-17 22:04:40 +00:00
Merged from sys/dev/sio/sio.c revisions 1.376 and 1.377.
This commit is contained in:
parent
4d2f0addb4
commit
b8391d6a1a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=98763
|
@ -4270,11 +4270,13 @@ siocnattach(port, speed)
|
|||
u_char cfcr;
|
||||
u_int divisor;
|
||||
struct siocnstate sp;
|
||||
int unit = 0; /* XXX random value! */
|
||||
|
||||
siocniobase = port;
|
||||
siocnunit = unit;
|
||||
comdefaultrate = speed;
|
||||
sio_consdev.cn_pri = CN_NORMAL;
|
||||
sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0);
|
||||
sio_consdev.cn_dev = makedev(CDEV_MAJOR, unit);
|
||||
|
||||
s = spltty();
|
||||
|
||||
|
@ -4310,7 +4312,7 @@ siogdbattach(port, speed)
|
|||
u_char cfcr;
|
||||
u_int divisor;
|
||||
struct siocnstate sp;
|
||||
int unit = 1; /* XXX !!! */
|
||||
int unit = 1; /* XXX random value! */
|
||||
|
||||
siogdbiobase = port;
|
||||
gdbdefaultrate = speed;
|
||||
|
@ -4448,7 +4450,7 @@ siogdbgetc()
|
|||
int s;
|
||||
struct siocnstate sp;
|
||||
|
||||
if (minor(dev) == siocnunit) {
|
||||
if (siogdbunit == siocnunit) {
|
||||
iobase = siocniobase;
|
||||
speed = comdefaultrate;
|
||||
} else {
|
||||
|
@ -4475,7 +4477,7 @@ siogdbputc(c)
|
|||
int s;
|
||||
struct siocnstate sp;
|
||||
|
||||
if (minor(dev) == siocnunit) {
|
||||
if (siogdbunit == siocnunit) {
|
||||
iobase = siocniobase;
|
||||
speed = comdefaultrate;
|
||||
} else {
|
||||
|
|
|
@ -4270,11 +4270,13 @@ siocnattach(port, speed)
|
|||
u_char cfcr;
|
||||
u_int divisor;
|
||||
struct siocnstate sp;
|
||||
int unit = 0; /* XXX random value! */
|
||||
|
||||
siocniobase = port;
|
||||
siocnunit = unit;
|
||||
comdefaultrate = speed;
|
||||
sio_consdev.cn_pri = CN_NORMAL;
|
||||
sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0);
|
||||
sio_consdev.cn_dev = makedev(CDEV_MAJOR, unit);
|
||||
|
||||
s = spltty();
|
||||
|
||||
|
@ -4310,7 +4312,7 @@ siogdbattach(port, speed)
|
|||
u_char cfcr;
|
||||
u_int divisor;
|
||||
struct siocnstate sp;
|
||||
int unit = 1; /* XXX !!! */
|
||||
int unit = 1; /* XXX random value! */
|
||||
|
||||
siogdbiobase = port;
|
||||
gdbdefaultrate = speed;
|
||||
|
@ -4448,7 +4450,7 @@ siogdbgetc()
|
|||
int s;
|
||||
struct siocnstate sp;
|
||||
|
||||
if (minor(dev) == siocnunit) {
|
||||
if (siogdbunit == siocnunit) {
|
||||
iobase = siocniobase;
|
||||
speed = comdefaultrate;
|
||||
} else {
|
||||
|
@ -4475,7 +4477,7 @@ siogdbputc(c)
|
|||
int s;
|
||||
struct siocnstate sp;
|
||||
|
||||
if (minor(dev) == siocnunit) {
|
||||
if (siogdbunit == siocnunit) {
|
||||
iobase = siocniobase;
|
||||
speed = comdefaultrate;
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue