Remove (unused) references to bios32, which is not present in amd64.

ok deraadt@

2 files changed, 2 insertions, 48 deletions

diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index fe4602f8442..26cb2f3770c 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.42 2015/03/14 03:38:46 jsg Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.43 2015/07/17 21:53:56 mlarkin Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $	*/
 
 /*-
@@ -81,13 +81,6 @@
 #include <machine/i82489var.h>
 #endif
 
-#if 0
-#include "bios32.h"
-#if NBIOS32 > 0
-#include <machine/bios32.h>
-#endif
-#endif
-
 int	cold = 1;	/* if 1, still working on cold-start */
 extern dev_t bootdev;
 
@@ -114,10 +107,6 @@ extern int	amd64_has_aesni;
 void
 cpu_configure(void)
 {
-#if NBIOS32 > 0
-	bios32_init();
-#endif
-
 	x86_64_proc0_tss_ldt_init();
 
 	if (config_rootfound("mainbus", NULL) == NULL)
diff --git a/sys/arch/amd64/include/biosvar.h b/sys/arch/amd64/include/biosvar.h
index 800afc2edcd..aab56cf7b27 100644
--- a/sys/arch/amd64/include/biosvar.h
+++ b/sys/arch/amd64/include/biosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosvar.h,v 1.20 2015/01/27 01:42:26 mlarkin Exp $	*/
+/*	$OpenBSD: biosvar.h,v 1.21 2015/07/17 21:53:56 mlarkin Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -76,40 +76,8 @@ struct bios_romheader {
 	u_int16_t	pnpheader;	/* offset to PnP expansion header */
 } __packed *bios_romheader_t;
 
-/*
- * BIOS32
- */
-typedef
-struct bios32_header {
-	u_int32_t	signature;	/* 00: signature "_32_" */
-	u_int32_t	entry;		/* 04: entry point */
-	u_int8_t	rev;		/* 08: revision */
-	u_int8_t	length;		/* 09: header length */
-	u_int8_t	cksum;		/* 0a: modulo 256 checksum */
-	u_int8_t	reserved[5];
-} __packed *bios32_header_t;
-
-typedef
-struct bios32_entry_info {
-	paddr_t	bei_base;
-	psize_t	bei_size;
-	paddr_t	bei_entry;
-} __packed *bios32_entry_info_t;
-
-typedef
-struct bios32_entry {
-	u_int32_t offset;
-	u_int16_t segment;
-} __packed *bios32_entry_t;
-
-#define	BIOS32_START	0xe0000
-#define	BIOS32_SIZE	0x20000
-#define	BIOS32_END	(BIOS32_START + BIOS32_SIZE - 0x10)
-
 #define	BIOS32_MAKESIG(a, b, c, d) \
 	((a) | ((b) << 8) | ((c) << 16) | ((d) << 24))
-#define	BIOS32_SIGNATURE	BIOS32_MAKESIG('_', '3', '2', '_')
-#define	PCIBIOS_SIGNATURE	BIOS32_MAKESIG('$', 'P', 'C', 'I')
 #define	SMBIOS_SIGNATURE	BIOS32_MAKESIG('_', 'S', 'M', '_')
 
 /*
@@ -267,9 +235,6 @@ int bios_sysctl(int *, u_int, void *, size_t *, void *, size_t, struct proc *);
 void bios_getopt(void);
 bios_diskinfo_t *bios_getdiskinfo(dev_t);
 
-/* bios32.c */
-int  bios32_service(u_int32_t, bios32_entry_t, bios32_entry_info_t);
-
 extern u_int bootapiver;
 extern bios_memmap_t *bios_memmap;