CVS commit: [netbsd-5] src/sys/arch/atari/dev

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Sat Nov 20 01:09:27 UTC 2010

Modified Files:
src/sys/arch/atari/dev [netbsd-5]: atari5380.c dma.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1373):
sys/arch/atari/dev/dma.c: revision 1.25
sys/arch/atari/dev/atari5380.c: revision 1.54
Always schedule callback functions via add_sicallback(),
which calls softint_schedule(9).
We cannot use BASEPRI() to check recursive calls any longer
since softint(9) has been reorganized to use kernel thread.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/arch/atari/dev/atari5380.c
cvs rdiff -u -r1.18 -r1.18.54.1 src/sys/arch/atari/dev/dma.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/dev/atari5380.c
diff -u src/sys/arch/atari/dev/atari5380.c:1.46 src/sys/arch/atari/dev/atari5380.c:1.46.2.1
--- src/sys/arch/atari/dev/atari5380.c:1.46	Wed Oct 29 14:31:01 2008
+++ src/sys/arch/atari/dev/atari5380.c	Sat Nov 20 01:09:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: atari5380.c,v 1.46 2008/10/29 14:31:01 abs Exp $	*/
+/*	$NetBSD: atari5380.c,v 1.46.2.1 2010/11/20 01:09:27 riz Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: atari5380.c,v 1.46 2008/10/29 14:31:01 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: atari5380.c,v 1.46.2.1 2010/11/20 01:09:27 riz Exp $);
 
 #include opt_atariscsi.h
 
@@ -1131,14 +1131,7 @@
 {
 	if (GET_5380_REG(NCR5380_DMSTAT)  SC_IRQ_SET) {
 		scsi_idisable();
-		if (!BASEPRI(sr))
-			add_sicallback((si_farg)ncr_ctrl_intr,
-		(void *)cur_softc, 0);
-		else {
-			spl1();
-			ncr_ctrl_intr(cur_softc);
-			spl0();
-		}
+		add_sicallback((si_farg)ncr_ctrl_intr, (void *)cur_softc, 0);
 	}
 }
 
@@ -1152,14 +1145,7 @@
 
 	if ((reqp = connected)  (reqp-dr_flag  DRIVER_IN_DMA)) {
 		scsi_idisable();
-		if (!BASEPRI(sr))
-			add_sicallback((si_farg)ncr_dma_intr,
-	(void *)cur_softc, 0);
-		else {
-			spl1();
-			ncr_dma_intr(cur_softc);
-			spl0();
-		}
+		add_sicallback((si_farg)ncr_dma_intr, (void *)cur_softc, 0);
 	}
 }
 

Index: src/sys/arch/atari/dev/dma.c
diff -u src/sys/arch/atari/dev/dma.c:1.18 src/sys/arch/atari/dev/dma.c:1.18.54.1
--- src/sys/arch/atari/dev/dma.c:1.18	Sun Mar  4 05:59:40 2007
+++ src/sys/arch/atari/dev/dma.c	Sat Nov 20 01:09:27 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $	*/
+/*	$NetBSD: dma.c,v 1.18.54.1 2010/11/20 01:09:27 riz Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: dma.c,v 1.18.54.1 2010/11/20 01:09:27 riz Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -232,14 +232,7 @@
 		 */
 		int_func = dma_active.tqh_first-int_func;
 		softc= dma_active.tqh_first-softc;
-
-		if(!BASEPRI(sr))
-			add_sicallback((si_farg)int_func, softc, 0);
-		else {
-			spl1();
-			(*int_func)(softc);
-			spl0();
-		}
+		add_sicallback((si_farg)int_func, softc, 0);
 		return 1;
 	}
 	return 0;

CVS commit: [netbsd-5] src/sys/arch/atari/dev

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sun Oct  4 00:31:52 UTC 2009

Modified Files:
src/sys/arch/atari/dev [netbsd-5]: clock.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1057):
sys/arch/atari/dev/clock.c: revision 1.47
Add a workaround for annoying
WARNING: negative runtime; monotonic clock has gone backwards
message. Partially taken from hp300.


To generate a diff of this commit:
cvs rdiff -u -r1.41.6.1 -r1.41.6.2 src/sys/arch/atari/dev/clock.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/dev/clock.c
diff -u src/sys/arch/atari/dev/clock.c:1.41.6.1 src/sys/arch/atari/dev/clock.c:1.41.6.2
--- src/sys/arch/atari/dev/clock.c:1.41.6.1	Thu Nov  6 00:15:55 2008
+++ src/sys/arch/atari/dev/clock.c	Sun Oct  4 00:31:52 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.41.6.1 2008/11/06 00:15:55 snj Exp $	*/
+/*	$NetBSD: clock.c,v 1.41.6.2 2009/10/04 00:31:52 snj Exp $	*/
 
 /*
  * Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.41.6.1 2008/11/06 00:15:55 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.41.6.2 2009/10/04 00:31:52 snj Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -319,21 +319,29 @@
 static u_int
 clk_getcounter(struct timecounter *tc)
 {
-	u_int delta;
-	u_char ipra, tadr;
-	int s, cur_hardclock;
+	uint32_t delta, count, cur_hardclock;
+	uint8_t ipra, tadr;
+	int s;
+	static uint32_t lastcount;
 
 	s = splhigh();
+	cur_hardclock = hardclock_ticks;
 	ipra = MFP-mf_ipra;
 	tadr = MFP-mf_tadr;
 	delta = divisor - tadr;
 
 	if (ipra  IA_TIMA)
 		delta += divisor;
-	cur_hardclock = hardclock_ticks;
 	splx(s);
 
-	return (divisor - tadr) + divisor * cur_hardclock;
+	count = (divisor * cur_hardclock) + delta;
+	if ((int32_t)(count - lastcount)  0) {
+		/* XXX wrapped; maybe hardclock() is blocked more than 2/HZ */
+		count = lastcount + 1;
+	}
+	lastcount = count;
+
+	return count;
 }
 
 #define TIMB_FREQ	614400