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

device_t/softc split and other related cosmetic changes.

Browse Source
This commit is contained in:
xtraeme 2008-05-05 13:58:58 +00:00
parent 3b0a20c6a8
commit f14b65c700
2 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/dev/onewire/onewire.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: onewire.c,v 1.8 2008/04/08 20:14:02 cegger Exp $ */
/* $NetBSD: onewire.c,v 1.9 2008/05/05 13:58:58 xtraeme Exp $ */
/* $OpenBSD: onewire.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.8 2008/04/08 20:14:02 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.9 2008/05/05 13:58:58 xtraeme Exp $");
/*
* 1-Wire bus driver.
@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: onewire.c,v 1.8 2008/04/08 20:14:02 cegger Exp $");
#define ONEWIRE_SCANTIME 3
struct onewire_softc {
struct device sc_dev;
device_t sc_dev;
struct onewire_bus * sc_bus;
krwlock_t sc_rwlock;
@ -61,21 +61,21 @@ struct onewire_softc {
struct onewire_device {
TAILQ_ENTRY(onewire_device) d_list;
struct device * d_dev;
device_t d_dev;
u_int64_t d_rom;
int d_present;
};
int onewire_match(struct device *, struct cfdata *, void *);
void onewire_attach(struct device *, struct device *, void *);
int onewire_detach(struct device *, int);
int onewire_activate(struct device *, enum devact);
int onewire_print(void *, const char *);
static int onewire_match(device_t, cfdata_t, void *);
static void onewire_attach(device_t, device_t, void *);
static int onewire_detach(device_t, int);
static int onewire_activate(device_t, enum devact);
int onewire_print(void *, const char *);
void onewire_thread(void *);
void onewire_scan(struct onewire_softc *);
static void onewire_thread(void *);
static void onewire_scan(struct onewire_softc *);
CFATTACH_DECL(onewire, sizeof(struct onewire_softc),
CFATTACH_DECL_NEW(onewire, sizeof(struct onewire_softc),
onewire_match, onewire_attach, onewire_detach, onewire_activate);
const struct cdevsw onewire_cdevsw = {
@ -85,18 +85,19 @@ const struct cdevsw onewire_cdevsw = {
extern struct cfdriver onewire_cd;
int
onewire_match(struct device *parent, struct cfdata *cf, void *aux)
static int
onewire_match(device_t parent, cfdata_t cf, void *aux)
{
return 1;
}
void
onewire_attach(struct device *parent, struct device *self, void *aux)
static void
onewire_attach(device_t parent, device_t self, void *aux)
{
struct onewire_softc *sc = device_private(self);
struct onewirebus_attach_args *oba = aux;
sc->sc_dev = self;
sc->sc_bus = oba->oba_bus;
rw_init(&sc->sc_rwlock);
TAILQ_INIT(&sc->sc_devs);
@ -105,12 +106,12 @@ onewire_attach(struct device *parent, struct device *self, void *aux)
aprint_normal("\n");
if (kthread_create(PRI_NONE, 0, NULL, onewire_thread, sc,
&sc->sc_thread, "%s", device_xname(&sc->sc_dev)) != 0)
aprint_error_dev(&sc->sc_dev, "can't create kernel thread\n");
&sc->sc_thread, "%s", device_xname(self)) != 0)
aprint_error_dev(self, "can't create kernel thread\n");
}
int
onewire_detach(struct device *self, int flags)
static int
onewire_detach(device_t self, int flags)
{
struct onewire_softc *sc = device_private(self);
int rv;
@ -130,8 +131,8 @@ onewire_detach(struct device *self, int flags)
return rv;
}
int
onewire_activate(struct device *self, enum devact act)
static int
onewire_activate(device_t self, enum devact act)
{
struct onewire_softc *sc = device_private(self);
int rv = 0;
@ -302,7 +303,7 @@ onewire_matchrom(void *arg, u_int64_t rom)
onewire_write_byte(arg, (rom >> (i * 8)) & 0xff);
}
void
static void
onewire_thread(void *arg)
{
struct onewire_softc *sc = arg;
@ -316,7 +317,8 @@ onewire_thread(void *arg)
wakeup(&sc->sc_dying);
kthread_exit(0);
}
void
static void
onewire_scan(struct onewire_softc *sc)
{
struct onewire_device *d, *next, *nd;
@ -342,7 +344,7 @@ onewire_scan(struct onewire_softc *sc)
onewire_lock(sc);
if (onewire_reset(sc) != 0) {
DPRINTF(("%s: scan: no presence pulse\n",
device_xname(&sc->sc_dev)));
device_xname(sc->sc_dev)));
onewire_unlock(sc);
break;
}
@ -382,7 +384,7 @@ onewire_scan(struct onewire_softc *sc)
default:
DPRINTF(("%s: scan: triplet error 0x%x, "
"step %d\n",
device_xname(&sc->sc_dev), rv, i));
device_xname(sc->sc_dev), rv, i));
onewire_unlock(sc);
return;
}
@ -420,7 +422,7 @@ onewire_scan(struct onewire_softc *sc)
bzero(&oa, sizeof(oa));
oa.oa_onewire = sc;
oa.oa_rom = rom;
if ((dev = config_found(&sc->sc_dev, &oa,
if ((dev = config_found(sc->sc_dev, &oa,
onewire_print)) == NULL)
continue;

46
sys/dev/onewire/owtemp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: owtemp.c,v 1.13 2008/04/08 20:14:02 cegger Exp $ */
/* $NetBSD: owtemp.c,v 1.14 2008/05/05 13:58:58 xtraeme Exp $ */
/* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.13 2008/04/08 20:14:02 cegger Exp $");
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.14 2008/05/05 13:58:58 xtraeme Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -40,8 +40,6 @@ __KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.13 2008/04/08 20:14:02 cegger Exp $");
#define DS_CMD_READ_SCRATCHPAD 0xbe
struct owtemp_softc {
struct device sc_dev;
void * sc_onewire;
u_int64_t sc_rom;
@ -53,14 +51,14 @@ struct owtemp_softc {
int sc_dying;
};
int owtemp_match(struct device *, struct cfdata *, void *);
void owtemp_attach(struct device *, struct device *, void *);
int owtemp_detach(struct device *, int);
int owtemp_activate(struct device *, enum devact);
static int owtemp_match(device_t, cfdata_t, void *);
static void owtemp_attach(device_t, device_t, void *);
static int owtemp_detach(device_t, int);
static int owtemp_activate(device_t, enum devact);
void owtemp_update(void *);
static void owtemp_update(void *);
CFATTACH_DECL(owtemp, sizeof(struct owtemp_softc),
CFATTACH_DECL_NEW(owtemp, sizeof(struct owtemp_softc),
owtemp_match, owtemp_attach, owtemp_detach, owtemp_activate);
extern struct cfdriver owtemp_cd;
@ -76,19 +74,21 @@ static void owtemp_refresh(struct sysmon_envsys *, envsys_data_t *);
static uint32_t owtemp_decode_ds18b20(const uint8_t *);
static uint32_t owtemp_decode_ds1920(const uint8_t *);
int
owtemp_match(struct device *parent, struct cfdata *cf, void *aux)
static int
owtemp_match(device_t parent, cfdata_t match, void *aux)
{
return (onewire_matchbyfam(aux, owtemp_fams,
__arraycount(owtemp_fams)));
}
void
owtemp_attach(struct device *parent, struct device *self, void *aux)
static void
owtemp_attach(device_t parent, device_t self, void *aux)
{
struct owtemp_softc *sc = device_private(self);
struct onewire_attach_args *oa = aux;
aprint_naive("\n");
sc->sc_onewire = oa->oa_onewire;
sc->sc_rom = oa->oa_rom;
@ -107,28 +107,28 @@ owtemp_attach(struct device *parent, struct device *self, void *aux)
/* Initialize sensor */
sc->sc_sensor.units = ENVSYS_STEMP;
(void)strlcpy(sc->sc_sensor.desc,
device_xname(&sc->sc_dev), sizeof(sc->sc_sensor.desc));
device_xname(self), sizeof(sc->sc_sensor.desc));
if (sysmon_envsys_sensor_attach(sc->sc_sme, &sc->sc_sensor)) {
sysmon_envsys_destroy(sc->sc_sme);
return;
}
/* Hook into system monitor. */
sc->sc_sme->sme_name = device_xname(&sc->sc_dev);
sc->sc_sme->sme_name = device_xname(self);
sc->sc_sme->sme_cookie = sc;
sc->sc_sme->sme_refresh = owtemp_refresh;
if (sysmon_envsys_register(sc->sc_sme)) {
aprint_error_dev(&sc->sc_dev, "unable to register with sysmon\n");
aprint_error_dev(self, "unable to register with sysmon\n");
sysmon_envsys_destroy(sc->sc_sme);
return;
}
printf("\n");
aprint_normal("\n");
}
int
owtemp_detach(struct device *self, int flags)
static int
owtemp_detach(device_t self, int flags)
{
struct owtemp_softc *sc = device_private(self);
@ -137,8 +137,8 @@ owtemp_detach(struct device *self, int flags)
return 0;
}
int
owtemp_activate(struct device *self, enum devact act)
static int
owtemp_activate(device_t self, enum devact act)
{
struct owtemp_softc *sc = device_private(self);
@ -153,7 +153,7 @@ owtemp_activate(struct device *self, enum devact act)
return (0);
}
void
static void
owtemp_update(void *arg)
{
struct owtemp_softc *sc = arg;