Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/i386/i386 attach "vesabios"



details:   https://anonhg.NetBSD.org/src/rev/d4a9ab85e188
branches:  trunk
changeset: 533691:d4a9ab85e188
user:      drochner <drochner%NetBSD.org@localhost>
date:      Sun Jul 07 13:25:43 2002 +0000

description:
attach "vesabios"
(well, not really yet)

diffstat:

 sys/arch/i386/i386/mainbus.c |  19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diffs (61 lines):

diff -r 1006a7462f7c -r d4a9ab85e188 sys/arch/i386/i386/mainbus.c
--- a/sys/arch/i386/i386/mainbus.c      Sun Jul 07 13:24:36 2002 +0000
+++ b/sys/arch/i386/i386/mainbus.c      Sun Jul 07 13:25:43 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.38 2002/05/16 01:01:37 thorpej Exp $     */
+/*     $NetBSD: mainbus.c,v 1.39 2002/07/07 13:25:43 drochner Exp $    */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.38 2002/05/16 01:01:37 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.39 2002/07/07 13:25:43 drochner Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,6 +52,7 @@
 #include "apm.h"
 #include "pnpbios.h"
 #include "acpi.h"
+#include "vesabios.h"
 
 #if NAPM > 0
 #include <machine/bioscall.h>
@@ -70,6 +71,10 @@
 #include <dev/mca/mcavar.h>
 #endif
 
+#if NVESABIOS > 0
+#include <arch/i386/bios/vesabios.h>
+#endif
+
 int    mainbus_match __P((struct device *, struct cfdata *, void *));
 void   mainbus_attach __P((struct device *, struct device *, void *));
 
@@ -96,6 +101,9 @@
 #if NACPI > 0
        struct acpibus_attach_args mba_acpi;
 #endif
+#if NVESABIOS > 0
+       struct vesabios_attach_args mba_vba;
+#endif
 };
 
 /*
@@ -143,6 +151,13 @@
 
        printf("\n");
 
+#if NVESABIOS > 0
+       if (vbeprobe()) {
+               mba.mba_vba.vaa_busname = "vesabios";
+               config_found(self, &mba.mba_vba, mainbus_print);
+       }
+#endif
+
 #if NPCI > 0
        /*
         * ACPI needs to be able to access PCI configuration space.



Home | Main Index | Thread Index | Old Index