summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Wollman <wollman@FreeBSD.org>1995-04-13 15:03:29 +0000
committerGarrett Wollman <wollman@FreeBSD.org>1995-04-13 15:03:29 +0000
commitae60406da6f3abb2c70d8c749edfec0e711258d1 (patch)
treeaea8cd45f3cc459a4e5349d8309937077376fb22
parent6b4198130ee255ac175ab59b6f50c93821dc5b48 (diff)
Notes
-rw-r--r--sys/dev/sio/sio.c10
-rw-r--r--sys/i386/isa/sio.c10
-rw-r--r--sys/isa/sio.c10
3 files changed, 12 insertions, 18 deletions
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index f652839b09e7..31c7b5f9ce43 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.92 1995/04/13 09:22:40 ache Exp $
+ * $Id: sio.c,v 1.93 1995/04/13 11:11:11 ache Exp $
*/
#include "sio.h"
@@ -353,8 +353,9 @@ static struct kern_devconf kdc_sio[NSIO] = { {
isa_generic_externalize, 0, 0, ISA_EXTERNALLEN,
&kdc_isa0, /* parent */
0, /* parentdata */
- DC_UNCONFIGURED,
- "RS-232 serial port"
+ DC_UNCONFIGURED, /* state */
+ "RS-232 serial port",
+ DC_CLS_SERIAL /* class */
} };
static void
@@ -368,7 +369,6 @@ sioregisterdev(id)
kdc_sio[unit] = kdc_sio[0];
kdc_sio[unit].kdc_unit = unit;
kdc_sio[unit].kdc_isa = id;
- kdc_sio[unit].kdc_state = DC_IDLE;
dev_attach(&kdc_sio[unit]);
}
@@ -909,7 +909,6 @@ open_top:
disc_optim(tp, &(tp->t_termios), com);
if (tp->t_state & TS_ISOPEN && mynor & CALLOUT_MASK)
com->active_out = TRUE;
- kdc_sio[unit].kdc_state = DC_BUSY;
out:
splx(s);
if (!(tp->t_state & TS_ISOPEN) && com->wopeners == 0)
@@ -943,7 +942,6 @@ sioclose(dev, flag, mode, p)
siostop(tp, FREAD | FWRITE);
comhardclose(com);
ttyclose(tp);
- kdc_sio[unit].kdc_state = DC_IDLE;
splx(s);
return (0);
}
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index f652839b09e7..31c7b5f9ce43 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.92 1995/04/13 09:22:40 ache Exp $
+ * $Id: sio.c,v 1.93 1995/04/13 11:11:11 ache Exp $
*/
#include "sio.h"
@@ -353,8 +353,9 @@ static struct kern_devconf kdc_sio[NSIO] = { {
isa_generic_externalize, 0, 0, ISA_EXTERNALLEN,
&kdc_isa0, /* parent */
0, /* parentdata */
- DC_UNCONFIGURED,
- "RS-232 serial port"
+ DC_UNCONFIGURED, /* state */
+ "RS-232 serial port",
+ DC_CLS_SERIAL /* class */
} };
static void
@@ -368,7 +369,6 @@ sioregisterdev(id)
kdc_sio[unit] = kdc_sio[0];
kdc_sio[unit].kdc_unit = unit;
kdc_sio[unit].kdc_isa = id;
- kdc_sio[unit].kdc_state = DC_IDLE;
dev_attach(&kdc_sio[unit]);
}
@@ -909,7 +909,6 @@ open_top:
disc_optim(tp, &(tp->t_termios), com);
if (tp->t_state & TS_ISOPEN && mynor & CALLOUT_MASK)
com->active_out = TRUE;
- kdc_sio[unit].kdc_state = DC_BUSY;
out:
splx(s);
if (!(tp->t_state & TS_ISOPEN) && com->wopeners == 0)
@@ -943,7 +942,6 @@ sioclose(dev, flag, mode, p)
siostop(tp, FREAD | FWRITE);
comhardclose(com);
ttyclose(tp);
- kdc_sio[unit].kdc_state = DC_IDLE;
splx(s);
return (0);
}
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index f652839b09e7..31c7b5f9ce43 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
- * $Id: sio.c,v 1.92 1995/04/13 09:22:40 ache Exp $
+ * $Id: sio.c,v 1.93 1995/04/13 11:11:11 ache Exp $
*/
#include "sio.h"
@@ -353,8 +353,9 @@ static struct kern_devconf kdc_sio[NSIO] = { {
isa_generic_externalize, 0, 0, ISA_EXTERNALLEN,
&kdc_isa0, /* parent */
0, /* parentdata */
- DC_UNCONFIGURED,
- "RS-232 serial port"
+ DC_UNCONFIGURED, /* state */
+ "RS-232 serial port",
+ DC_CLS_SERIAL /* class */
} };
static void
@@ -368,7 +369,6 @@ sioregisterdev(id)
kdc_sio[unit] = kdc_sio[0];
kdc_sio[unit].kdc_unit = unit;
kdc_sio[unit].kdc_isa = id;
- kdc_sio[unit].kdc_state = DC_IDLE;
dev_attach(&kdc_sio[unit]);
}
@@ -909,7 +909,6 @@ open_top:
disc_optim(tp, &(tp->t_termios), com);
if (tp->t_state & TS_ISOPEN && mynor & CALLOUT_MASK)
com->active_out = TRUE;
- kdc_sio[unit].kdc_state = DC_BUSY;
out:
splx(s);
if (!(tp->t_state & TS_ISOPEN) && com->wopeners == 0)
@@ -943,7 +942,6 @@ sioclose(dev, flag, mode, p)
siostop(tp, FREAD | FWRITE);
comhardclose(com);
ttyclose(tp);
- kdc_sio[unit].kdc_state = DC_IDLE;
splx(s);
return (0);
}