From: miod <miod@openbsd.org>
Date: Sun, 31 Mar 2024 09:49:33 +0000 (+0000)
Subject: Remove long dead isa-on-powerpc leftovers.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3a08e0526a390aab19b2040fd8d3ff6b3b4982dc;p=openbsd

Remove long dead isa-on-powerpc leftovers.
---

diff --git a/sys/arch/powerpc/isa/isa_machdep.h b/sys/arch/powerpc/isa/isa_machdep.h
deleted file mode 100644
index bcf08328174..00000000000
--- a/sys/arch/powerpc/isa/isa_machdep.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$OpenBSD: isa_machdep.h,v 1.9 2021/03/11 11:16:59 jsg Exp $ */
-
-/*
- * Copyright (c) 1997 Per Fogelstrom
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed under OpenBSD by
- *	Per Fogelstrom, Opsycon AB, Sweden.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-#ifndef _ISA_MACHDEP_H_
-#define _ISA_MACHDEP_H_
-
-typedef struct ppc_isa_bus *isa_chipset_tag_t;
-
-/*
- *      I/O macros to access isa bus ports/memory.
- *      At the first glance these macros may seem inefficient.
- *      However, the cpu executes an instruction every <10 ns
- *      so the bus is much slower so it doesn't matter, really.
- */
-extern bus_space_handle_t ppc_isa_io_vaddr;
-#define isa_outb(x,y)   outb(ppc_isa_io_vaddr + (x), (y))
-#define isa_inb(x)   inb(ppc_isa_io_vaddr + (x))
- 
-struct ppc_isa_bus {
-        void    *ic_data;
-
-        void    (*ic_attach_hook) (struct device *, struct device *,
-                    struct isabus_attach_args *);
-        void    *(*ic_intr_establish) (void *, int, int, int,
-                    int (*)(void *), void *, char *);
-        void    (*ic_intr_disestablish) (void *, void *);
-};
-
-
-/*
- * Functions provided to machine-independent ISA code.
- */
-#define isa_attach_hook(p, s, a)                             /*           \
-    (*(a)->iba_ic->ic_attach_hook)((p), (s), (a)) */
-#define isa_intr_establish(c, i, t, l, f, a, w)                         \
-    (*(c)->ic_intr_establish)((c)->ic_data, (i), (t), (l), (f), (a), (w))
-#define isa_intr_disestablish(c, h)                                     \
-    (*(c)->ic_intr_disestablish)((c)->ic_data, (h))
-
-#define __NO_ISA_INTR_CHECK	/* FIXME */
-
-#define ICU_LEN	16		/* Number of possible interrupt sources */
-
-extern void * isabr_intr_establish(void *, int, int, int,                             int (*ih_fun) (void *), void *, char *);                              
-#endif /* _ISA_MACHDEP_H_ */
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index ae0cb642f24..1fe9c1293b6 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isavar.h,v 1.58 2014/03/18 22:36:37 miod Exp $	*/
+/*	$OpenBSD: isavar.h,v 1.59 2024/03/31 09:49:33 miod Exp $	*/
 /*	$NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $	*/
 
 /*-
@@ -119,8 +119,6 @@ struct isabus_attach_args;
 #include <alpha/isa/isa_machdep.h>
 #elif defined(__i386__)
 #include <i386/isa/isa_machdep.h>
-#elif defined(__powerpc__)
-#include <powerpc/isa/isa_machdep.h>
 #else
 #include <machine/isa_machdep.h>
 #endif