From b30de97d4acfcd79cc3c5aa8ebe33237055e4d04 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Mon, 13 May 2024 00:16:09 +0000
Subject: [PATCH] remove some unused defines and externs

isaphysmem and isaphysmempgs were removed in 1998
ok kettenis@
---
 sys/arch/amd64/include/isa_machdep.h | 32 +----------------
 sys/arch/i386/isa/isa_machdep.h      | 54 +---------------------------
 2 files changed, 2 insertions(+), 84 deletions(-)

diff --git a/sys/arch/amd64/include/isa_machdep.h b/sys/arch/amd64/include/isa_machdep.h
index 0a094aa766a..43d6e584878 100644
--- a/sys/arch/amd64/include/isa_machdep.h
+++ b/sys/arch/amd64/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.9 2008/12/11 17:07:14 oga Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.10 2024/05/13 00:16:09 jsg Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.2 2003/05/09 23:51:28 fvdl Exp $	*/
 
 /*-
@@ -149,36 +149,6 @@ struct isa_dma_cookie {
 #define	ID_HAS_BOUNCE		0x02	/* map currently has bounce buffers */
 #define	ID_IS_BOUNCING		0x04	/* map is bouncing current xfer */
 
-
-
-/*
- * XXX Various seemingly PC-specific constants, some of which may be
- * unnecessary anyway.
- */
-
-/*
- * RAM Physical Address Space (ignoring the above mentioned "hole")
- */
-#define	RAM_BEGIN	0x0000000	/* Start of RAM Memory */
-#define	RAM_END		0x1000000	/* End of RAM Memory */
-#define	RAM_SIZE	(RAM_END - RAM_BEGIN)
-
-/*
- * Oddball Physical Memory Addresses
- */
-#define	COMPAQ_RAMRELOC	0x80c00000	/* Compaq RAM relocation/diag */
-#define	COMPAQ_RAMSETUP	0x80c00002	/* Compaq RAM setup */
-#define	WEITEK_FPU	0xC0000000	/* WTL 2167 */
-#define	CYRIX_EMC	0xC0000000	/* Cyrix EMC */
-
-/*
- * stuff that used to be in pccons.c
- */
-#define	MONO_BASE	0x3B4
-#define	MONO_BUF	0xB0000
-#define	CGA_BASE	0x3D4
-#define	CGA_BUF		0xB8000
-
 /*
  * Variables and macros to deal with the ISA I/O hole.
  * XXX These should be converted to machine- and bus-mapping-independent
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 10c246610ea..ce9e6c05816 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.25 2009/08/22 02:54:50 mk Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.26 2024/05/13 00:16:09 jsg Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $	*/
 
 /*-
@@ -138,58 +138,6 @@ struct isa_dma_cookie {
 #define	ID_HAS_BOUNCE		0x02	/* map currently has bounce buffers */
 #define	ID_IS_BOUNCING		0x04	/* map is bouncing current xfer */
 
-/*
- * XXX Various seemingly PC-specific constants, some of which may be
- * unnecessary anyway.
- */
-
-/*
- * RAM Physical Address Space (ignoring the above mentioned "hole")
- */
-#define	RAM_BEGIN	0x0000000	/* Start of RAM Memory */
-#define	RAM_END		0x1000000	/* End of RAM Memory */
-#define	RAM_SIZE	(RAM_END - RAM_BEGIN)
-
-/*
- * Oddball Physical Memory Addresses
- */
-#define	COMPAQ_RAMRELOC	0x80c00000	/* Compaq RAM relocation/diag */
-#define	COMPAQ_RAMSETUP	0x80c00002	/* Compaq RAM setup */
-#define	WEITEK_FPU	0xC0000000	/* WTL 2167 */
-#define	CYRIX_EMC	0xC0000000	/* Cyrix EMC */
-
-/*
- * stuff that used to be in pccons.c
- */
-#define	MONO_BUF	0xB0000
-#define	CGA_BUF		0xB8000
-#define	IOPHYSMEM	0xA0000
-
-
-/*
- * ISA DMA bounce buffers.
- * XXX should be made partially machine- and bus-mapping-independent.
- *
- * DMA_BOUNCE is the number of pages of low-addressed physical memory
- * to acquire for ISA bounce buffers. If physical memory below 16 MB
- * then DMA_BOUNCE_LOW will be used.
- *
- * isaphysmem is the address of this physical contiguous low memory.
- * isaphysmempgs is the number of pages allocated.
- */
-
-#ifndef DMA_BOUNCE
-#define	DMA_BOUNCE      48		/* number of pages if memory > 16M */
-#endif
-
-#ifndef DMA_BOUNCE_LOW
-#define	DMA_BOUNCE_LOW  16		/* number of pages if memory <= 16M */
-#endif
-
-extern vaddr_t isaphysmem;
-extern int isaphysmempgs;
-
-
 /*
  * Variables and macros to deal with the ISA I/O hole.
  * XXX These should be converted to machine- and bus-mapping-independent
-- 
2.20.1