Module Name: src
Committed By: cegger
Date: Tue May 12 14:46:01 UTC 2009
Modified Files:
src/sys/dev/std: ieee1212.c ieee1212var.h
Log Message:
struct device * -> device_t, no functional changes intended.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/std/ieee1212.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/std/ieee1212var.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/dev/std/ieee1212.c
diff -u src/sys/dev/std/ieee1212.c:1.11 src/sys/dev/std/ieee1212.c:1.12
--- src/sys/dev/std/ieee1212.c:1.11 Mon Apr 28 20:23:58 2008
+++ src/sys/dev/std/ieee1212.c Tue May 12 14:46:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1212.c,v 1.11 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: ieee1212.c,v 1.12 2009/05/12 14:46:01 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.11 2008/04/28 20:23:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.12 2009/05/12 14:46:01 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1207,12 +1207,12 @@
* can match and attach multiple children in one pass.
*/
-struct device **
-p1212_match_units(struct device *sc, struct p1212_dir *dir,
+device_t *
+p1212_match_units(device_t sc, struct p1212_dir *dir,
int (*print)(void *, const char *))
{
struct p1212_dir **udirs;
- struct device **devret, *dev;
+ device_t *devret, *dev;
int numdev;
/*
@@ -1221,7 +1221,7 @@
*/
numdev = 0;
- devret = malloc(sizeof(struct device *) * 2, M_DEVBUF, M_WAITOK);
+ devret = malloc(sizeof(device_t) * 2, M_DEVBUF, M_WAITOK);
devret[1] = NULL;
udirs = (struct p1212_dir **)p1212_find(dir, P1212_KEYTYPE_Directory,
@@ -1233,7 +1233,7 @@
dev = config_found_ia(sc, "fwnode", udirs, print);
if (dev && numdev) {
devret = realloc(devret,
- sizeof(struct device *) *
+ sizeof(device_t) *
(numdev + 2), M_DEVBUF, M_WAITOK);
devret[numdev++] = dev;
devret[numdev] = NULL;
Index: src/sys/dev/std/ieee1212var.h
diff -u src/sys/dev/std/ieee1212var.h:1.4 src/sys/dev/std/ieee1212var.h:1.5
--- src/sys/dev/std/ieee1212var.h:1.4 Mon Apr 28 20:23:58 2008
+++ src/sys/dev/std/ieee1212var.h Tue May 12 14:46:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1212var.h,v 1.4 2008/04/28 20:23:58 martin Exp $ */
+/* $NetBSD: ieee1212var.h,v 1.5 2009/05/12 14:46:01 cegger Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
struct p1212_key **p1212_find(struct p1212_dir *, int, int, int);
void p1212_print(struct p1212_dir *);
void p1212_free(struct p1212_rom *);
-struct device **p1212_match_units(struct device *, struct p1212_dir *,
+device_t *p1212_match_units(device_t, struct p1212_dir *,
int (*)(void *, const char *));
#endif /* _DEV_STD_IEEE1212VAR_H */
