Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add device_lookup_private() which is just device_private(device_lookup(&cd, i)) 

Most callers don't want the device_t, they want their softc and that's what
device_lookup_private returns.
This commit is contained in:
matt 2008-03-11 02:42:41 +00:00
parent 6b4e6438d8
commit 1746cafd1c
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/kern/subr_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_autoconf.c,v 1.139 2008/03/07 07:03:06 dyoung Exp $ */
/* $NetBSD: subr_autoconf.c,v 1.140 2008/03/11 02:42:41 matt Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.139 2008/03/07 07:03:06 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.140 2008/03/11 02:42:41 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_ddb.h"
@ -1139,7 +1139,7 @@ config_devalloc(const device_t parent, const cfdata_t cf, const int *locs)
if ((ca->ca_flags & DVF_PRIV_ALLOC) == 0 &&
ca->ca_devsize < sizeof(struct device))
panic("config_devalloc");
panic("config_devalloc: %s", cf->cf_atname);
#ifndef __BROKEN_CONFIG_UNIT_USAGE
if (cf->cf_fstate == FSTATE_STAR) {
@ -1742,6 +1742,25 @@ device_lookup(cfdriver_t cd, int unit)
return (cd->cd_devs[unit]);
}
/*
* device_lookup:
*
* Look up a device instance for a given driver.
*/
void *
device_lookup_private(cfdriver_t cd, int unit)
{
device_t dv;
if (unit < 0 || unit >= cd->cd_ndevs)
return NULL;
if ((dv = cd->cd_devs[unit]) == NULL)
return NULL;
return dv->dv_private;
}
/*
* Accessor functions for the device_t type.
*/

3
sys/sys/device.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: device.h,v 1.107 2008/03/07 07:03:06 dyoung Exp $ */
/* $NetBSD: device.h,v 1.108 2008/03/11 02:42:41 matt Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@ -439,6 +439,7 @@ int config_finalize_register(device_t, int (*)(device_t));
void config_finalize(void);
void *device_lookup(cfdriver_t, int);
void *device_lookup_private(cfdriver_t, int);
#ifdef __HAVE_DEVICE_REGISTER
void device_register(device_t, void *);
#endif