Module Name: src
Committed By: tsutsui
Date: Wed Jul 8 12:23:10 UTC 2009
Modified Files:
src/sys/arch/atari/atari: atari_init.c intr.c
src/sys/arch/atari/dev: atari5380.c dma.c hdfd.c lpt.c ser.c
src/sys/arch/atari/include: intr.h isa_machdep.h pci_machdep.h
src/sys/arch/atari/vme: if_le_vme.c
Removed Files:
src/sys/arch/atari/atari: intr.h
Log Message:
Merge local <atari/atari/intr.h> into common <machine/intr.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/atari/atari/atari_init.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/atari/atari/intr.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/atari/atari/intr.h
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/atari/dev/dma.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/atari/dev/hdfd.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/atari/dev/lpt.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/atari/dev/ser.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/include/intr.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/atari/include/isa_machdep.h \
src/sys/arch/atari/include/pci_machdep.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/atari/vme/if_le_vme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.82 src/sys/arch/atari/atari/atari_init.c:1.83
--- src/sys/arch/atari/atari/atari_init.c:1.82 Tue Jul 7 15:37:02 2009
+++ src/sys/arch/atari/atari/atari_init.c Wed Jul 8 12:23:09 2009
@@ -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 @@
#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>
Index: src/sys/arch/atari/atari/intr.c
diff -u src/sys/arch/atari/atari/intr.c:1.18 src/sys/arch/atari/atari/intr.c:1.19
--- src/sys/arch/atari/atari/intr.c:1.18 Wed Mar 18 10:22:24 2009
+++ src/sys/arch/atari/atari/intr.c Wed Jul 8 12:23:09 2009
@@ -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 @@
#include <uvm/uvm_extern.h>
-#include <atari/atari/intr.h>
+#include <machine/intr.h>
#define AVEC_MIN 1
#define AVEC_MAX 7
Index: src/sys/arch/atari/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.51 src/sys/arch/atari/dev/atari5380.c:1.52
--- src/sys/arch/atari/dev/atari5380.c:1.51 Wed Mar 18 10:22:24 2009
+++ src/sys/arch/atari/dev/atari5380.c Wed Jul 8 12:23:09 2009
@@ -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 @@
#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>
Index: src/sys/arch/atari/dev/dma.c
diff -u src/sys/arch/atari/dev/dma.c:1.22 src/sys/arch/atari/dev/dma.c:1.23
--- src/sys/arch/atari/dev/dma.c:1.22 Wed Mar 18 10:22:24 2009
+++ src/sys/arch/atari/dev/dma.c Wed Jul 8 12:23:09 2009
@@ -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 @@
#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 {
Index: src/sys/arch/atari/dev/hdfd.c
diff -u src/sys/arch/atari/dev/hdfd.c:1.70 src/sys/arch/atari/dev/hdfd.c:1.71
--- src/sys/arch/atari/dev/hdfd.c:1.70 Wed Mar 18 16:00:10 2009
+++ src/sys/arch/atari/dev/hdfd.c Wed Jul 8 12:23:09 2009
@@ -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 @@
#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"
Index: src/sys/arch/atari/dev/lpt.c
diff -u src/sys/arch/atari/dev/lpt.c:1.30 src/sys/arch/atari/dev/lpt.c:1.31
--- src/sys/arch/atari/dev/lpt.c:1.30 Fri Jun 13 08:50:12 2008
+++ src/sys/arch/atari/dev/lpt.c Wed Jul 8 12:23:10 2009
@@ -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 @@
#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
Index: src/sys/arch/atari/dev/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.43 src/sys/arch/atari/dev/ser.c:1.44
--- src/sys/arch/atari/dev/ser.c:1.43 Fri Jul 3 17:05:54 2009
+++ src/sys/arch/atari/dev/ser.c Wed Jul 8 12:23:10 2009
@@ -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 @@
#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_)
Index: src/sys/arch/atari/include/intr.h
diff -u src/sys/arch/atari/include/intr.h:1.20 src/sys/arch/atari/include/intr.h:1.21
--- src/sys/arch/atari/include/intr.h:1.20 Thu Mar 5 13:00:45 2009
+++ src/sys/arch/atari/include/intr.h Wed Jul 8 12:23:10 2009
@@ -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 @@
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_ */
Index: src/sys/arch/atari/include/isa_machdep.h
diff -u src/sys/arch/atari/include/isa_machdep.h:1.12 src/sys/arch/atari/include/isa_machdep.h:1.13
--- src/sys/arch/atari/include/isa_machdep.h:1.12 Mon Apr 28 20:23:15 2008
+++ src/sys/arch/atari/include/isa_machdep.h Wed Jul 8 12:23:10 2009
@@ -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;
Index: src/sys/arch/atari/include/pci_machdep.h
diff -u src/sys/arch/atari/include/pci_machdep.h:1.12 src/sys/arch/atari/include/pci_machdep.h:1.13
--- src/sys/arch/atari/include/pci_machdep.h:1.12 Sun Dec 11 12:16:59 2005
+++ src/sys/arch/atari/include/pci_machdep.h Wed Jul 8 12:23:10 2009
@@ -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.
Index: src/sys/arch/atari/vme/if_le_vme.c
diff -u src/sys/arch/atari/vme/if_le_vme.c:1.25 src/sys/arch/atari/vme/if_le_vme.c:1.26
--- src/sys/arch/atari/vme/if_le_vme.c:1.25 Wed Mar 18 17:06:43 2009
+++ src/sys/arch/atari/vme/if_le_vme.c Wed Jul 8 12:23:10 2009
@@ -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 @@
#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>
