Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src/sys/arch/evbarm/iq80310 Pull up following revision(s) (re...
details: https://anonhg.NetBSD.org/src/rev/3ed311588bdb
branches: netbsd-6
changeset: 775358:3ed311588bdb
user: riz <riz%NetBSD.org@localhost>
date: Wed Oct 17 21:53:58 2012 +0000
description:
Pull up following revision(s) (requested by chs in ticket #591):
sys/arch/evbarm/iq80310/i80312_mainbus.c: revision 1.15
sys/arch/evbarm/iq80310/iq80310var.h: revision 1.8
sys/arch/evbarm/iq80310/iq80310_intr.c: revision 1.32
defer evcnt attachment correctly.
diffstat:
sys/arch/evbarm/iq80310/i80312_mainbus.c | 5 +++--
sys/arch/evbarm/iq80310/iq80310_intr.c | 19 +++++++++++++++----
sys/arch/evbarm/iq80310/iq80310var.h | 3 ++-
3 files changed, 20 insertions(+), 7 deletions(-)
diffs (90 lines):
diff -r acf02b8e19d1 -r 3ed311588bdb sys/arch/evbarm/iq80310/i80312_mainbus.c
--- a/sys/arch/evbarm/iq80310/i80312_mainbus.c Wed Oct 17 21:51:14 2012 +0000
+++ b/sys/arch/evbarm/iq80310/i80312_mainbus.c Wed Oct 17 21:53:58 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: i80312_mainbus.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $ */
+/* $NetBSD: i80312_mainbus.c,v 1.14.8.1 2012/10/17 21:53:58 riz Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80312_mainbus.c,v 1.14 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80312_mainbus.c,v 1.14.8.1 2012/10/17 21:53:58 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,6 +98,7 @@
psize_t memsize;
i80312_mainbus_found = 1;
+ iq80310_intr_evcnt_attach();
/*
* Fill in the space tag for the i80312's own devices,
diff -r acf02b8e19d1 -r 3ed311588bdb sys/arch/evbarm/iq80310/iq80310_intr.c
--- a/sys/arch/evbarm/iq80310/iq80310_intr.c Wed Oct 17 21:51:14 2012 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310_intr.c Wed Oct 17 21:53:58 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.29.8.1 2012/08/20 19:39:27 riz Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.29.8.2 2012/10/17 21:53:58 riz Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.29.8.1 2012/08/20 19:39:27 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.29.8.2 2012/10/17 21:53:58 riz Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -350,6 +350,19 @@
enable_interrupts(I32_bit);
}
+void
+iq80310_intr_evcnt_attach(void)
+{
+ struct intrq *iq;
+ int i;
+
+ for (i = 0; i < NIRQ; i++) {
+ iq = &intrq[i];
+ evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
+ NULL, "iq80310", iq->iq_name);
+ }
+}
+
void *
iq80310_intr_establish(int irq, int ipl, int (*func)(void *), void *arg)
{
@@ -377,8 +390,6 @@
oldirqstate = disable_interrupts(I32_bit);
TAILQ_INSERT_TAIL(&iq->iq_list, ih, ih_list);
- evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
- NULL, "iq80310", iq->iq_name);
iq80310_intr_calculate_masks();
diff -r acf02b8e19d1 -r 3ed311588bdb sys/arch/evbarm/iq80310/iq80310var.h
--- a/sys/arch/evbarm/iq80310/iq80310var.h Wed Oct 17 21:51:14 2012 +0000
+++ b/sys/arch/evbarm/iq80310/iq80310var.h Wed Oct 17 21:53:58 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310var.h,v 1.7 2002/10/08 17:39:17 thorpej Exp $ */
+/* $NetBSD: iq80310var.h,v 1.7.152.1 2012/10/17 21:53:58 riz Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -94,6 +94,7 @@
void iq80310_pci_init(pci_chipset_tag_t, void *);
void iq80310_intr_init(void);
+void iq80310_intr_evcnt_attach(void);
void *iq80310_intr_establish(int, int, int (*)(void *), void *);
void iq80310_intr_disestablish(void *);
Home |
Main Index |
Thread Index |
Old Index