summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorJeremie Courreges-Anglas <jca@cvs.openbsd.org>2016-12-30 21:05:21 +0000
committerJeremie Courreges-Anglas <jca@cvs.openbsd.org>2016-12-30 21:05:21 +0000
commitfc6ee940590eb6c41f15a904ceb73d962a3ab84d (patch)
treec57d366ff84712a8e6b81e808d33de3ce7daa9a2 /sys
parentbf462ad9e607db4fe8fe63f425fd363ebc740b56 (diff)
Remove unused headers.
ISA and PIO don't really fit in the ARM landscape. Suggested by patrick@ and kettenis@, ok deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/arm/include/isa_machdep.h176
-rw-r--r--sys/arch/arm/include/pio.h47
-rw-r--r--sys/arch/armv7/include/isa_machdep.h13
-rw-r--r--sys/arch/armv7/include/pio.h4
4 files changed, 0 insertions, 240 deletions
diff --git a/sys/arch/arm/include/isa_machdep.h b/sys/arch/arm/include/isa_machdep.h
deleted file mode 100644
index 21b2c0588c8..00000000000
--- a/sys/arch/arm/include/isa_machdep.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* $OpenBSD: isa_machdep.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */
-/* $NetBSD: isa_machdep.h,v 1.3 2002/01/07 22:58:07 chris Exp $ */
-
-/*-
- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``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 FOUNDATION OR CONTRIBUTORS
- * 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 _ARM_ISA_MACHDEP_H_
-#define _ARM_ISA_MACHDEP_H_
-
-#include <machine/bus.h>
-#include <dev/isa/isadmavar.h>
-
-#define __NO_ISA_INTR_CHECK
-/*
- * Types provided to machine-independent ISA code.
- */
-struct arm32_isa_chipset {
- /*
- struct isa_dma_state ic_dmastate;
- */
-};
-
-typedef struct arm32_isa_chipset *isa_chipset_tag_t;
-
-struct device; /* XXX */
-struct isabus_attach_args; /* XXX */
-
-/*
- * Functions provided to machine-independent ISA code.
- */
-void isa_attach_hook(struct device *, struct device *,
- struct isabus_attach_args *);
-void *isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
- int level, int (*ih_fun)(void *), void *ih_arg, char *name);
-void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
-
-#if 0
-#define isa_dmainit(ic, bst, dmat, d) \
- _isa_dmainit(&(ic)->ic_dmastate, (bst), (dmat), (d))
-#define isa_dmacascade(ic, c) \
- _isa_dmacascade(&(ic)->ic_dmastate, (c))
-#define isa_dmamaxsize(ic, c) \
- _isa_dmamaxsize(&(ic)->ic_dmastate, (c))
-#define isa_dmamap_create(ic, c, s, f) \
- _isa_dmamap_create(&(ic)->ic_dmastate, (c), (s), (f))
-#define isa_dmamap_destroy(ic, c) \
- _isa_dmamap_destroy(&(ic)->ic_dmastate, (c))
-#define isa_dmastart(ic, c, a, n, p, f, bf) \
- _isa_dmastart(&(ic)->ic_dmastate, (c), (a), (n), (p), (f), (bf))
-#define isa_dmaabort(ic, c) \
- _isa_dmaabort(&(ic)->ic_dmastate, (c))
-#define isa_dmacount(ic, c) \
- _isa_dmacount(&(ic)->ic_dmastate, (c))
-#define isa_dmafinished(ic, c) \
- _isa_dmafinished(&(ic)->ic_dmastate, (c))
-#define isa_dmadone(ic, c) \
- _isa_dmadone(&(ic)->ic_dmastate, (c))
-#define isa_dmafreeze(ic) \
- _isa_dmafreeze(&(ic)->ic_dmastate)
-#define isa_dmathaw(ic) \
- _isa_dmathaw(&(ic)->ic_dmastate)
-#define isa_dmamem_alloc(ic, c, s, ap, f) \
- _isa_dmamem_alloc(&(ic)->ic_dmastate, (c), (s), (ap), (f))
-#define isa_dmamem_free(ic, c, a, s) \
- _isa_dmamem_free(&(ic)->ic_dmastate, (c), (a), (s))
-#define isa_dmamem_map(ic, c, a, s, kp, f) \
- _isa_dmamem_map(&(ic)->ic_dmastate, (c), (a), (s), (kp), (f))
-#define isa_dmamem_unmap(ic, c, k, s) \
- _isa_dmamem_unmap(&(ic)->ic_dmastate, (c), (k), (s))
-#define isa_dmamem_mmap(ic, c, a, s, o, p, f) \
- _isa_dmamem_mmap(&(ic)->ic_dmastate, (c), (a), (s), (o), (p), (f))
-#define isa_drq_alloc(ic, c) \
- _isa_drq_alloc(&(ic)->ic_dmastate, c)
-#define isa_drq_free(ic, c) \
- _isa_drq_free(&(ic)->ic_dmastate, c)
-#define isa_drq_isfree(ic, c) \
- _isa_drq_isfree(&(ic)->ic_dmastate, (c))
-#define isa_malloc(ic, c, s, p, f) \
- _isa_malloc(&(ic)->ic_dmastate, (c), (s), (p), (f))
-#define isa_free(a, p) \
- _isa_free((a), (p))
-#define isa_mappage(m, o, p) \
- _isa_mappage((m), (o), (p))
-#endif
-
-/*
- * ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
- * BY PORTABLE CODE.
- */
-
-extern struct arm32_bus_dma_tag isa_bus_dma_tag;
-
-/*
- * Cookie used by ISA DMA. A pointer to one of these is stashed in
- * the DMA map.
- */
-struct arm32_isa_dma_cookie {
- int id_flags; /* flags; see below */
-
- /*
- * Information about the original buffer used during
- * DMA map syncs. Note that origbuflen is only used
- * for ID_BUFTYPE_LINEAR.
- */
- void *id_origbuf; /* pointer to orig buffer if
- bouncing */
- bus_size_t id_origbuflen; /* ...and size */
- int id_buftype; /* type of buffer */
-
- void *id_bouncebuf; /* pointer to the bounce buffer */
- bus_size_t id_bouncebuflen; /* ...and size */
- int id_nbouncesegs; /* number of valid bounce segs */
- bus_dma_segment_t id_bouncesegs[0]; /* array of bounce buffer
- physical memory segments */
-};
-
-/* id_flags */
-#define ID_MIGHT_NEED_BOUNCE 0x01 /* map could need bounce buffers */
-#define ID_HAS_BOUNCE 0x02 /* map currently has bounce buffers */
-#define ID_IS_BOUNCING 0x04 /* map is bouncing current xfer */
-
-/* id_buftype */
-#define ID_BUFTYPE_INVALID 0
-#define ID_BUFTYPE_LINEAR 1
-#define ID_BUFTYPE_MBUF 2
-#define ID_BUFTYPE_UIO 3
-#define ID_BUFTYPE_RAW 4
-
-/* bus space tags */
-extern struct bus_space isa_io_bs_tag;
-extern struct bus_space isa_mem_bs_tag;
-
-/* ISA chipset */
-extern struct arm32_isa_chipset isa_chipset_tag;
-
-void isa_init(vaddr_t, vaddr_t);
-void isa_io_init(vaddr_t, vaddr_t);
-void isa_dma_init(void);
-vaddr_t isa_io_data_vaddr(void);
-vaddr_t isa_mem_data_vaddr(void);
-int isa_intr_alloc(isa_chipset_tag_t ic, int mask, int type, int *irq);
-void isa_intr_init(void);
-
-/*
- * Miscellaneous functions.
- */
-void isa_fillw(u_int val, void *addr, size_t len);
-
-#endif /* _ARM_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/arm/include/pio.h b/sys/arch/arm/include/pio.h
deleted file mode 100644
index e7828aef407..00000000000
--- a/sys/arch/arm/include/pio.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $OpenBSD: pio.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */
-/* $NetBSD: pio.h,v 1.1 2001/02/23 21:23:48 reinoud Exp $ */
-
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- *
- * This software is furnished under license and may be used and
- * copied only in accordance with the following terms and conditions.
- * Subject to these conditions, you may download, copy, install,
- * use, modify and distribute this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce
- * and retain this copyright notice and list of conditions as
- * they appear in the source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of
- * Digital Equipment Corporation. Neither the "Digital Equipment
- * Corporation" name nor any trademark or logo of Digital Equipment
- * Corporation may be used to endorse or promote products derived
- * from this software without the prior written permission of
- * Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied
- * warranties, including but not limited to, any implied warranties
- * of merchantability, fitness for a particular purpose, or
- * non-infringement are disclaimed. In no event shall DIGITAL be
- * liable for any damages whatsoever, and in particular, DIGITAL
- * shall not be liable for special, indirect, consequential, or
- * incidental damages or damages for lost profits, loss of
- * revenue or loss of use, whether such damages arise in contract,
- * negligence, tort, under statute, in equity, at law or otherwise,
- * even if advised of the possibility of such damage.
- */
-
-#ifndef _ARM_PIO_H_
-#define _ARM_PIO_H_
-
-#include <machine/bus.h>
-
-extern struct bus_space isa_io_bs_tag;
-
-#define inb(port) bus_space_read_1( &isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port))
-#define outb(port, byte) bus_space_write_1(&isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port), (byte))
-
-#endif /* _ARM_PIO_H_ */
diff --git a/sys/arch/armv7/include/isa_machdep.h b/sys/arch/armv7/include/isa_machdep.h
deleted file mode 100644
index 1a10064863a..00000000000
--- a/sys/arch/armv7/include/isa_machdep.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* $OpenBSD: isa_machdep.h,v 1.1 2013/09/04 14:38:27 patrick Exp $ */
-/* $NetBSD: isa_machdep.h,v 1.4 2002/01/07 22:58:08 chris Exp $ */
-
-#ifndef _MACHINE_ISA_MACHDEP_H_
-#define _MACHINE_ISA_MACHDEP_H_
-#include <arm/isa_machdep.h>
-
-#ifdef _KERNEL
-#define ISA_FOOTBRIDGE_IRQ IRQ_IN_L2
-void isa_footbridge_init(u_int, u_int);
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_ISA_MACHDEP_H_ */
diff --git a/sys/arch/armv7/include/pio.h b/sys/arch/armv7/include/pio.h
deleted file mode 100644
index 049f9d556cb..00000000000
--- a/sys/arch/armv7/include/pio.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* $OpenBSD: pio.h,v 1.1 2013/09/04 14:38:28 patrick Exp $ */
-/* $NetBSD: pio.h,v 1.3 2001/12/07 23:09:33 chris Exp $ */
-
-#include <arm/pio.h>