Author: jkim
Date: Wed Nov 19 20:31:38 2008
New Revision: 185103
URL: http://svn.freebsd.org/changeset/base/185103
Log:
Make sure legacy replacement route is turned off when enbling HPET.
Reviewed by: jhb
Modified:
head/sys/dev/acpica/acpi_hpet.c
Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c Wed Nov 19 20:06:59 2008
(r185102)
+++ head/sys/dev/acpica/acpi_hpet.c Wed Nov 19 20:31:38 2008
(r185103)
@@ -83,7 +83,9 @@ hpet_enable(struct acpi_hpet_softc *sc)
uint32_t val;
val = bus_read_4(sc->mem_res, HPET_CONFIG);
- bus_write_4(sc->mem_res, HPET_CONFIG, val | HPET_CNF_ENABLE);
+ val &= ~HPET_CNF_LEG_RT;
+ val |= HPET_CNF_ENABLE;
+ bus_write_4(sc->mem_res, HPET_CONFIG, val);
}
static void
@@ -92,7 +94,8 @@ hpet_disable(struct acpi_hpet_softc *sc)
uint32_t val;
val = bus_read_4(sc->mem_res, HPET_CONFIG);
- bus_write_4(sc->mem_res, HPET_CONFIG, val & ~HPET_CNF_ENABLE);
+ val &= ~HPET_CNF_ENABLE;
+ bus_write_4(sc->mem_res, HPET_CONFIG, val);
}
/* Discover the HPET via the ACPI table of the same name. */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"
