diff options
| author | KATO Takenori <kato@FreeBSD.org> | 2000-06-17 04:54:50 +0000 |
|---|---|---|
| committer | KATO Takenori <kato@FreeBSD.org> | 2000-06-17 04:54:50 +0000 |
| commit | 2d43b347eca07fe6b1ee8a3819d9a5b838653713 (patch) | |
| tree | cb8657d5e38c1cd082e4442a8b29fdafd3028b37 /sys/pc98 | |
| parent | 869f0b9b22ba42bfccefff390a3a4e571e4a06be (diff) | |
| download | src-2d43b347eca07fe6b1ee8a3819d9a5b838653713.tar.gz src-2d43b347eca07fe6b1ee8a3819d9a5b838653713.zip | |
Merged from sys/isa/syscons_isa.c revision 1.13.
Notes
Notes:
svn path=/head/; revision=61742
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/syscons_cbus.c | 9 | ||||
| -rw-r--r-- | sys/pc98/pc98/syscons_pc98.c | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c index 7a8b584b175e..28f26d48e381 100644 --- a/sys/pc98/cbus/syscons_cbus.c +++ b/sys/pc98/cbus/syscons_cbus.c @@ -148,15 +148,16 @@ int sc_get_cons_priority(int *unit, int *flags) { int disabled; + char *at; int u, f; - int i; *unit = -1; - for (i = -1; (i = resource_locate(i, SC_DRIVER_NAME)) >= 0;) { - u = resource_query_unit(i); + for (u = 0; u < 16; u++) { if ((resource_int_value(SC_DRIVER_NAME, u, "disabled", &disabled) == 0) && disabled) continue; + if (resource_string_value(SC_DRIVER_NAME, u, "at", &at) != 0) + continue; if (resource_int_value(SC_DRIVER_NAME, u, "flags", &f) != 0) f = 0; if (f & SC_KERNEL_CONSOLE) { @@ -171,7 +172,7 @@ sc_get_cons_priority(int *unit, int *flags) *flags = f; } } - if ((i < 0) && (*unit < 0)) + if (*unit < 0) return CN_DEAD; return CN_INTERNAL; } diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c index 7a8b584b175e..28f26d48e381 100644 --- a/sys/pc98/pc98/syscons_pc98.c +++ b/sys/pc98/pc98/syscons_pc98.c @@ -148,15 +148,16 @@ int sc_get_cons_priority(int *unit, int *flags) { int disabled; + char *at; int u, f; - int i; *unit = -1; - for (i = -1; (i = resource_locate(i, SC_DRIVER_NAME)) >= 0;) { - u = resource_query_unit(i); + for (u = 0; u < 16; u++) { if ((resource_int_value(SC_DRIVER_NAME, u, "disabled", &disabled) == 0) && disabled) continue; + if (resource_string_value(SC_DRIVER_NAME, u, "at", &at) != 0) + continue; if (resource_int_value(SC_DRIVER_NAME, u, "flags", &f) != 0) f = 0; if (f & SC_KERNEL_CONSOLE) { @@ -171,7 +172,7 @@ sc_get_cons_priority(int *unit, int *flags) *flags = f; } } - if ((i < 0) && (*unit < 0)) + if (*unit < 0) return CN_DEAD; return CN_INTERNAL; } |