diff options
| author | asami <asami@FreeBSD.org> | 1996-11-09 00:39:59 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-11-09 00:39:59 +0000 |
| commit | 89988533eabd3c06d450d94a69baa027fe72e350 (patch) | |
| tree | 91216b6f4a039a62b2f95033f86cbff5f01563ae /sys/pc98/i386 | |
| parent | bf6d735fd02f61adac96742487d7113bc35fc006 (diff) | |
| download | FreeBSD-src-89988533eabd3c06d450d94a69baa027fe72e350.zip FreeBSD-src-89988533eabd3c06d450d94a69baa027fe72e350.tar.gz | |
Re-sync with -current. Should be in 2.2.
Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/pc98/i386')
| -rw-r--r-- | sys/pc98/i386/locore.s | 4 | ||||
| -rw-r--r-- | sys/pc98/i386/userconfig.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/pc98/i386/locore.s b/sys/pc98/i386/locore.s index 725b478..12fe5b4 100644 --- a/sys/pc98/i386/locore.s +++ b/sys/pc98/i386/locore.s @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $Id: locore.s,v 1.4 1996/10/09 21:45:53 asami Exp $ + * $Id: locore.s,v 1.5 1996/10/23 07:24:59 asami Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -690,7 +690,7 @@ olddiskboot: movl %eax,R(_bootdev) #if defined(USERCONFIG_BOOT) && defined(USERCONFIG) - movl $0x10200, %esi + movl $0x90200, %esi movl $R(_userconfig_from_boot),%edi movl $512,%ecx cld diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c index d15a654..df69c93 100644 --- a/sys/pc98/i386/userconfig.c +++ b/sys/pc98/i386/userconfig.c @@ -46,7 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** - ** $Id: userconfig.c,v 1.10 1996/10/30 22:39:36 asami Exp $ + ** $Id: userconfig.c,v 1.11 1996/11/02 10:39:03 asami Exp $ **/ /** @@ -323,6 +323,7 @@ static DEV_INFO device_info[] = { {"lkm", "Loadable PCI driver support", FLG_INVISIBLE, CLS_MISC}, {"vga", "Catchall PCI VGA driver", FLG_INVISIBLE, CLS_MISC}, {"chip", "PCI chipset support", FLG_INVISIBLE, CLS_MISC}, +{"piix", "Intel 82371 Bus-master IDE controller", FLG_INVISIBLE, CLS_MISC}, {"","",0,0}}; @@ -706,6 +707,10 @@ savelist(DEV_LIST *list, int active) { if ((list->comment == DEV_DEVICE) && list->changed) { + if ((list->iobase == -2) || /* is a PCI device; can't save */ + (list->device == NULL)) /* no isa_device associated at all?! */ + continue; + setdev(list,active); /* set the device itself */ id_pn = NULL; @@ -2249,7 +2254,7 @@ visuserconfig(void) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: userconfig.c,v 1.63 1996/10/30 21:40:15 julian Exp $ + * $Id: userconfig.c,v 1.11 1996/11/02 10:39:03 asami Exp $ */ #include "scbus.h" |
