From aec57fdb8140b5d07a7706ec8127707f7b9587c5 Mon Sep 17 00:00:00 2001
From: aoyama <aoyama@openbsd.org>
Date: Sat, 1 Jun 2024 00:48:16 +0000
Subject: [PATCH] Move common definitions into the header file.

No binary change.
---
 sys/arch/luna88k/cbus/cbusvar.h     | 7 ++++++-
 sys/arch/luna88k/cbus/i82365_cbus.c | 5 +----
 sys/arch/luna88k/cbus/if_ne_cbus.c  | 4 +---
 sys/arch/luna88k/cbus/necsb.c       | 3 +--
 sys/arch/luna88k/cbus/pcex.c        | 5 +----
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/sys/arch/luna88k/cbus/cbusvar.h b/sys/arch/luna88k/cbus/cbusvar.h
index aad77312716..0711211c688 100644
--- a/sys/arch/luna88k/cbus/cbusvar.h
+++ b/sys/arch/luna88k/cbus/cbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cbusvar.h,v 1.5 2019/06/29 04:33:11 aoyama Exp $	*/
+/*	$OpenBSD: cbusvar.h,v 1.6 2024/06/01 00:48:16 aoyama Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
@@ -23,6 +23,11 @@
 #include <sys/evcount.h>
 #include <sys/queue.h>
 
+#include <arch/luna88k/include/board.h>
+
+#define	PCEXMEM_BASE	PC_BASE
+#define	PCEXIO_BASE	(PC_BASE + 0x1000000)
+
 /*
  * Currently 7 level C-bus interrupts (INT0 - INT6) are supported.
  */
diff --git a/sys/arch/luna88k/cbus/i82365_cbus.c b/sys/arch/luna88k/cbus/i82365_cbus.c
index a69a143cefc..6dc325f538e 100644
--- a/sys/arch/luna88k/cbus/i82365_cbus.c
+++ b/sys/arch/luna88k/cbus/i82365_cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_cbus.c,v 1.8 2024/05/02 09:38:59 aoyama Exp $	*/
+/*	$OpenBSD: i82365_cbus.c,v 1.9 2024/06/01 00:48:16 aoyama Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
 
 /*
@@ -76,9 +76,6 @@
 #define  PCIC_CIRRUS_MISC_CTL_1_PULSE_MGMT_INTR	0x04
 #define  PCIC_CIRRUS_MISC_CTL_1_PULSE_SYS_IRQ	0x08
 
-#define PCEXMEM_BASE		PC_BASE
-#define PCEXIO_BASE		PC_BASE + 0x1000000
-
 /* prototypes */
 void	*pcic_cbus_chip_intr_establish(pcmcia_chipset_handle_t,
 	    struct pcmcia_function *, int, int (*) (void *), void *, char *);
diff --git a/sys/arch/luna88k/cbus/if_ne_cbus.c b/sys/arch/luna88k/cbus/if_ne_cbus.c
index 3e1e87581a5..70fe8019204 100644
--- a/sys/arch/luna88k/cbus/if_ne_cbus.c
+++ b/sys/arch/luna88k/cbus/if_ne_cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_cbus.c,v 1.4 2024/05/02 09:38:59 aoyama Exp $	*/
+/*	$OpenBSD: if_ne_cbus.c,v 1.5 2024/06/01 00:48:16 aoyama Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -81,8 +81,6 @@
 
 #include <arch/luna88k/cbus/cbusvar.h>
 
-#define PCEXIO_BASE		PC_BASE + 0x1000000
-
 /* bus space tag for if_ne_cbus */
 struct luna88k_bus_space_tag ne_cbus_io_bst = {
 	.bs_stride_1 = 0,
diff --git a/sys/arch/luna88k/cbus/necsb.c b/sys/arch/luna88k/cbus/necsb.c
index 6fbfbccd793..2e5eff83751 100644
--- a/sys/arch/luna88k/cbus/necsb.c
+++ b/sys/arch/luna88k/cbus/necsb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: necsb.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
+/*	$OpenBSD: necsb.c,v 1.6 2024/06/01 00:48:16 aoyama Exp $	*/
 /*	$NecBSD: nec86_isa.c,v 1.9 1998/09/26 11:31:11 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
@@ -47,7 +47,6 @@
 
 #include <luna88k/cbus/cbusvar.h>	/* cbus_isrlink() */
 
-#define	PCEXIO_BASE	(PC_BASE + 0x1000000)
 #define	NECSB_BASE	(PCEXIO_BASE + 0xa460)
 
 int	necsb_match(struct device *, void *, void *);
diff --git a/sys/arch/luna88k/cbus/pcex.c b/sys/arch/luna88k/cbus/pcex.c
index fb40842845c..0cbbd91f46f 100644
--- a/sys/arch/luna88k/cbus/pcex.c
+++ b/sys/arch/luna88k/cbus/pcex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcex.c,v 1.4 2019/10/08 13:14:49 cheloha Exp $	*/
+/*	$OpenBSD: pcex.c,v 1.5 2024/06/01 00:48:16 aoyama Exp $	*/
 
 /*
  * Copyright (c) 2014 Kenji Aoyama.
@@ -38,9 +38,6 @@ extern int hz;
 #define PCEX_DEBUG
 #endif
 
-#define PCEXMEM_BASE	PC_BASE
-#define PCEXIO_BASE	(PC_BASE + 0x1000000)
-
 /* autoconf stuff */
 int pcex_match(struct device *, void *, void *);
 void pcex_attach(struct device *, struct device *, void *);
-- 
2.20.1