From fee87accc60facdf274014db74538338337e811f Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sat, 26 Jun 2010 03:49:52 +0000 Subject: [PATCH] Um, fix botch in previous. --- sys/arch/newsmips/apbus/zs_ap.c | 7 ++++--- sys/arch/newsmips/include/z8530var.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arch/newsmips/apbus/zs_ap.c b/sys/arch/newsmips/apbus/zs_ap.c index 121f5aa16eb9..f5cb70721ece 100644 --- a/sys/arch/newsmips/apbus/zs_ap.c +++ b/sys/arch/newsmips/apbus/zs_ap.c @@ -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 -__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 #include @@ -296,7 +296,8 @@ zs_ap_attach(device_t parent, device_t self, void *aux) /* * 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); diff --git a/sys/arch/newsmips/include/z8530var.h b/sys/arch/newsmips/include/z8530var.h index 6f349f2b787e..f07a44f7c532 100644 --- a/sys/arch/newsmips/include/z8530var.h +++ b/sys/arch/newsmips/include/z8530var.h @@ -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 @@ void zs_write_data(struct zs_chanstate *cs, uint8_t val); int zs_print(void *, const char *); int zshard(void *); -void zssoft(void*); int zs_get_speed(struct zs_chanstate *); void (*zs_delay)(void);