Move a few more files to x86/include. Trim the list of files to install
in /usr/include a bit.
This commit is contained in:
fvdl
parent
508a50ac15
commit
20e439b5cb
|
|
@ -1,17 +1,14 @@
|
|||
# $NetBSD: Makefile,v 1.1 2003/02/26 22:27:00 fvdl Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2003/02/27 00:10:56 fvdl Exp $
|
||||
|
||||
INCSDIR=/usr/include/x86
|
||||
|
||||
INCS= aout_machdep.h apicvar.h \
|
||||
bios32.h bootinfo.h bus.h \
|
||||
INCS= aout_machdep.h \
|
||||
bootinfo.h bus.h \
|
||||
float.h \
|
||||
i82093reg.h i82093var.h i82489reg.h i82489var.h i8259.h \
|
||||
ieee.h ieeefp.h \
|
||||
intr.h intrdefs.h \
|
||||
mpbiosreg.h mpbiosvar.h mpconfig.h \
|
||||
lock.h \
|
||||
mtrr.h \
|
||||
pci_machdep.h \
|
||||
pic.h \
|
||||
pio.h \
|
||||
psl.h \
|
||||
specialreg.h \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,233 @@
|
|||
/* $NetBSD: isa_machdep.h,v 1.1 2003/02/27 00:10:57 fvdl 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.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to Berkeley by
|
||||
* William Jolitz.
|
||||
*
|
||||
* 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 by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
|
||||
*
|
||||
* @(#)isa.h 5.7 (Berkeley) 5/9/91
|
||||
*/
|
||||
|
||||
/*
|
||||
* Various pieces of the i386 port want to include this file without
|
||||
* or in spite of using isavar.h, and should be fixed.
|
||||
*/
|
||||
|
||||
#ifndef _I386_ISA_MACHDEP_H_ /* XXX */
|
||||
#define _I386_ISA_MACHDEP_H_ /* XXX */
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <dev/isa/isadmavar.h>
|
||||
|
||||
/*
|
||||
* XXX THIS FILE IS A MESS. copyright: berkeley's probably.
|
||||
* contents from isavar.h and isareg.h, mostly the latter.
|
||||
* perhaps charles's?
|
||||
*
|
||||
* copyright from berkeley's isa.h which is now dev/isa/isareg.h.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Types provided to machine-independent ISA code.
|
||||
*/
|
||||
struct x86_isa_chipset {
|
||||
struct isa_dma_state ic_dmastate;
|
||||
};
|
||||
|
||||
typedef struct x86_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 *);
|
||||
int isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
|
||||
const struct evcnt *isa_intr_evcnt(isa_chipset_tag_t ic, int irq);
|
||||
void *isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
|
||||
int level, int (*ih_fun)(void *), void *ih_arg);
|
||||
void isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
|
||||
int isa_mem_alloc(bus_space_tag_t, bus_size_t, bus_size_t,
|
||||
bus_addr_t, int, bus_addr_t *, bus_space_handle_t *);
|
||||
void isa_mem_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
|
||||
|
||||
#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_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))
|
||||
|
||||
/*
|
||||
* for ACPI code
|
||||
*/
|
||||
|
||||
void isa_reinit_irq(void);
|
||||
|
||||
/*
|
||||
* ALL OF THE FOLLOWING ARE MACHINE-DEPENDENT, AND SHOULD NOT BE USED
|
||||
* BY PORTABLE CODE.
|
||||
*/
|
||||
|
||||
extern struct x86_bus_dma_tag isa_bus_dma_tag;
|
||||
|
||||
/*
|
||||
* 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
|
||||
* function definitions, invoked through the softc.
|
||||
*/
|
||||
|
||||
extern u_long atdevbase; /* kernel virtual address of "hole" */
|
||||
|
||||
/*
|
||||
* Given a kernel virtual address for some location
|
||||
* in the "hole" I/O space, return a physical address.
|
||||
*/
|
||||
#define ISA_PHYSADDR(v) ((void *) ((u_long)(v) - atdevbase + IOM_BEGIN))
|
||||
|
||||
/*
|
||||
* Given a physical address in the "hole",
|
||||
* return a kernel virtual address.
|
||||
*/
|
||||
#define ISA_HOLE_VADDR(p) ((void *) ((u_long)(p) - IOM_BEGIN + atdevbase))
|
||||
|
||||
|
||||
/*
|
||||
* Miscellanous functions.
|
||||
*/
|
||||
void sysbeep(int, int); /* beep with the system speaker */
|
||||
|
||||
#endif /* _I386_ISA_MACHDEP_H_ XXX */
|
||||
|
|
@ -0,0 +1,125 @@
|
|||
/* $NetBSD: lock.h,v 1.1 2003/02/27 00:10:57 fvdl Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2000 The NetBSD Foundation, Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to The NetBSD Foundation
|
||||
* by Jason R. Thorpe.
|
||||
*
|
||||
* 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 by the NetBSD
|
||||
* Foundation, Inc. and its contributors.
|
||||
* 4. Neither the name of The NetBSD Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Machine-dependent spin lock operations.
|
||||
*/
|
||||
|
||||
#ifndef _I386_LOCK_H_
|
||||
#define _I386_LOCK_H_
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_lockdebug.h"
|
||||
#endif
|
||||
|
||||
typedef __volatile int __cpu_simple_lock_t;
|
||||
|
||||
#define __SIMPLELOCK_LOCKED 1
|
||||
#define __SIMPLELOCK_UNLOCKED 0
|
||||
|
||||
/*
|
||||
* compiler barrier: prevent reordering of instructions.
|
||||
* XXX something similar will move to <sys/cdefs.h>
|
||||
* or thereabouts.
|
||||
* This prevents the compiler from reordering code around
|
||||
* this "instruction", acting as a sequence point for code generation.
|
||||
*/
|
||||
|
||||
#define __lockbarrier() __asm __volatile("": : :"memory")
|
||||
|
||||
#ifdef LOCKDEBUG
|
||||
|
||||
extern void __cpu_simple_lock_init __P((__cpu_simple_lock_t *));
|
||||
extern void __cpu_simple_lock __P((__cpu_simple_lock_t *));
|
||||
extern int __cpu_simple_lock_try __P((__cpu_simple_lock_t *));
|
||||
extern void __cpu_simple_unlock __P((__cpu_simple_lock_t *));
|
||||
|
||||
#else
|
||||
|
||||
#include <machine/atomic.h>
|
||||
|
||||
static __inline void __cpu_simple_lock_init __P((__cpu_simple_lock_t *))
|
||||
__attribute__((__unused__));
|
||||
static __inline void __cpu_simple_lock __P((__cpu_simple_lock_t *))
|
||||
__attribute__((__unused__));
|
||||
static __inline int __cpu_simple_lock_try __P((__cpu_simple_lock_t *))
|
||||
__attribute__((__unused__));
|
||||
static __inline void __cpu_simple_unlock __P((__cpu_simple_lock_t *))
|
||||
__attribute__((__unused__));
|
||||
|
||||
static __inline void
|
||||
__cpu_simple_lock_init(__cpu_simple_lock_t *lockp)
|
||||
{
|
||||
|
||||
*lockp = __SIMPLELOCK_UNLOCKED;
|
||||
__lockbarrier();
|
||||
}
|
||||
|
||||
static __inline void
|
||||
__cpu_simple_lock(__cpu_simple_lock_t *lockp)
|
||||
{
|
||||
|
||||
while (x86_atomic_testset_i(lockp, __SIMPLELOCK_LOCKED)
|
||||
== __SIMPLELOCK_LOCKED) {
|
||||
continue; /* spin */
|
||||
}
|
||||
__lockbarrier();
|
||||
}
|
||||
|
||||
static __inline int
|
||||
__cpu_simple_lock_try(__cpu_simple_lock_t *lockp)
|
||||
{
|
||||
int r = (x86_atomic_testset_i(lockp, __SIMPLELOCK_LOCKED)
|
||||
== __SIMPLELOCK_UNLOCKED);
|
||||
|
||||
__lockbarrier();
|
||||
|
||||
return (r);
|
||||
}
|
||||
|
||||
static __inline void
|
||||
__cpu_simple_unlock(__cpu_simple_lock_t *lockp)
|
||||
{
|
||||
|
||||
__lockbarrier();
|
||||
*lockp = __SIMPLELOCK_UNLOCKED;
|
||||
}
|
||||
|
||||
#endif /* !LOCKDEBUG */
|
||||
|
||||
#endif /* _I386_LOCK_H_ */
|
||||
Loading…
Reference in New Issue