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

[Izumi Tsutsui]

Module Name:    src
Committed By:   tsutsui
Date:           Fri Jul  3 17:05:54 UTC 2009

Modified Files:
        src/sys/arch/atari/dev: ser.c

Log Message:
Replace traditional MD si_callback() with MI softint(9).


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/atari/dev/ser.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/ser.c
diff -u src/sys/arch/atari/dev/ser.c:1.42 src/sys/arch/atari/dev/ser.c:1.43
--- src/sys/arch/atari/dev/ser.c:1.42	Sat Mar 14 21:04:06 2009
+++ src/sys/arch/atari/dev/ser.c	Fri Jul  3 17:05:54 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ser.c,v 1.42 2009/03/14 21:04:06 dsl Exp $	*/
+/*	$NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 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.42 2009/03/14 21:04:06 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.43 2009/07/03 17:05:54 tsutsui Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mbtype.h"
@@ -200,6 +200,8 @@
 	int		 sc_heldtbc;
 
 	volatile u_char	 sc_heldchange;
+
+	void		*sc_sicookie;
 };
 
 /*
@@ -235,8 +237,6 @@
 static void sersoft(void *);
 static void sertxint(struct ser_softc *, struct tty*);
 
-static volatile int ser_softintr_scheduled = 0;
-
 /*
  * Autoconfig stuff
  */
@@ -297,6 +297,8 @@
 	if (intr_establish(12, USER_VEC, 0, (hw_ifun_t)sertrintr, sc) == NULL)
 		printf("serattach: Can't establish interrupt (12)\n");
 
+	sc->sc_sicookie = softint_establish(SOFTINT_SERIAL, sersoft, sc);
+
 	ym2149_rts(1);
 	ym2149_dtr(1);
 
@@ -1152,8 +1154,6 @@
 	struct ser_softc *sc = arg;
 	struct tty	*tp;
 
-	ser_softintr_scheduled = 0;
-
 	tp = sc->sc_tty;
 	if (tp == NULL)
 		return;
@@ -1205,8 +1205,7 @@
 
 		sc->sc_st_check = 1;
 	}
-	if (!ser_softintr_scheduled)
-		add_sicallback((si_farg)sersoft, sc, 0);
+	softint_schedule(sc->sc_sicookie);
 	return 1;
 }
 
@@ -1286,9 +1285,7 @@
 			sc->sc_tx_done = 1;
 		}
 	}
-
-	if (!ser_softintr_scheduled)
-		add_sicallback((si_farg)sersoft, sc, 0);
+	softint_schedule(sc->sc_sicookie);
 	return 1;
 }