diff options
| author | jhb <jhb@FreeBSD.org> | 2000-03-24 22:24:09 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-03-24 22:24:09 +0000 |
| commit | 8c16543d9445bfdfdf39ec01f272921f5e88cde6 (patch) | |
| tree | 82258ff99de9d670403b2228c717c4ffb80cb5ed /release | |
| parent | be6d92e8bf9eb4c46cca7d7ed3ff422e572a410c (diff) | |
| download | FreeBSD-src-8c16543d9445bfdfdf39ec01f272921f5e88cde6.zip FreeBSD-src-8c16543d9445bfdfdf39ec01f272921f5e88cde6.tar.gz | |
Update sysinstall to use struct uc_device instead of struct isa_device
for generating /boot/kernel.conf. Since this structure is shared, move
its definition out to a header file, just as struct isa_device was defined
in a header file. This fixes the sysinstall breakage in -current.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/Makefile | 1 | ||||
| -rw-r--r-- | release/sysinstall/kget.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index a433558..3e9dc68 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -18,7 +18,6 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \ keymap.h CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -CFLAGS+= -I${.CURDIR}/../../sys .if ${MACHINE_ARCH} != "i386" || defined(X_AS_PKG) CFLAGS+= -DX_AS_PKG .endif diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c index 20bf4b5..907a151 100644 --- a/release/sysinstall/kget.c +++ b/release/sysinstall/kget.c @@ -37,7 +37,7 @@ kget(char *out) #include "sysinstall.h" #include <sys/sysctl.h> -#include <i386/isa/isa_device.h> +#include <machine/uc_device.h> int kget(char *out) @@ -47,7 +47,7 @@ kget(char *out) char *mib1 = "machdep.uc_devlist"; char name[9]; FILE *fout = NULL; - struct isa_device *id; + struct uc_device *id; char *p; /* create the output file; if we end up not writing to it, we'll @@ -79,8 +79,8 @@ kget(char *out) i = 0; while (i < len) { - id = (struct isa_device *)(buf + i); - p = (buf + i + sizeof(struct isa_device)); + id = (struct uc_device *)(buf + i); + p = (buf + i + sizeof(struct uc_device)); strncpy(name, p, 8); if (!id->id_enabled) { bytes_written += fprintf(fout, "di %s%d\n", name, id->id_unit); @@ -110,7 +110,7 @@ kget(char *out) bytes_written += fprintf(fout, "f %s%d %#x\n", name, id->id_unit, id->id_flags); } - i += sizeof(struct isa_device) + 8; + i += sizeof(struct uc_device) + 8; } bail: |
