As we now have two bios_consdev_t structures, make use of the old one

until the bootstrap populates the new structure.

Found the hard way by Hrvoje Popovski.

ok kettenis@

diff --git a/sys/arch/amd64/stand/efiboot/exec_i386.c b/sys/arch/amd64/stand/efiboot/exec_i386.c
index ea8fa67..08f68c3 100644 (file)
--- a/sys/arch/amd64/stand/efiboot/exec_i386.c
+++ b/sys/arch/amd64/stand/efiboot/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.7 2021/10/24 17:49:19 deraadt Exp $   */
+/*     $OpenBSD: exec_i386.c,v 1.8 2022/06/30 15:46:57 anton Exp $     */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -72,7 +72,7 @@ run_loadfile(uint64_t *marks, int howto)
        dev_t bootdev = bootdev_dip->bootdev;
        size_t ac = BOOTARG_LEN;
        caddr_t av = (caddr_t)BOOTARG_OFF;
-       bios_consdev_t cd;
+       bios_oconsdev_t cd;
        extern int com_speed; /* from bioscons.c */
        extern int com_addr;
        bios_ddb_t ddb;

diff --git a/sys/arch/amd64/stand/libsa/exec_i386.c b/sys/arch/amd64/stand/libsa/exec_i386.c
index 2206793..f5900bc 100644 (file)
--- a/sys/arch/amd64/stand/libsa/exec_i386.c
+++ b/sys/arch/amd64/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: exec_i386.c,v 1.35 2021/10/24 17:49:19 deraadt Exp $  */
+/*     $OpenBSD: exec_i386.c,v 1.36 2022/06/30 15:46:57 anton Exp $    */
 
 /*
  * Copyright (c) 1997-1998 Michael Shalayeff
@@ -91,7 +91,7 @@ run_loadfile(uint64_t *marks, int howto)
        dev_t bootdev = bootdev_dip->bootdev;
        size_t ac = BOOTARG_LEN;
        caddr_t av = (caddr_t)BOOTARG_OFF;
-       bios_consdev_t cd;
+       bios_oconsdev_t cd;
        extern int com_speed; /* from bioscons.c */
        extern int com_addr;
        bios_ddb_t ddb;