[haiku-commits] r34598 - in haiku/trunk: headers/os/drivers src/add-ons/kernel/bus_managers/acpi/include/platform
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 9 Dec 2009 18:49:21 +0100 (CET)
Author: czeidler
Date: 2009-12-09 18:49:20 +0100 (Wed, 09 Dec 2009)
New Revision: 34598
Changeset: http://dev.haiku-os.org/changeset/34598/haiku
Modified:
haiku/trunk/headers/os/drivers/ACPI.h
haiku/trunk/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
Log:
Check if we have 64 or 32 bit.
Modified: haiku/trunk/headers/os/drivers/ACPI.h
===================================================================
--- haiku/trunk/headers/os/drivers/ACPI.h 2009-12-09 17:40:45 UTC (rev
34597)
+++ haiku/trunk/headers/os/drivers/ACPI.h 2009-12-09 17:49:20 UTC (rev
34598)
@@ -15,10 +15,15 @@
#define B_ACPI_MODULE_NAME "bus_managers/acpi/v1"
-/* This must be uint64 for 64 bit! */
+#ifdef B_HAIKU_64_BIT
+typedef uint64 acpi_physical_address;
+typedef uint64 acpi_io_address;
+typedef uint64 acpi_size;
+#else
typedef uint32 acpi_physical_address;
typedef uint32 acpi_io_address;
typedef uint32 acpi_size;
+#endif
/* Actually a ptr to a NS Node */
typedef void * acpi_handle;
Modified:
haiku/trunk/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
2009-12-09 17:40:45 UTC (rev 34597)
+++ haiku/trunk/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h
2009-12-09 17:49:20 UTC (rev 34598)
@@ -144,8 +144,12 @@
#define COMPILER_DEPENDENT_INT64 int64
#define COMPILER_DEPENDENT_UINT64 uint64
-/* TODO: Add 64 bit when Haiku goes 64 bit */
+
+#ifdef B_HAIKU_64_BIT
+#define ACPI_MACHINE_WIDTH 64
+#else
#define ACPI_MACHINE_WIDTH 32
+#endif
#ifdef _KERNEL_MODE
Other related posts: