[haiku-commits] haiku: hrev47815 - src/add-ons/kernel/bus_managers/acpi
- From: fredrik.holmqvist@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 5 Sep 2014 18:41:27 +0200 (CEST)
hrev47815 adds 1 changeset to branch 'master'
old head: b4908ff5d8a49c414f210624a91c1fb7b4b5c8d2
new head: 1c7917f33e5b26fac8b7196d64599a872364d344
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1c7917f+%5Eb4908ff
----------------------------------------------------------------------------
1c7917f: Tell ACPI if we use PIC or APIC.
[ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev47815
Commit: 1c7917f33e5b26fac8b7196d64599a872364d344
URL: http://cgit.haiku-os.org/haiku/commit/?id=1c7917f
Author: Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date: Fri Sep 5 16:40:38 2014 UTC
----------------------------------------------------------------------------
1 file changed, 5 insertions(+), 1 deletion(-)
src/add-ons/kernel/bus_managers/acpi/BusManager.cpp | 6 +++++-
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
index 2c64047..0a91ac7 100644
--- a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
@@ -13,6 +13,7 @@
#include <stdlib.h>
#include <string.h>
+#include <apic.h>
#include <ACPI.h>
#include <dpc.h>
#include <KernelExport.h>
@@ -37,6 +38,9 @@ extern "C" {
#define ERROR(x...) dprintf("acpi: " x)
+#define PIC_MODE 0;
+#define APIC_MODE 1;
+
#define ACPI_DEVICE_ID_LENGTH 0x08
extern pci_module_info* gPCIManager;
@@ -241,7 +245,7 @@ acpi_std_ops(int32 op,...)
goto err;
arg.Integer.Type = ACPI_TYPE_INTEGER;
- arg.Integer.Value = 0;
+ arg.Integer.Value = apic_available() ? APIC_MODE :
PIC_MODE;
parameter.Count = 1;
parameter.Pointer = &arg;
Other related posts:
