Module Name: src Committed By: riz Date: Fri Nov 26 17:16:03 UTC 2010
Modified Files: src/sys/arch/hpcmips/tx [netbsd-5]: txcom.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1485): sys/arch/hpcmips/tx/txcom.c: revision 1.42 sys/arch/hpcmips/tx/txcom.c: revision 1.43 Add missing callout_init(9) calls. PR port-hpcmips/43472 Fix a wrong arg for callout_reset(9) in txcom_txintr(). PR port-hpcmips/43474 To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.6.1 src/sys/arch/hpcmips/tx/txcom.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/hpcmips/tx/txcom.c diff -u src/sys/arch/hpcmips/tx/txcom.c:1.40 src/sys/arch/hpcmips/tx/txcom.c:1.40.6.1 --- src/sys/arch/hpcmips/tx/txcom.c:1.40 Thu Jun 12 16:50:53 2008 +++ src/sys/arch/hpcmips/tx/txcom.c Fri Nov 26 17:16:03 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: txcom.c,v 1.40 2008/06/12 16:50:53 tsutsui Exp $ */ +/* $NetBSD: txcom.c,v 1.40.6.1 2010/11/26 17:16:03 riz Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: txcom.c,v 1.40 2008/06/12 16:50:53 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: txcom.c,v 1.40.6.1 2010/11/26 17:16:03 riz Exp $"); #include "opt_tx39uart_debug.h" @@ -252,6 +252,10 @@ printf("\n"); + /* initialize callouts */ + callout_init(&sc->sc_txsoft_ch, 0); + callout_init(&sc->sc_rxsoft_ch, 0); + /* * Enable interrupt */ @@ -748,7 +752,7 @@ sc->sc_tbc--; sc->sc_tba++; } else { - callout_reset(&sc->sc_rxsoft_ch, 1, txcom_txsoft, sc); + callout_reset(&sc->sc_txsoft_ch, 1, txcom_txsoft, sc); } return 0;