Module Name: src
Committed By: maya
Date: Mon Jul 18 21:54:12 UTC 2016
Modified Files:
src/sys/arch/playstation2/dev: sbus.c spd.c
src/sys/arch/playstation2/playstation2: mainbus.c
Log Message:
Adapt to change: struct cfdata * -> cfdata_t
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/playstation2/dev/sbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/playstation2/dev/spd.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/playstation2/playstation2/mainbus.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/playstation2/dev/sbus.c
diff -u src/sys/arch/playstation2/dev/sbus.c:1.12 src/sys/arch/playstation2/dev/sbus.c:1.13
--- src/sys/arch/playstation2/dev/sbus.c:1.12 Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/dev/sbus.c Mon Jul 18 21:54:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sbus.c,v 1.12 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: sbus.c,v 1.13 2016/07/18 21:54:12 maya Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.12 2014/03/31 11:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.13 2016/07/18 21:54:12 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,9 +78,9 @@ STATIC void *sbus_usb_context;
STATIC void sbus_init(int);
STATIC int sbus_intr(void *);
-STATIC int sbus_match(struct device *, struct cfdata *, void *);
+STATIC int sbus_match(struct device *, cfdata_t, void *);
STATIC void sbus_attach(struct device *, struct device *, void *);
-STATIC int sbus_search(struct device *, struct cfdata *,
+STATIC int sbus_search(struct device *, cfdata_t,
const int *, void *);
STATIC int sbus_print(void *, const char *);
@@ -91,7 +91,7 @@ extern struct cfdriver sbus_cd;
STATIC int __sbus_attached;
int
-sbus_match(struct device *parent, struct cfdata *cf, void *aux)
+sbus_match(struct device *parent, cfdata_t cf, void *aux)
{
struct mainbus_attach_args *ma = aux;
@@ -115,7 +115,7 @@ sbus_attach(struct device *parent, struc
}
int
-sbus_search(struct device *parent, struct cfdata *cf,
+sbus_search(struct device *parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct sbus_attach_args sa;
Index: src/sys/arch/playstation2/dev/spd.c
diff -u src/sys/arch/playstation2/dev/spd.c:1.9 src/sys/arch/playstation2/dev/spd.c:1.10
--- src/sys/arch/playstation2/dev/spd.c:1.9 Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/dev/spd.c Mon Jul 18 21:54:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spd.c,v 1.9 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: spd.c,v 1.10 2016/07/18 21:54:12 maya Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.9 2014/03/31 11:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.10 2016/07/18 21:54:12 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.9
#define STATIC static
#endif
-STATIC int spd_match(struct device *, struct cfdata *, void *);
+STATIC int spd_match(struct device *, cfdata_t, void *);
STATIC void spd_attach(struct device *, struct device *, void *);
STATIC int spd_print(void *, const char *);
STATIC int spd_intr(void *);
@@ -70,7 +70,7 @@ CFATTACH_DECL(spd, sizeof(struct device)
#endif
int
-spd_match(struct device *parent, struct cfdata *cf, void *aux)
+spd_match(struct device *parent, cfdata_t cf, void *aux)
{
return ((BOOTINFO_REF(BOOTINFO_DEVCONF) ==
Index: src/sys/arch/playstation2/playstation2/mainbus.c
diff -u src/sys/arch/playstation2/playstation2/mainbus.c:1.12 src/sys/arch/playstation2/playstation2/mainbus.c:1.13
--- src/sys/arch/playstation2/playstation2/mainbus.c:1.12 Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/playstation2/mainbus.c Mon Jul 18 21:54:12 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.12 2014/03/31 11:25:49 martin Exp $ */
+/* $NetBSD: mainbus.c,v 1.13 2016/07/18 21:54:12 maya Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,16 +27,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.12 2014/03/31 11:25:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2016/07/18 21:54:12 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/autoconf.h>
-static int mainbus_match(struct device *, struct cfdata *, void *);
+static int mainbus_match(struct device *, cfdata_t, void *);
static void mainbus_attach(struct device *, struct device *, void *);
-static int mainbus_search(struct device *, struct cfdata *,
+static int mainbus_search(struct device *, cfdata_t,
const int *, void *);
static int mainbus_print(void *, const char *);
@@ -44,7 +44,7 @@ CFATTACH_DECL(mainbus, sizeof(struct dev
mainbus_match, mainbus_attach, NULL, NULL);
static int
-mainbus_match(struct device *parent, struct cfdata *cf, void *aux)
+mainbus_match(struct device *parent, cfdata_t cf, void *aux)
{
return (1);
@@ -64,7 +64,7 @@ mainbus_attach(struct device *parent, st
}
static int
-mainbus_search(struct device *parent, struct cfdata *cf,
+mainbus_search(struct device *parent, cfdata_t cf,
const int *ldesc, void *aux)
{
struct mainbus_attach_args ma;
