CVS commit: src/sys/arch/usermode/dev

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Mon Sep 12 12:25:45 UTC 2011

Modified Files:
        src/sys/arch/usermode/dev: clock.c ld_thunkbus.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/usermode/dev/clock.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/usermode/dev/ld_thunkbus.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/usermode/dev/clock.c
diff -u src/sys/arch/usermode/dev/clock.c:1.16 src/sys/arch/usermode/dev/clock.c:1.17
--- src/sys/arch/usermode/dev/clock.c:1.16	Thu Sep  8 12:10:13 2011
+++ src/sys/arch/usermode/dev/clock.c	Mon Sep 12 12:25:45 2011
@@ -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 <jmcne...@invisible.ca>
@@ -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--;
 }

Index: src/sys/arch/usermode/dev/ld_thunkbus.c
diff -u src/sys/arch/usermode/dev/ld_thunkbus.c:1.12 src/sys/arch/usermode/dev/ld_thunkbus.c:1.13
--- src/sys/arch/usermode/dev/ld_thunkbus.c:1.12	Mon Sep  5 18:17:08 2011
+++ src/sys/arch/usermode/dev/ld_thunkbus.c	Mon Sep 12 12:25:45 2011
@@ -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 <jmcne...@invisible.ca>
@@ -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);
 		}
 	}