diff options
author | nyan <nyan@FreeBSD.org> | 2009-03-19 13:53:42 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2009-03-19 13:53:42 +0000 |
commit | d6e3aa3174e0ad92ff44814835ab000b7acb5f21 (patch) | |
tree | 04785d5ce5ee76c80aa240ea27fa91eef4292271 /sys/boot/pc98 | |
parent | efdf4c607ba29a81adbcb5aefc15e67dc8be65f8 (diff) | |
download | FreeBSD-src-d6e3aa3174e0ad92ff44814835ab000b7acb5f21.zip FreeBSD-src-d6e3aa3174e0ad92ff44814835ab000b7acb5f21.tar.gz |
Reduce diffs against i386.
Diffstat (limited to 'sys/boot/pc98')
-rw-r--r-- | sys/boot/pc98/libpc98/Makefile | 5 | ||||
-rw-r--r-- | sys/boot/pc98/loader/Makefile | 1 | ||||
-rw-r--r-- | sys/boot/pc98/loader/main.c | 19 |
3 files changed, 14 insertions, 11 deletions
diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile index cc93af0..1a28b6b 100644 --- a/sys/boot/pc98/libpc98/Makefile +++ b/sys/boot/pc98/libpc98/Makefile @@ -5,8 +5,9 @@ INTERNALLIB= .PATH: ${.CURDIR}/../../i386/libi386 -SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ - bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ +SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \ + biospci.c biossmap.c bootinfo.c bootinfo32.c \ + comconsole.c devicename.c elf32_freebsd.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile index 91d5150..9f2e32f 100644 --- a/sys/boot/pc98/loader/Makefile +++ b/sys/boot/pc98/loader/Makefile @@ -18,6 +18,7 @@ CFLAGS+= -DLOADER_TFTP_SUPPORT CFLAGS+= -DLOADER_NFS_SUPPORT .endif +# Include bcache code. HAVE_BCACHE= yes # Enable PnP and ISA-PnP code. diff --git a/sys/boot/pc98/loader/main.c b/sys/boot/pc98/loader/main.c index 83e9bdf..6573990 100644 --- a/sys/boot/pc98/loader/main.c +++ b/sys/boot/pc98/loader/main.c @@ -145,6 +145,14 @@ main(void) bc_add(initial_bootdev); } + archsw.arch_autoload = i386_autoload; + archsw.arch_getdev = i386_getdev; + archsw.arch_copyin = i386_copyin; + archsw.arch_copyout = i386_copyout; + archsw.arch_readin = i386_readin; + archsw.arch_isainb = isa_inb; + archsw.arch_isaoutb = isa_outb; + /* * March through the device switch probing for things. */ @@ -163,14 +171,6 @@ main(void) extract_currdev(); /* set $currdev and $loaddev */ setenv("LINES", "24", 1); /* optional */ - - archsw.arch_autoload = i386_autoload; - archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = i386_copyin; - archsw.arch_copyout = i386_copyout; - archsw.arch_readin = i386_readin; - archsw.arch_isainb = isa_inb; - archsw.arch_isaoutb = isa_outb; interact(); /* doesn't return */ @@ -188,7 +188,8 @@ static void extract_currdev(void) { struct i386_devdesc new_currdev; - int major, biosdev = -1; + int major; + int biosdev = -1; /* Assume we are booting from a BIOS disk by default */ new_currdev.d_dev = &biosdisk; |