projects
/
reactos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
88cdcad
)
[ACPI]
author
Thomas Faber
<thomas.faber@reactos.org>
Mon, 7 Sep 2015 09:08:48 +0000
(09:08 +0000)
committer
Thomas Faber
<thomas.faber@reactos.org>
Mon, 7 Sep 2015 09:08:48 +0000
(09:08 +0000)
- Reinstate the HPET hack, the VMware builders show that it's still needed. Reverts r69066.
svn path=/trunk/; revision=69082
reactos/drivers/bus/acpi/busmgr/bus.c
patch
|
blob
|
history
diff --git
a/reactos/drivers/bus/acpi/busmgr/bus.c
b/reactos/drivers/bus/acpi/busmgr/bus.c
index
3e50a48
..
ed55888
100644
(file)
--- a/
reactos/drivers/bus/acpi/busmgr/bus.c
+++ b/
reactos/drivers/bus/acpi/busmgr/bus.c
@@
-1192,6
+1192,14
@@
acpi_bus_add (
snprintf(device->pnp.bus_id, sizeof(device->pnp.bus_id), "%s", bus_id);
buffer.Pointer = NULL;
+ /* HACK: Skip HPET */
+ if (strstr(device->pnp.bus_id, "HPET"))
+ {
+ DPRINT("Using HPET hack\n");
+ result = -1;
+ goto end;
+ }
+
break;
}