Deleted Added
full compact
icu.h (2874) icu.h (3258)
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * from: @(#)icu.h 5.6 (Berkeley) 5/9/91
1/*-
2 * Copyright (c) 1990 The Regents of the University of California.
3 * All rights reserved.
4 *
5 * This code is derived from software contributed to Berkeley by
6 * William Jolitz.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 20 unchanged lines hidden (view full) ---

29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE.
35 *
36 * from: @(#)icu.h 5.6 (Berkeley) 5/9/91
37 * $Id: icu.h,v 1.5 1994/09/18 23:08:56 bde Exp $
37 * $Id: icu.h,v 1.6 1994/09/18 23:18:32 bde Exp $
38 */
39
40/*
41 * AT/386 Interrupt Control constants
42 * W. Jolitz 8/89
43 */
44
45#ifndef _I386_ISA_ICU_H_
46#define _I386_ISA_ICU_H_
47
48#ifndef LOCORE
49
50/*
51 * Interrupt "level" mechanism variables, masks, and macros
52 */
53extern unsigned imen; /* interrupt mask enable */
54
38 */
39
40/*
41 * AT/386 Interrupt Control constants
42 * W. Jolitz 8/89
43 */
44
45#ifndef _I386_ISA_ICU_H_
46#define _I386_ISA_ICU_H_
47
48#ifndef LOCORE
49
50/*
51 * Interrupt "level" mechanism variables, masks, and macros
52 */
53extern unsigned imen; /* interrupt mask enable */
54
55#define INTREN(s) (imen &= ~(s), SET_ICUS())
56#define INTRDIS(s) (imen |= (s), SET_ICUS())
57#define INTRMASK(msk,s) (msk |= (s))
55#define INTREN(s) (imen &= ~(s), SET_ICUS())
56#define INTRDIS(s) (imen |= (s), SET_ICUS())
57#define INTRMASK(msk,s) (msk |= (s))
58#define INTRUNMASK(msk,s) (msk &= ~(s))
58#if 0
59#define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8))
60#else
61/*
62 * XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to
63 * include isa.h, while too many things include icu.h.
64 */
65#define SET_ICUS() (outb(0x21, imen), outb(0xa1, imen >> 8))

--- 32 unchanged lines hidden ---
59#if 0
60#define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8))
61#else
62/*
63 * XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to
64 * include isa.h, while too many things include icu.h.
65 */
66#define SET_ICUS() (outb(0x21, imen), outb(0xa1, imen >> 8))

--- 32 unchanged lines hidden ---