Module Name: src
Committed By: tsutsui
Date: Wed Sep 2 10:34:05 UTC 2009
Modified Files:
src/sys/arch/next68k/dev: esp.c
src/sys/dev/ic: ncr53c9x.c ncr53c9xvar.h
Log Message:
Some backends may use ncr53c9x_abort(), so remove static declaration from
the function and explicitly declare it in ncr53c9xvar.h. Noticed by h...@.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/next68k/dev/esp.c
cvs rdiff -u -r1.139 -r1.140 src/sys/dev/ic/ncr53c9x.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/ic/ncr53c9xvar.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/next68k/dev/esp.c
diff -u src/sys/arch/next68k/dev/esp.c:1.57 src/sys/arch/next68k/dev/esp.c:1.58
--- src/sys/arch/next68k/dev/esp.c:1.57 Tue Dec 16 22:35:24 2008
+++ src/sys/arch/next68k/dev/esp.c Wed Sep 2 10:34:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.57 2008/12/16 22:35:24 christos Exp $ */
+/* $NetBSD: esp.c,v 1.58 2009/09/02 10:34:05 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.57 2008/12/16 22:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.58 2009/09/02 10:34:05 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -649,7 +649,6 @@
}
xfer_len = esc->sc_dmasize - resid;
} else {
-extern void ncr53c9x_abort(struct ncr53c9x_softc *, struct ncr53c9x_ecb *);
#define ncr53c9x_sched_msgout(m) \
do { \
NCR_MISC(("ncr53c9x_sched_msgout %x %d", m, __LINE__)); \
Index: src/sys/dev/ic/ncr53c9x.c
diff -u src/sys/dev/ic/ncr53c9x.c:1.139 src/sys/dev/ic/ncr53c9x.c:1.140
--- src/sys/dev/ic/ncr53c9x.c:1.139 Sat Aug 29 06:05:39 2009
+++ src/sys/dev/ic/ncr53c9x.c Wed Sep 2 10:34:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9x.c,v 1.139 2009/08/29 06:05:39 tsutsui Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.140 2009/09/02 10:34:04 tsutsui Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.139 2009/08/29 06:05:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.140 2009/09/02 10:34:04 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -115,7 +115,6 @@
static void ncr53c9x_msgout(struct ncr53c9x_softc *);
static void ncr53c9x_timeout(void *arg);
static void ncr53c9x_watch(void *arg);
-static void ncr53c9x_abort(struct ncr53c9x_softc *, struct ncr53c9x_ecb *);
static void ncr53c9x_dequeue(struct ncr53c9x_softc *,
struct ncr53c9x_ecb *);
static int ncr53c9x_ioctl(struct scsipi_channel *, u_long,
Index: src/sys/dev/ic/ncr53c9xvar.h
diff -u src/sys/dev/ic/ncr53c9xvar.h:1.52 src/sys/dev/ic/ncr53c9xvar.h:1.53
--- src/sys/dev/ic/ncr53c9xvar.h:1.52 Tue May 12 14:25:18 2009
+++ src/sys/dev/ic/ncr53c9xvar.h Wed Sep 2 10:34:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9xvar.h,v 1.52 2009/05/12 14:25:18 cegger Exp $ */
+/* $NetBSD: ncr53c9xvar.h,v 1.53 2009/09/02 10:34:05 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -443,5 +443,6 @@
void ncr53c9x_reset(struct ncr53c9x_softc *);
int ncr53c9x_intr(void *);
void ncr53c9x_init(struct ncr53c9x_softc *, int);
+void ncr53c9x_abort(struct ncr53c9x_softc *, struct ncr53c9x_ecb *);
#endif /* _DEV_IC_NCR53C9XVAR_H_ */
