Module Name: src
Committed By: rkujawa
Date: Wed Sep 21 12:40:25 UTC 2011
Modified Files:
src/sys/arch/amiga/dev: zbus.c zbusvar.h
Log Message:
Fix build for both amiga and amigappc (discussed with christos).
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amiga/dev/zbus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/dev/zbusvar.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/amiga/dev/zbus.c
diff -u src/sys/arch/amiga/dev/zbus.c:1.66 src/sys/arch/amiga/dev/zbus.c:1.67
--- src/sys/arch/amiga/dev/zbus.c:1.66 Tue Sep 20 18:11:51 2011
+++ src/sys/arch/amiga/dev/zbus.c Wed Sep 21 12:40:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zbus.c,v 1.66 2011/09/20 18:11:51 christos Exp $ */
+/* $NetBSD: zbus.c,v 1.67 2011/09/21 12:40:25 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.66 2011/09/20 18:11:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zbus.c,v 1.67 2011/09/21 12:40:25 rkujawa Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -239,7 +239,6 @@
int zbusprint(void *, const char *);
int zbusmatch(device_t, cfdata_t, void *);
static const char *aconflookup(int, int);
-static void *zbusmap(void *, u_int);
/*
* given a manufacturer id and product id, find quirks
@@ -388,7 +387,7 @@
* Zorro devices) to have enough kva-space available, so there is no extra
* range check done here.
*/
-static void *
+void *
zbusmap(void *pa, u_int size)
{
#if defined(__m68k__)
Index: src/sys/arch/amiga/dev/zbusvar.h
diff -u src/sys/arch/amiga/dev/zbusvar.h:1.8 src/sys/arch/amiga/dev/zbusvar.h:1.9
--- src/sys/arch/amiga/dev/zbusvar.h:1.8 Tue Feb 2 19:03:31 2010
+++ src/sys/arch/amiga/dev/zbusvar.h Wed Sep 21 12:40:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: zbusvar.h,v 1.8 2010/02/02 19:03:31 phx Exp $ */
+/* $NetBSD: zbusvar.h,v 1.9 2011/09/21 12:40:25 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -52,6 +52,8 @@
#define ZTWOROMTOP (0x00F80000)
#define NZTWOROMPG btoc(ZTWOROMTOP-ZTWOROMBASE)
+void * zbusmap(void *pa, u_int size);
+
/*
* maps a ztwo and/or A3000 builtin address into the mapped kva address
*/
