From owner-cvs-sys Sat Jul 12 03:24:31 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.5/8.8.5) id DAA28835 for cvs-sys-outgoing; Sat, 12 Jul 1997 03:24:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id DAA28799; Sat, 12 Jul 1997 03:24:00 -0700 (PDT) From: Joerg Wunsch Received: (from joerg@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id DAA21148; Sat, 12 Jul 1997 03:23:33 -0700 (PDT) Date: Sat, 12 Jul 1997 03:23:33 -0700 (PDT) Message-Id: <199707121023.DAA21148@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG Subject: cvs commit: src/sys/i386/boot/biosboot bios.S boot.h io.c src/sys/i386/boot/cdboot Makefile bios.S io.c Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk joerg 1997/07/12 03:23:32 PDT Modified files: sys/i386/boot/biosboot bios.S boot.h io.c sys/i386/boot/cdboot Makefile Removed files: sys/i386/boot/cdboot bios.S io.c Log: Make this compile again under -current. The modifications to io.c and bios.S were small enough and have been merged back into their respective files in biosboot/, conditionalized on CDBOOT. Other files might be merged at a later stage. Caveat emptor: i cannot test this right now. Revision Changes Path 1.11 +127 -1 src/sys/i386/boot/biosboot/bios.S 1.20 +6 -2 src/sys/i386/boot/biosboot/boot.h 1.24 +32 -5 src/sys/i386/boot/biosboot/io.c 1.2 +2 -1 src/sys/i386/boot/cdboot/Makefile