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

Add a bus-independent detachment routine. In the attachment routine, 

save some device state to restore during detachment.
This commit is contained in:
dyoung 2009-08-18 17:06:35 +00:00
parent 47b66b70d9
commit 62dca01035
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/dev/ic/hpet.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpet.c,v 1.6 2008/03/21 13:25:27 xtraeme Exp $ */
/* $NetBSD: hpet.c,v 1.7 2009/08/18 17:06:35 dyoung Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.6 2008/03/21 13:25:27 xtraeme Exp $");
__KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.7 2009/08/18 17:06:35 dyoung Exp $");
#include <sys/systm.h>
#include <sys/device.h>
@ -50,6 +50,22 @@ __KERNEL_RCSID(0, "$NetBSD: hpet.c,v 1.6 2008/03/21 13:25:27 xtraeme Exp $");
static u_int hpet_get_timecount(struct timecounter *);
static bool hpet_resume(device_t PMF_FN_PROTO);
int
hpet_detach(device_t dv, int flags)
{
struct hpet_softc *sc = device_private(dv);
int rc;
if ((rc = tc_detach(&sc->sc_tc)) != 0)
return rc;
pmf_device_deregister(dv);
bus_space_write_4(sc->sc_memt, sc->sc_memh, HPET_CONFIG, sc->sc_config);
return 0;
}
void
hpet_attach_subr(device_t dv)
{
@ -71,6 +87,7 @@ hpet_attach_subr(device_t dv)
/* Enable timer */
val = bus_space_read_4(sc->sc_memt, sc->sc_memh, HPET_CONFIG);
sc->sc_config = val;
if ((val & HPET_CONFIG_ENABLE) == 0) {
val |= HPET_CONFIG_ENABLE;
bus_space_write_4(sc->sc_memt, sc->sc_memh, HPET_CONFIG, val);

4
sys/dev/ic/hpetvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: hpetvar.h,v 1.2 2008/03/21 13:25:27 xtraeme Exp $ */
/* $NetBSD: hpetvar.h,v 1.3 2009/08/18 17:06:35 dyoung Exp $ */
/*
* Copyright (c) 2006 Nicolas Joly
@ -35,9 +35,11 @@ struct hpet_softc {
bus_space_tag_t sc_memt;
bus_space_handle_t sc_memh;
uint32_t sc_config;
struct timecounter sc_tc;
};
void hpet_attach_subr(device_t);
int hpet_detach(device_t, int flags);
#endif /* _DEV_IC_HPETVAR_H_ */