Module Name: src
Committed By: tsutsui
Date: Sat Jun 26 03:49:52 UTC 2010
Modified Files:
src/sys/arch/newsmips/apbus: zs_ap.c
src/sys/arch/newsmips/include: z8530var.h
Log Message:
Um, fix botch in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/newsmips/apbus/zs_ap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/newsmips/include/z8530var.h
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/newsmips/apbus/zs_ap.c
diff -u src/sys/arch/newsmips/apbus/zs_ap.c:1.26 src/sys/arch/newsmips/apbus/zs_ap.c:1.27
--- src/sys/arch/newsmips/apbus/zs_ap.c:1.26 Sat Jun 26 03:44:49 2010
+++ src/sys/arch/newsmips/apbus/zs_ap.c Sat Jun 26 03:49:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ap.c,v 1.26 2010/06/26 03:44:49 tsutsui Exp $ */
+/* $NetBSD: zs_ap.c,v 1.27 2010/06/26 03:49:52 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ap.c,v 1.26 2010/06/26 03:44:49 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ap.c,v 1.27 2010/06/26 03:49:52 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -296,7 +296,8 @@
/*
* Now safe to install interrupt handlers.
*/
- zsc->zsc_si = softint_establish(SOFTINT_SERIAL, zssoft, zsc);
+ zsc->zsc_si = softint_establish(SOFTINT_SERIAL,
+ (void (*)(void *))zsc_intr_soft, zsc);
apbus_intr_establish(1, /* interrupt level ( 0 or 1 ) */
NEWS5000_INT1_SCC, 0, /* priority */
zshard_ap, zsc, apa->apa_name, apa->apa_ctlnum);
Index: src/sys/arch/newsmips/include/z8530var.h
diff -u src/sys/arch/newsmips/include/z8530var.h:1.10 src/sys/arch/newsmips/include/z8530var.h:1.11
--- src/sys/arch/newsmips/include/z8530var.h:1.10 Sat Mar 29 19:15:35 2008
+++ src/sys/arch/newsmips/include/z8530var.h Sat Jun 26 03:49:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530var.h,v 1.10 2008/03/29 19:15:35 tsutsui Exp $ */
+/* $NetBSD: z8530var.h,v 1.11 2010/06/26 03:49:52 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -111,7 +111,6 @@
int zs_print(void *, const char *);
int zshard(void *);
-void zssoft(void*);
int zs_get_speed(struct zs_chanstate *);
void (*zs_delay)(void);
