[src/trunk]: src/sys/arch/usermode/dev Move the clock device and the ld devic...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/506cf5c4ad3e
branches:  trunk
changeset: 769495:506cf5c4ad3e
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Mon Sep 12 12:25:45 2011 +0000

description:
Move the clock device and the ld device to the new spl interrupt PIC

diffstat:

 sys/arch/usermode/dev/clock.c       |  9 +++++----
 sys/arch/usermode/dev/ld_thunkbus.c |  8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r 3e71d46d1586 -r 506cf5c4ad3e sys/arch/usermode/dev/clock.c
--- a/sys/arch/usermode/dev/clock.c     Mon Sep 12 12:24:34 2011 +0000
+++ b/sys/arch/usermode/dev/clock.c     Mon Sep 12 12:25:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.16 2011/09/08 12:10:13 jmcneill Exp $ */
+/* $NetBSD: clock.c,v 1.17 2011/09/12 12:25:45 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.16 2011/09/08 12:10:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2011/09/12 12:25:45 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -111,7 +111,7 @@
        memset(&sa, 0, sizeof(sa));
        sigfillset(&sa.sa_mask);
        sa.sa_handler = clock_signal;
-       sa.sa_flags = SA_ONSTACK;
+       sa.sa_flags = 0; // SA_ONSTACK;
        if (thunk_sigaction(SIGALRM, &sa, NULL) == -1)
                panic("couldn't register SIGALRM handler : %d",
                    thunk_geterrno());
@@ -131,7 +131,8 @@
 
        curcpu()->ci_idepth++;
 
-       hardclock(&cf);
+       spl_intr(IPL_SOFTCLOCK, (void (*)(void *)) hardclock, &cf);
+       // hardclock(&cf);
 
        curcpu()->ci_idepth--;
 }
diff -r 3e71d46d1586 -r 506cf5c4ad3e sys/arch/usermode/dev/ld_thunkbus.c
--- a/sys/arch/usermode/dev/ld_thunkbus.c       Mon Sep 12 12:24:34 2011 +0000
+++ b/sys/arch/usermode/dev/ld_thunkbus.c       Mon Sep 12 12:25:45 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_thunkbus.c,v 1.12 2011/09/05 18:17:08 jmcneill Exp $ */
+/* $NetBSD: ld_thunkbus.c,v 1.13 2011/09/12 12:25:45 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.12 2011/09/05 18:17:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_thunkbus.c,v 1.13 2011/09/12 12:25:45 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -41,6 +41,7 @@
 
 #include <machine/mainbus.h>
 #include <machine/thunk.h>
+#include <machine/intr.h>
 
 static int     ld_thunkbus_match(device_t, cfdata_t, void *);
 static void    ld_thunkbus_attach(device_t, device_t, void *);
@@ -152,7 +153,8 @@
                        tt = info->si_value.sival_ptr;
                if (tt) {
                        sc = tt->tt_sc;
-                       softint_schedule(sc->sc_ih);
+                       spl_intr(IPL_BIO, softint_schedule, sc->sc_ih);
+                       // softint_schedule(sc->sc_ih);
                }
        }