mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
RIP <machine/lock.h>.
Some things needed bits of <i386/include/lock.h> - cy.c now has its own (only) copy of the COM_(UN)LOCK() macros, and IMASK_(UN)LOCK() has been moved to <i386/include/apic.h> (AKA <machine/apic.h>). Reviewed by: jhb
This commit is contained in:
parent
a57815efd2
commit
d888fc4e73
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=72358
@ -44,7 +44,6 @@
|
||||
#include <sys/dkstat.h>
|
||||
|
||||
#include <machine/smp.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/globaldata.h>
|
||||
#include <machine/pmap.h>
|
||||
|
@ -1,39 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1997, by Steve Passe
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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. The name of the developer 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 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 AUTHOR 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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _MACHINE_LOCK_H_
|
||||
#define _MACHINE_LOCK_H_
|
||||
|
||||
extern struct mtx panic_mtx;
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#define COM_DISABLE_INTR() COM_LOCK()
|
||||
#define COM_ENABLE_INTR() COM_UNLOCK()
|
||||
|
||||
#endif /* !_MACHINE_LOCK_H_ */
|
@ -48,7 +48,6 @@
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/apic.h>
|
||||
#include <machine/smptests.h> /** GRAB_LOPRIO */
|
||||
#include <machine/lock.h>
|
||||
#endif /* SMP */
|
||||
|
||||
#include "assym.s"
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include <machine/asmacros.h>
|
||||
#include <sys/ipl.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/psl.h>
|
||||
#include <machine/trap.h>
|
||||
#ifdef SMP
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include <machine/asmacros.h>
|
||||
#include <sys/ipl.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/psl.h>
|
||||
#include <machine/trap.h>
|
||||
#ifdef SMP
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/apic.h>
|
||||
#include <machine/smptests.h> /** GRAB_LOPRIO */
|
||||
#include <machine/lock.h>
|
||||
#endif /* SMP */
|
||||
|
||||
#include "assym.s"
|
||||
|
@ -463,4 +463,28 @@ typedef struct IOAPIC ioapic_t;
|
||||
|
||||
#define IOART_INTVEC 0x000000ff /* R/W: INTerrupt vector field */
|
||||
|
||||
#ifdef LOCORE
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
/*
|
||||
* Protects the IO APIC and apic_imen as a critical region.
|
||||
*/
|
||||
#define IMASK_LOCK MTX_LOCK_SPIN(_imen_mtx, 0)
|
||||
#define IMASK_UNLOCK MTX_UNLOCK_SPIN(_imen_mtx)
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define IMASK_LOCK /* NOP */
|
||||
#define IMASK_UNLOCK /* NOP */
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
#else /* LOCORE */
|
||||
|
||||
/* global data in mp_machdep.c */
|
||||
extern struct mtx imen_mtx;
|
||||
|
||||
#endif /* LOCORE */
|
||||
|
||||
#endif /* _MACHINE_APIC_H_ */
|
||||
|
@ -74,16 +74,18 @@ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \
|
||||
void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v);
|
||||
|
||||
#else /* !KLD_MODULE */
|
||||
|
||||
#if defined(SMP)
|
||||
#if defined(LOCORE)
|
||||
#define MPLOCKED lock ;
|
||||
#else
|
||||
#else /* !LOCORE */
|
||||
#define MPLOCKED "lock ; "
|
||||
#endif
|
||||
#else
|
||||
#endif /* LOCORE */
|
||||
#else /* !SMP */
|
||||
#define MPLOCKED
|
||||
#endif
|
||||
#endif /* SMP */
|
||||
|
||||
#if !defined(LOCORE)
|
||||
/*
|
||||
* The assembly is volatilized to demark potential before-and-after side
|
||||
* effects if an interrupt or SMP collision were to occur.
|
||||
@ -201,8 +203,10 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
|
||||
: : "memory"); \
|
||||
}
|
||||
#endif /* defined(I386_CPU) */
|
||||
#endif /* !defined(LOCORE) */
|
||||
#endif /* KLD_MODULE */
|
||||
|
||||
#if !defined(LOCORE)
|
||||
ATOMIC_ASM(set, char, "orb %b2,%0", v)
|
||||
ATOMIC_ASM(clear, char, "andb %b2,%0", ~v)
|
||||
ATOMIC_ASM(add, char, "addb %b2,%0", v)
|
||||
@ -401,4 +405,5 @@ atomic_readandclear_long(volatile u_long *addr)
|
||||
return (result);
|
||||
}
|
||||
#endif /* !defined(WANT_FUNCTIONS) */
|
||||
#endif /* !defined(LOCORE) */
|
||||
#endif /* ! _MACHINE_ATOMIC_H_ */
|
||||
|
@ -43,9 +43,6 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -36,9 +36,6 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/rtprio.h> /* change this name XXX */
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -43,9 +43,6 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -1,36 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1997, by Steve Passe
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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. The name of the developer 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 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 AUTHOR 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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_LOCK_H_
|
||||
#define _MACHINE_LOCK_H_
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#define COM_DISABLE_INTR() COM_LOCK()
|
||||
#define COM_ENABLE_INTR() COM_UNLOCK()
|
||||
|
||||
#endif /* !_MACHINE_LOCK_H_ */
|
@ -80,7 +80,6 @@
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/psl.h>
|
||||
|
||||
#include <i386/isa/isa_device.h>
|
||||
@ -91,6 +90,27 @@
|
||||
#error "The cy device requires the old isa compatibility shims"
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
#include <machine/smptests.h> /** xxx_LOCK */
|
||||
|
||||
#ifdef USE_COMLOCK
|
||||
#define COM_LOCK() mtx_lock_spin(&com_mtx)
|
||||
#define COM_UNLOCK() mtx_unlock_spin(&com_mtx)
|
||||
#else
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#endif /* USE_COMLOCK */
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
extern struct mtx com_mtx;
|
||||
|
||||
/*
|
||||
* Dictionary so that I can name everything *sio* or *com* to compare with
|
||||
* sio.c. There is also lots of ugly formatting and unnecessary ifdefs to
|
||||
|
@ -80,7 +80,6 @@
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/psl.h>
|
||||
|
||||
#include <i386/isa/isa_device.h>
|
||||
@ -91,6 +90,27 @@
|
||||
#error "The cy device requires the old isa compatibility shims"
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
#include <machine/smptests.h> /** xxx_LOCK */
|
||||
|
||||
#ifdef USE_COMLOCK
|
||||
#define COM_LOCK() mtx_lock_spin(&com_mtx)
|
||||
#define COM_UNLOCK() mtx_unlock_spin(&com_mtx)
|
||||
#else
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#endif /* USE_COMLOCK */
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
extern struct mtx com_mtx;
|
||||
|
||||
/*
|
||||
* Dictionary so that I can name everything *sio* or *com* to compare with
|
||||
* sio.c. There is also lots of ugly formatting and unnecessary ifdefs to
|
||||
|
@ -80,12 +80,8 @@
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#endif
|
||||
#include <machine/lock.h>
|
||||
|
||||
#include <machine/clock.h>
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <isa/sioreg.h>
|
||||
|
@ -38,7 +38,7 @@
|
||||
#include <machine/asmacros.h>
|
||||
#include <sys/ipl.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/psl.h>
|
||||
#include <machine/trap.h>
|
||||
#ifdef SMP
|
||||
|
@ -48,7 +48,6 @@
|
||||
#include <machine/pmap.h>
|
||||
#include <machine/apic.h>
|
||||
#include <machine/smptests.h> /** GRAB_LOPRIO */
|
||||
#include <machine/lock.h>
|
||||
#endif /* SMP */
|
||||
|
||||
#include "assym.s"
|
||||
|
@ -463,4 +463,28 @@ typedef struct IOAPIC ioapic_t;
|
||||
|
||||
#define IOART_INTVEC 0x000000ff /* R/W: INTerrupt vector field */
|
||||
|
||||
#ifdef LOCORE
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
/*
|
||||
* Protects the IO APIC and apic_imen as a critical region.
|
||||
*/
|
||||
#define IMASK_LOCK MTX_LOCK_SPIN(_imen_mtx, 0)
|
||||
#define IMASK_UNLOCK MTX_UNLOCK_SPIN(_imen_mtx)
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define IMASK_LOCK /* NOP */
|
||||
#define IMASK_UNLOCK /* NOP */
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
#else /* LOCORE */
|
||||
|
||||
/* global data in mp_machdep.c */
|
||||
extern struct mtx imen_mtx;
|
||||
|
||||
#endif /* LOCORE */
|
||||
|
||||
#endif /* _MACHINE_APIC_H_ */
|
||||
|
@ -463,4 +463,28 @@ typedef struct IOAPIC ioapic_t;
|
||||
|
||||
#define IOART_INTVEC 0x000000ff /* R/W: INTerrupt vector field */
|
||||
|
||||
#ifdef LOCORE
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
/*
|
||||
* Protects the IO APIC and apic_imen as a critical region.
|
||||
*/
|
||||
#define IMASK_LOCK MTX_LOCK_SPIN(_imen_mtx, 0)
|
||||
#define IMASK_UNLOCK MTX_UNLOCK_SPIN(_imen_mtx)
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define IMASK_LOCK /* NOP */
|
||||
#define IMASK_UNLOCK /* NOP */
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
#else /* LOCORE */
|
||||
|
||||
/* global data in mp_machdep.c */
|
||||
extern struct mtx imen_mtx;
|
||||
|
||||
#endif /* LOCORE */
|
||||
|
||||
#endif /* _MACHINE_APIC_H_ */
|
||||
|
@ -74,16 +74,18 @@ u_##TYPE atomic_load_acq_##TYPE(volatile u_##TYPE *p); \
|
||||
void atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v);
|
||||
|
||||
#else /* !KLD_MODULE */
|
||||
|
||||
#if defined(SMP)
|
||||
#if defined(LOCORE)
|
||||
#define MPLOCKED lock ;
|
||||
#else
|
||||
#else /* !LOCORE */
|
||||
#define MPLOCKED "lock ; "
|
||||
#endif
|
||||
#else
|
||||
#endif /* LOCORE */
|
||||
#else /* !SMP */
|
||||
#define MPLOCKED
|
||||
#endif
|
||||
#endif /* SMP */
|
||||
|
||||
#if !defined(LOCORE)
|
||||
/*
|
||||
* The assembly is volatilized to demark potential before-and-after side
|
||||
* effects if an interrupt or SMP collision were to occur.
|
||||
@ -201,8 +203,10 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
|
||||
: : "memory"); \
|
||||
}
|
||||
#endif /* defined(I386_CPU) */
|
||||
#endif /* !defined(LOCORE) */
|
||||
#endif /* KLD_MODULE */
|
||||
|
||||
#if !defined(LOCORE)
|
||||
ATOMIC_ASM(set, char, "orb %b2,%0", v)
|
||||
ATOMIC_ASM(clear, char, "andb %b2,%0", ~v)
|
||||
ATOMIC_ASM(add, char, "addb %b2,%0", v)
|
||||
@ -401,4 +405,5 @@ atomic_readandclear_long(volatile u_long *addr)
|
||||
return (result);
|
||||
}
|
||||
#endif /* !defined(WANT_FUNCTIONS) */
|
||||
#endif /* !defined(LOCORE) */
|
||||
#endif /* ! _MACHINE_ATOMIC_H_ */
|
||||
|
@ -1,87 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1997, by Steve Passe
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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. The name of the developer 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 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 AUTHOR 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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _MACHINE_LOCK_H_
|
||||
#define _MACHINE_LOCK_H_
|
||||
|
||||
|
||||
#ifdef LOCORE
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
#define MPLOCKED lock ;
|
||||
|
||||
/*
|
||||
* Protects the IO APIC and apic_imen as a critical region.
|
||||
*/
|
||||
#define IMASK_LOCK MTX_LOCK_SPIN(_imen_mtx, 0)
|
||||
#define IMASK_UNLOCK MTX_UNLOCK_SPIN(_imen_mtx)
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define MPLOCKED /* NOP */
|
||||
|
||||
#define IMASK_LOCK /* NOP */
|
||||
#define IMASK_UNLOCK /* NOP */
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
#else /* LOCORE */
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
#include <machine/smptests.h> /** xxx_LOCK */
|
||||
|
||||
/*
|
||||
* sio/cy lock.
|
||||
* XXX should rc (RISCom/8) use this?
|
||||
*/
|
||||
#ifdef USE_COMLOCK
|
||||
#define COM_LOCK() mtx_lock_spin(&com_mtx)
|
||||
#define COM_UNLOCK() mtx_unlock_spin(&com_mtx)
|
||||
#else
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#endif /* USE_COMLOCK */
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
/* global data in mp_machdep.c */
|
||||
extern struct mtx imen_mtx;
|
||||
extern struct mtx com_mtx;
|
||||
extern struct mtx mcount_mtx;
|
||||
extern struct mtx panic_mtx;
|
||||
|
||||
#endif /* LOCORE */
|
||||
|
||||
#endif /* !_MACHINE_LOCK_H_ */
|
@ -80,7 +80,6 @@
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/psl.h>
|
||||
|
||||
#include <i386/isa/isa_device.h>
|
||||
@ -91,6 +90,27 @@
|
||||
#error "The cy device requires the old isa compatibility shims"
|
||||
#endif
|
||||
|
||||
#ifdef SMP
|
||||
|
||||
#include <machine/smptests.h> /** xxx_LOCK */
|
||||
|
||||
#ifdef USE_COMLOCK
|
||||
#define COM_LOCK() mtx_lock_spin(&com_mtx)
|
||||
#define COM_UNLOCK() mtx_unlock_spin(&com_mtx)
|
||||
#else
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#endif /* USE_COMLOCK */
|
||||
|
||||
#else /* SMP */
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
|
||||
#endif /* SMP */
|
||||
|
||||
extern struct mtx com_mtx;
|
||||
|
||||
/*
|
||||
* Dictionary so that I can name everything *sio* or *com* to compare with
|
||||
* sio.c. There is also lots of ugly formatting and unnecessary ifdefs to
|
||||
|
@ -43,9 +43,6 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -36,9 +36,6 @@
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/rtprio.h> /* change this name XXX */
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -43,9 +43,6 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/bus.h>
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <sys/proc.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/syslog.h>
|
||||
|
@ -43,7 +43,6 @@
|
||||
#include <sys/dkstat.h>
|
||||
|
||||
#include <machine/smp.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/ipl.h>
|
||||
#include <machine/globaldata.h>
|
||||
|
@ -1,35 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1997, by Steve Passe
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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. The name of the developer 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 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 AUTHOR 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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _MACHINE_LOCK_H_
|
||||
#define _MACHINE_LOCK_H_
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
|
||||
#endif /* !_MACHINE_LOCK_H_ */
|
@ -80,12 +80,8 @@
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#endif
|
||||
#include <machine/lock.h>
|
||||
|
||||
#include <machine/clock.h>
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <isa/sioreg.h>
|
||||
|
@ -63,7 +63,6 @@
|
||||
#include <sys/cons.h>
|
||||
|
||||
#include <machine/pcb.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/md_var.h>
|
||||
#include <machine/smp.h> /* smp_active, cpuid */
|
||||
|
||||
|
@ -46,7 +46,6 @@ void bintr __P((void));
|
||||
void btrap __P((void));
|
||||
void eintr __P((void));
|
||||
void user __P((void));
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -47,7 +47,6 @@
|
||||
#include <pc98/pc98/pc98.h>
|
||||
|
||||
#include <isa/isavar.h>
|
||||
#include <machine/lock.h>
|
||||
|
||||
#define DRIVER_NAME "pckbd"
|
||||
|
||||
|
@ -172,11 +172,7 @@
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#endif
|
||||
#include <machine/lock.h>
|
||||
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <isa/sioreg.h>
|
||||
|
@ -47,7 +47,6 @@
|
||||
#include <pc98/pc98/pc98.h>
|
||||
|
||||
#include <isa/isavar.h>
|
||||
#include <machine/lock.h>
|
||||
|
||||
#define DRIVER_NAME "pckbd"
|
||||
|
||||
|
@ -172,11 +172,7 @@
|
||||
#include <pci/pcireg.h>
|
||||
#include <pci/pcivar.h>
|
||||
#endif
|
||||
#include <machine/lock.h>
|
||||
|
||||
#ifndef SMP
|
||||
#include <machine/lock.h>
|
||||
#endif
|
||||
#include <machine/resource.h>
|
||||
|
||||
#include <isa/sioreg.h>
|
||||
|
@ -1,36 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 1997, by Steve Passe
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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. The name of the developer 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 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 AUTHOR 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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef _MACHINE_LOCK_H_
|
||||
#define _MACHINE_LOCK_H_
|
||||
|
||||
#define COM_LOCK()
|
||||
#define COM_UNLOCK()
|
||||
#define COM_DISABLE_INTR() COM_LOCK()
|
||||
#define COM_ENABLE_INTR() COM_UNLOCK()
|
||||
|
||||
#endif /* !_MACHINE_LOCK_H_ */
|
@ -43,7 +43,6 @@
|
||||
#include <sys/dkstat.h>
|
||||
|
||||
#include <machine/smp.h>
|
||||
#include <machine/lock.h>
|
||||
#include <machine/atomic.h>
|
||||
#include <machine/globaldata.h>
|
||||
#include <machine/pmap.h>
|
||||
|
@ -81,6 +81,9 @@ extern int lbolt; /* once a second sleep address */
|
||||
extern int tickdelta;
|
||||
extern long timedelta;
|
||||
|
||||
/* global data in mp_machdep.c */
|
||||
extern struct mtx panic_mtx;
|
||||
|
||||
#endif /* _KERNEL */
|
||||
|
||||
/*
|
||||
|
@ -41,8 +41,6 @@
|
||||
#ifndef _LOCK_H_
|
||||
#define _LOCK_H_
|
||||
|
||||
#include <machine/lock.h>
|
||||
|
||||
struct mtx;
|
||||
|
||||
/*
|
||||
|
@ -41,8 +41,6 @@
|
||||
#ifndef _LOCK_H_
|
||||
#define _LOCK_H_
|
||||
|
||||
#include <machine/lock.h>
|
||||
|
||||
struct mtx;
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user