 @@ -1,14 +1,14 @@
-/*	$NetBSD: x86_autoconf.c,v 1.42 2009/08/24 11:04:29 jmcneill Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.43 2009/08/24 11:35:27 jmcneill Exp $	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,83 +25,103 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)autoconf.c	7.1 (Berkeley) 5/9/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.42 2009/08/24 11:04:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.43 2009/08/24 11:35:27 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
 #include <sys/disk.h>
 #include <sys/proc.h>
 #include <sys/md5.h>
 #include <sys/kauth.h>
 #include <machine/bootinfo.h>
 #include <machine/pio.h>
 #include "acpica.h"
 #include "pci.h"
 #include "genfb.h"
 #include "wsdisplay.h"
 #include "opt_vga.h"
 #ifdef VGA_POST
 #include <x86/vga_post.h>
 #endif
 #include <dev/isa/isavar.h>
 #if NPCI > 0
 #include <dev/pci/pcivar.h>
 #endif
 #include <dev/wsfb/genfbvar.h>
 #include <dev/pci/genfb_pcivar.h>
 #include <dev/ic/vgareg.h>
 static struct genfb_colormap_callback gfb_cb;
 static struct genfb_pmf_callback pmf_cb;
 #ifdef VGA_POST
 static struct vga_post *vga_posth = NULL;
 #endif
 struct disklist *x86_alldisks;
 int x86_ndisks;
 #if NPCI > 0
 static void
 x86_genfb_set_mapreg(void *opaque, int index, int r, int g, int b)
+{
 	outb(0x3c0 + VGA_DAC_ADDRW, index);
 	outb(0x3c0 + VGA_DAC_PALETTE, (uint8_t)r >> 2);
 	outb(0x3c0 + VGA_DAC_PALETTE, (uint8_t)g >> 2);
 	outb(0x3c0 + VGA_DAC_PALETTE, (uint8_t)b >> 2);
+}
 static bool
 x86_genfb_suspend(device_t dev PMF_FN_ARGS)
+{
 	return true;
+}
 static bool
 x86_genfb_resume(device_t dev PMF_FN_ARGS)
+{
-	struct genfb_softc *sc = device_private(dev);
+	struct pci_genfb_softc *psc = device_private(dev);
 #if NACPICA > 0 && defined(VGA_POST)
 	extern int acpi_md_vbios_reset;
 	extern int acpi_md_vesa_modenum;
 #endif
-	genfb_restore_palette(sc);
+#if NACPICA > 0 && defined(VGA_POST)
 	if (vga_posth != NULL && acpi_md_vbios_reset == 2) {
 		vga_post_call(vga_posth);
 		if (acpi_md_vesa_modenum != 0)
 			vga_post_set_vbe(vga_posth, acpi_md_vesa_modenum);
+	}
 #endif
 	genfb_restore_palette(&psc->sc_gen);
 	return true;
+}
 #endif
 static void
 handle_wedges(device_t dv, int par)
+{
 	if (config_handle_wedges(dv, par) == 0)
 		return;
 	booted_device = dv;
 	booted_partition = par;
+}
 @@ -608,26 +628,30 @@ device_register(device_t dev, void *aux)
 			prop_dictionary_set_bool(dict, "splash",
 			    fbinfo->flags & BI_FB_SPLASH ? true : false);
 #endif
 			if (fbinfo->depth == 8) {
 				gfb_cb.gcc_cookie = NULL;
 				gfb_cb.gcc_set_mapreg = x86_genfb_set_mapreg;
 				prop_dictionary_set_uint64(dict,
 				    "cmap_callback", (uint64_t)&gfb_cb);
+			}
 			pmf_cb.gpc_suspend = x86_genfb_suspend;
 			pmf_cb.gpc_resume = x86_genfb_resume;
 			prop_dictionary_set_uint64(dict,
 			    "pmf_callback", (uint64_t)&pmf_cb);
 #ifdef VGA_POST
 			vga_posth = vga_post_init(pa->pa_bus, pa->pa_device,
 			    pa->pa_function);
 #endif
 			found_console = true;
 			return;
+		}
+	}
 #endif
 	return;
  found:
 	if (booted_device) {
 		/* XXX should be a panic() */
 		printf("WARNING: double match for boot device (%s, %s)\n",
 		    device_xname(booted_device), device_xname(dev));
 		return;