From owner-cvs-sys Wed Oct 23 00:25:49 1996 Return-Path: owner-cvs-sys Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA01792 for cvs-sys-outgoing; Wed, 23 Oct 1996 00:25:49 -0700 (PDT) Received: (from asami@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA01775; Wed, 23 Oct 1996 00:25:41 -0700 (PDT) Date: Wed, 23 Oct 1996 00:25:41 -0700 (PDT) From: Satoshi Asami Message-Id: <199610230725.AAA01775@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys/pc98/i386 locore.s machdep.c trap.c userconfig.c vm_machdep.c pmap.c src/sys/pc98/pc98 aic_98.h epsonio.h aic6360.c clock.c fd.c if_ed.c pc98.c pc98.h pc98_machdep.c random_machdep.c syscons.c syscons.h wd.c src/sys/pc98/boot/biosboot Makefile boot.c boot.h boot2.S disk.c io.c src/sys/pc98/boot/rawboot Makefile src/sys/pc98/conf GENERIC98 Makefile.pc98 files.pc98 majors.pc98 options.pc98 Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk asami 96/10/23 00:25:40 Modified: sys/pc98/boot/biosboot Makefile boot.c boot.h boot2.S disk.c io.c sys/pc98/boot/rawboot Makefile sys/pc98/conf GENERIC98 Makefile.pc98 files.pc98 majors.pc98 options.pc98 sys/pc98/i386 locore.s machdep.c trap.c userconfig.c vm_machdep.c sys/pc98/pc98 aic6360.c clock.c fd.c if_ed.c pc98.c pc98.h pc98_machdep.c random_machdep.c syscons.c syscons.h wd.c Added: sys/pc98/pc98 aic_98.h epsonio.h Removed: sys/pc98/i386 pmap.c Log: Another round of merge. (1) Bug fix (pass boot drive): pc98/boot/biosboot/boot2.S (2) Delete code for unsupported high-resolution modes and move old Epson notebook code to epsonio.h: pc98/boot/biosboot/io.c pc98/i386/vm_machdep.c pc98/pc98/fd.c pc98/pc98/pc98.c pc98/pc98/pc98.h pc98/pc98/epsonio.h (new) (3) Change aic driver so that PCMCIA cards (I/O port same as PC/AT) and PC-9801-100 cards can be selected with a flag in kernel config file: pc98/pc98/aic6360.c pc98/pc98/aic_98.h (new) (4) Fix wcd entry (it was broken). Delete mcd, it doesn't work on 98. Change aic entry according to above: pc98/conf/GENERIC98 (5) Move pc98_machdep.c to top of files in pc98/pc98: pc98/conf/files.pc98 (6) Delete empty lines: pc98/i386/locore.s (7) Fix (it didn't work if I586 was specified): pc98/pc98/clock.c (8) Staticize: pc98/pc98/pc98_machdep.c (9) Enable workaround for Cyrix bug for 5x86 also: pc98/i386/machdep.c pc98/i386/trap.c All the above deletes this file too: pc98/i386/pmap.c (phew!) Submitted by: The FreeBSD(98) Development Team Revision Changes Path 1.4 +26 -8 src/sys/pc98/boot/biosboot/Makefile 1.6 +15 -1 src/sys/pc98/boot/biosboot/boot.c 1.4 +1 -2 src/sys/pc98/boot/biosboot/boot.h 1.4 +1 -0 src/sys/pc98/boot/biosboot/boot2.S 1.5 +8 -6 src/sys/pc98/boot/biosboot/disk.c 1.5 +3 -4 src/sys/pc98/boot/biosboot/io.c 1.2 +27 -9 src/sys/pc98/boot/rawboot/Makefile 1.7 +7 -11 src/sys/pc98/conf/GENERIC98 1.7 +3 -11 src/sys/pc98/conf/Makefile.pc98 1.8 +4 -3 src/sys/pc98/conf/files.pc98 1.4 +3 -2 src/sys/pc98/conf/majors.pc98 1.6 +12 -1 src/sys/pc98/conf/options.pc98 1.5 +1 -2 src/sys/pc98/i386/locore.s 1.10 +3 -2 src/sys/pc98/i386/machdep.c 1.8 +12 -13 src/sys/pc98/i386/trap.c 1.8 +110 -65 src/sys/pc98/i386/userconfig.c 1.6 +3 -3 src/sys/pc98/i386/vm_machdep.c 1.5 +15 -41 src/sys/pc98/pc98/aic6360.c 1.8 +28 -28 src/sys/pc98/pc98/clock.c 1.7 +2 -1 src/sys/pc98/pc98/fd.c 1.9 +88 -105 src/sys/pc98/pc98/if_ed.c 1.9 +4 -9 src/sys/pc98/pc98/pc98.c 1.6 +1 -48 src/sys/pc98/pc98/pc98.h 1.5 +15 -16 src/sys/pc98/pc98/pc98_machdep.c 1.8 +1 -3 src/sys/pc98/pc98/random_machdep.c 1.11 +45 -20 src/sys/pc98/pc98/syscons.c 1.5 +4 -2 src/sys/pc98/pc98/syscons.h 1.9 +3 -3 src/sys/pc98/pc98/wd.c