diff options
| author | cegger <cegger@NetBSD.org> | 2009-05-12 14:38:26 +0000 |
|---|---|---|
| committer | cegger <cegger@NetBSD.org> | 2009-05-12 14:38:26 +0000 |
| commit | 7cf2991222ea44a8a722cf40f50f32f50785265e (patch) | |
| tree | 731d31e467e3cddc3965b328d7fa313614de7008 /sys/dev/std | |
| parent | 99747a8099a6916ccfc458619170aec025801090 (diff) | |
struct device * -> device_t, no functional changes intended.
Diffstat (limited to 'sys/dev/std')
| -rw-r--r-- | sys/dev/std/ieee1212.c | 14 | ||||
| -rw-r--r-- | sys/dev/std/ieee1212var.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/std/ieee1212.c b/sys/dev/std/ieee1212.c index 026ae1399d8..e8e58d1884d 100644 --- a/sys/dev/std/ieee1212.c +++ b/sys/dev/std/ieee1212.c @@ -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 @@ p1212_calc_crc(u_int32_t crc, u_int32_t *data, int len, int broke) * 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 @@ p1212_match_units(struct device *sc, struct p1212_dir *dir, */ 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 @@ p1212_match_units(struct device *sc, struct p1212_dir *dir, 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; diff --git a/sys/dev/std/ieee1212var.h b/sys/dev/std/ieee1212var.h index 3a47c3fa72d..6abb81bbc9e 100644 --- a/sys/dev/std/ieee1212var.h +++ b/sys/dev/std/ieee1212var.h @@ -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 @@ void p1212_walk(struct p1212_dir *, void *, 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 */ |
