Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge local <atari/atari/intr.h> into common <machine/intr.h>.

Browse Source
This commit is contained in:
tsutsui 2009-07-08 12:23:09 +00:00
parent b3f068f354
commit 0a36a9ab42
12 changed files with 75 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/atari/atari/atari_init.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atari_init.c,v 1.82 2009/07/07 15:37:02 tsutsui Exp $ */
/* $NetBSD: atari_init.c,v 1.83 2009/07/08 12:23:09 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.82 2009/07/07 15:37:02 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.83 2009/07/08 12:23:09 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@ -68,11 +68,11 @@ __KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.82 2009/07/07 15:37:02 tsutsui Exp
#include <machine/scu.h>
#include <machine/acia.h>
#include <machine/kcore.h>
#include <machine/intr.h>
#include <m68k/cpu.h>
#include <m68k/cacheops.h>
#include <atari/atari/intr.h>
#include <atari/atari/stalloc.h>
#include <atari/dev/clockvar.h>
#include <atari/dev/ym2149reg.h>

6
sys/arch/atari/atari/intr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.c,v 1.18 2009/03/18 10:22:24 cegger Exp $ */
/* $NetBSD: intr.c,v 1.19 2009/07/08 12:23:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.18 2009/03/18 10:22:24 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.19 2009/07/08 12:23:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.18 2009/03/18 10:22:24 cegger Exp $");
#include <uvm/uvm_extern.h>
#include <atari/atari/intr.h>
#include <machine/intr.h>
#define AVEC_MIN 1
#define AVEC_MAX 7

73
sys/arch/atari/atari/intr.h
View File

@ -1,73 +0,0 @@
/* $NetBSD: intr.h,v 1.5 2009/03/05 13:21:44 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Leo Weppelman.
*
* 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 _ATARI_ATARI_INTR_H_
#define _ATARI_ATARI_INTR_H_
#include <machine/cpu.h> /* XXX: for clockframe */
#define AUTO_VEC 0x0001 /* We're dealing with an auto-vector */
#define USER_VEC 0x0002 /* We're dealing with an user-vector */
#define FAST_VEC 0x0010 /* Fast, stash right into vector-table */
#define ARG_CLOCKFRAME 0x0020 /* Supply clockframe as an argument */
/*
* Interrupt handler chains. intr_establish() inserts a handler into
* the list. The handler is called with its (single) argument or with a
* 'standard' clockframe. This depends on 'ih_type'.
*/
typedef int (*hw_ifun_t)(void *, int);
struct intrhand {
LIST_ENTRY(intrhand) ih_link;
hw_ifun_t ih_fun;
void *ih_arg;
int ih_type;
int ih_pri;
int ih_vector;
u_long *ih_intrcnt;
};
void intr_init(void);
struct intrhand *intr_establish(int, int, int, hw_ifun_t, void *);
int intr_disestablish(struct intrhand *);
void intr_dispatch(struct clockframe);
void intr_glue(void);
/*
* Exported by intrcnt.h
*/
extern u_long autovects[];
extern u_long intrcnt_auto[];
extern u_long uservects[];
extern u_long intrcnt_user[];
#endif /* _ATARI_ATARI_INTR_H_ */

7
sys/arch/atari/dev/atari5380.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: atari5380.c,v 1.51 2009/03/18 10:22:24 cegger Exp $ */
/* $NetBSD: atari5380.c,v 1.52 2009/07/08 12:23:09 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.51 2009/03/18 10:22:24 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.52 2009/07/08 12:23:09 tsutsui Exp $");
#include "opt_atariscsi.h"
@ -61,8 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.51 2009/03/18 10:22:24 cegger Exp $"
#include <machine/stdarg.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <atari/atari/intr.h>
#include <machine/intr.h>
#if defined(FALCON_SCSI)
#include <machine/dma.h>

7
sys/arch/atari/dev/dma.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dma.c,v 1.22 2009/03/18 10:22:24 cegger Exp $ */
/* $NetBSD: dma.c,v 1.23 2009/07/08 12:23:09 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.22 2009/03/18 10:22:24 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.23 2009/07/08 12:23:09 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -63,8 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.22 2009/03/18 10:22:24 cegger Exp $");
#include <machine/cpu.h>
#include <machine/iomap.h>
#include <machine/dma.h>
#include <atari/atari/intr.h>
#include <machine/intr.h>
#define NDMA_DEV 10 /* Max 2 floppy's, 8 hard-disks */
typedef struct dma_entry {

6
sys/arch/atari/dev/hdfd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hdfd.c,v 1.70 2009/03/18 16:00:10 cegger Exp $ */
/* $NetBSD: hdfd.c,v 1.71 2009/07/08 12:23:09 tsutsui Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.70 2009/03/18 16:00:10 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.71 2009/07/08 12:23:09 tsutsui Exp $");
#include "opt_ddb.h"
@ -120,9 +120,9 @@ __KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.70 2009/03/18 16:00:10 cegger Exp $");
#include <machine/bus.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/intr.h>
#include <atari/dev/hdfdreg.h>
#include <atari/atari/intr.h>
#include <atari/atari/device.h>
#include "locators.h"

6
sys/arch/atari/dev/lpt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt.c,v 1.30 2008/06/13 08:50:12 cegger Exp $ */
/* $NetBSD: lpt.c,v 1.31 2009/07/08 12:23:10 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.30 2008/06/13 08:50:12 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.31 2009/07/08 12:23:10 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -74,9 +74,9 @@ __KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.30 2008/06/13 08:50:12 cegger Exp $");
#include <machine/cpu.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/intr.h>
#include <atari/dev/ym2149reg.h>
#include <atari/atari/intr.h>
#define TIMEOUT hz*16 /* wait up to 16 seconds for a ready */
#define STEP hz/4

6
sys/arch/atari/dev/ser.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 tsutsui Exp $ */
/* $NetBSD: ser.c,v 1.44 2009/07/08 12:23:10 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.44 2009/07/08 12:23:10 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@ -119,7 +119,7 @@ __KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 tsutsui Exp $");
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <atari/atari/intr.h>
#include <machine/intr.h>
#include <atari/dev/serreg.h>
#if !defined(_MILANHW_)

49
sys/arch/atari/include/intr.h
View File

@ -1,9 +1,12 @@
/* $NetBSD: intr.h,v 1.20 2009/03/05 13:00:45 tsutsui Exp $ */
/* $NetBSD: intr.h,v 1.21 2009/07/08 12:23:10 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 2007 The NetBSD Foundation, Inc.
* Copyright (c) 1996, 1997, 2007 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Leo Weppelman.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@ -86,6 +89,48 @@ splraiseipl(ipl_cookie_t icookie)
return _splraise(icookie._psl);
}
#include <sys/queue.h>
#include <machine/cpu.h> /* XXX: for clockframe */
struct clockframe;
#define AUTO_VEC 0x0001 /* We're dealing with an auto-vector */
#define USER_VEC 0x0002 /* We're dealing with an user-vector */
#define FAST_VEC 0x0010 /* Fast, stash right into vector-table */
#define ARG_CLOCKFRAME 0x0020 /* Supply clockframe as an argument */
/*
* Interrupt handler chains. intr_establish() inserts a handler into
* the list. The handler is called with its (single) argument or with a
* 'standard' clockframe. This depends on 'ih_type'.
*/
typedef int (*hw_ifun_t)(void *, int);
struct intrhand {
LIST_ENTRY(intrhand) ih_link;
hw_ifun_t ih_fun;
void *ih_arg;
int ih_type;
int ih_pri;
int ih_vector;
u_long *ih_intrcnt;
};
void intr_init(void);
struct intrhand *intr_establish(int, int, int, hw_ifun_t, void *);
int intr_disestablish(struct intrhand *);
void intr_dispatch(struct clockframe);
void intr_glue(void);
/*
* Exported by intrcnt.h
*/
extern u_long autovects[];
extern u_long intrcnt_auto[];
extern u_long uservects[];
extern u_long intrcnt_user[];
#endif /* _KERNEL */
#endif /* _ATARI_INTR_H_ */

4
sys/arch/atari/include/isa_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isa_machdep.h,v 1.12 2008/04/28 20:23:15 martin Exp $ */
/* $NetBSD: isa_machdep.h,v 1.13 2009/07/08 12:23:10 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -63,8 +63,8 @@
#define _ATARI_ISA_MACHDEP_H_
#include <machine/bus.h>
#include <machine/intr.h>
#include <dev/isa/isadmavar.h>
#include <atari/atari/intr.h>
struct atari_isa_chipset {
struct isa_dma_state ic_dmastate;

4
sys/arch/atari/include/pci_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_machdep.h,v 1.12 2005/12/11 12:16:59 christos Exp $ */
/* $NetBSD: pci_machdep.h,v 1.13 2009/07/08 12:23:10 tsutsui Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@ -34,7 +34,7 @@
#ifndef _ATARI_PCI_MACHDEP_H_
#define _ATARI_PCI_MACHDEP_H_
#include <atari/atari/intr.h>
#include <machine/intr.h>
/*
* Machine-specific definitions for PCI autoconfiguration.

6
sys/arch/atari/vme/if_le_vme.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_vme.c,v 1.25 2009/03/18 17:06:43 cegger Exp $ */
/* $NetBSD: if_le_vme.c,v 1.26 2009/07/08 12:23:10 tsutsui Exp $ */
/*-
* Copyright (c) 1998 maximum entropy. All rights reserved.
@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.25 2009/03/18 17:06:43 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.26 2009/07/08 12:23:10 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@ -99,9 +99,9 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,v 1.25 2009/03/18 17:06:43 cegger Exp $"
#include <machine/bus.h>
#include <machine/iomap.h>
#include <machine/scu.h>
#include <machine/intr.h>
#include <atari/atari/device.h>
#include <atari/atari/intr.h>
#include <dev/ic/lancereg.h>
#include <dev/ic/lancevar.h>