bios_dev -> ba_name and bios_apmp -> ba_apmp in DPRINTF statements.

i386 kernels compile with BIOS_DEBUG again.

Spotted by Mathias Schmocker.

diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 2fc18ec..a431049 100644 (file)
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: apm.c,v 1.81 2007/12/11 15:44:00 tedu Exp $   */
+/*     $OpenBSD: apm.c,v 1.82 2008/08/16 00:26:26 krw Exp $    */
 
 /*-
  * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -751,7 +751,7 @@ apmprobe(struct device *parent, void *match, void *aux)
 
        if (apm_cd.cd_ndevs || strcmp(ba->ba_name, "apm") ||
            !(ba->ba_apmp->apm_detail & APM_32BIT_SUPPORTED)) {
-               DPRINTF(("%s: %x\n", ba->bios_dev, ba->bios_apmp->apm_detail));
+               DPRINTF(("%s: %x\n", ba->ba_name, ba->ba_apmp->apm_detail));
                return 0;
        }
 

diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index b12fbe7..1c94a6f 100644 (file)
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bios.c,v 1.81 2008/06/08 13:55:06 kettenis Exp $      */
+/*     $OpenBSD: bios.c,v 1.82 2008/08/16 00:26:26 krw Exp $   */
 
 /*
  * Copyright (c) 1997-2001 Michael Shalayeff
@@ -132,7 +132,7 @@ biosprobe(struct device *parent, void *match, void *aux)
 
 #ifdef BIOS_DEBUG
        printf("%s%d: boot API ver %x, %x; args %p[%d]\n",
-           bia->bios_dev, bios_cd.cd_ndevs,
+           bia->ba_name, bios_cd.cd_ndevs,
            bootapiver, BOOTARG_APIVER, bootargp, bootargc);
 #endif
        /* there could be only one */