summaryrefslogtreecommitdiff
path: root/sys/pc98
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2003-07-02 16:09:02 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2003-07-02 16:09:02 +0000
commit8a9bc9c03ba8dfc43d5f5ca07166c6a40b54f5e6 (patch)
tree24843831a3541cd5733aaad746e1a57206e1e21f /sys/pc98
parent6591b310403469e94313efd7659f95f747192712 (diff)
Notes
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/cbus/fdc.c5
-rw-r--r--sys/pc98/cbus/pckbd.c3
-rw-r--r--sys/pc98/cbus/sio.c7
-rw-r--r--sys/pc98/cbus/syscons_cbus.c4
-rw-r--r--sys/pc98/pc98/fd.c5
-rw-r--r--sys/pc98/pc98/pc98kbd.c3
-rw-r--r--sys/pc98/pc98/sio.c7
-rw-r--r--sys/pc98/pc98/syscons_pc98.c4
8 files changed, 12 insertions, 26 deletions
diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index a940ccb81082..04c46e0232ae 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -1275,7 +1275,7 @@ fdc_detach(device_t dev)
static void
fdc_add_child(device_t dev, const char *name, int unit)
{
- int disabled, flags;
+ int flags;
struct fdc_ivars *ivar;
device_t child;
@@ -1292,8 +1292,7 @@ fdc_add_child(device_t dev, const char *name, int unit)
device_set_ivars(child, ivar);
if (resource_int_value(name, unit, "flags", &flags) == 0)
device_set_flags(child, flags);
- if (resource_int_value(name, unit, "disabled", &disabled) == 0
- && disabled != 0)
+ if (resource_disabled(name, unit))
device_disable(child);
}
diff --git a/sys/pc98/cbus/pckbd.c b/sys/pc98/cbus/pckbd.c
index 37fe6d258400..c7c793a09ff8 100644
--- a/sys/pc98/cbus/pckbd.c
+++ b/sys/pc98/cbus/pckbd.c
@@ -370,8 +370,7 @@ pckbd_configure(int flags)
if (resource_int_value(DRIVER_NAME, 0, "flags", &i) == 0) {
flags |= i;
/* if the driver is disabled, unregister the keyboard if any */
- if (resource_int_value(DRIVER_NAME, 0, "disabled", &i) == 0
- && i != 0) {
+ if (resource_disabled(DRIVER_NAME, 0)) {
i = kbd_find_keyboard(DRIVER_NAME, PC98KBD_DEFAULT);
if (i >= 0) {
kbd = kbd_get_keyboard(i);
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index 28eb52e63bd7..03f5041ea71c 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -4162,11 +4162,8 @@ siocnprobe(cp)
for (unit = 0; unit < 16; unit++) { /* XXX need to know how many */
int flags;
- int disabled;
- if (resource_int_value("sio", unit, "disabled", &disabled) == 0) {
- if (disabled)
- continue;
- }
+ if (resource_disabled("sio", unit))
+ continue;
if (resource_int_value("sio", unit, "flags", &flags))
continue;
if (COM_CONSOLE(flags) || COM_DEBUGGER(flags)) {
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 14a096ae9adf..1c9df05ed5ce 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -180,14 +180,12 @@ sc_softc_t
int
sc_get_cons_priority(int *unit, int *flags)
{
- int disabled;
const char *at;
int u, f;
*unit = -1;
for (u = 0; u < 16; u++) {
- if ((resource_int_value(SC_DRIVER_NAME, u, "disabled",
- &disabled) == 0) && disabled)
+ if (resource_disabled(SC_DRIVER_NAME, u))
continue;
if (resource_string_value(SC_DRIVER_NAME, u, "at", &at) != 0)
continue;
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index a940ccb81082..04c46e0232ae 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -1275,7 +1275,7 @@ fdc_detach(device_t dev)
static void
fdc_add_child(device_t dev, const char *name, int unit)
{
- int disabled, flags;
+ int flags;
struct fdc_ivars *ivar;
device_t child;
@@ -1292,8 +1292,7 @@ fdc_add_child(device_t dev, const char *name, int unit)
device_set_ivars(child, ivar);
if (resource_int_value(name, unit, "flags", &flags) == 0)
device_set_flags(child, flags);
- if (resource_int_value(name, unit, "disabled", &disabled) == 0
- && disabled != 0)
+ if (resource_disabled(name, unit))
device_disable(child);
}
diff --git a/sys/pc98/pc98/pc98kbd.c b/sys/pc98/pc98/pc98kbd.c
index 37fe6d258400..c7c793a09ff8 100644
--- a/sys/pc98/pc98/pc98kbd.c
+++ b/sys/pc98/pc98/pc98kbd.c
@@ -370,8 +370,7 @@ pckbd_configure(int flags)
if (resource_int_value(DRIVER_NAME, 0, "flags", &i) == 0) {
flags |= i;
/* if the driver is disabled, unregister the keyboard if any */
- if (resource_int_value(DRIVER_NAME, 0, "disabled", &i) == 0
- && i != 0) {
+ if (resource_disabled(DRIVER_NAME, 0)) {
i = kbd_find_keyboard(DRIVER_NAME, PC98KBD_DEFAULT);
if (i >= 0) {
kbd = kbd_get_keyboard(i);
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index 28eb52e63bd7..03f5041ea71c 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -4162,11 +4162,8 @@ siocnprobe(cp)
for (unit = 0; unit < 16; unit++) { /* XXX need to know how many */
int flags;
- int disabled;
- if (resource_int_value("sio", unit, "disabled", &disabled) == 0) {
- if (disabled)
- continue;
- }
+ if (resource_disabled("sio", unit))
+ continue;
if (resource_int_value("sio", unit, "flags", &flags))
continue;
if (COM_CONSOLE(flags) || COM_DEBUGGER(flags)) {
diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c
index 14a096ae9adf..1c9df05ed5ce 100644
--- a/sys/pc98/pc98/syscons_pc98.c
+++ b/sys/pc98/pc98/syscons_pc98.c
@@ -180,14 +180,12 @@ sc_softc_t
int
sc_get_cons_priority(int *unit, int *flags)
{
- int disabled;
const char *at;
int u, f;
*unit = -1;
for (u = 0; u < 16; u++) {
- if ((resource_int_value(SC_DRIVER_NAME, u, "disabled",
- &disabled) == 0) && disabled)
+ if (resource_disabled(SC_DRIVER_NAME, u))
continue;
if (resource_string_value(SC_DRIVER_NAME, u, "at", &at) != 0)
continue;
generated by cgit v1.3 (git 2.53.0) at 2026-07-30 02:28:41 +0000