From 52378978013f9dc4619313d6b484702a402b82c5 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Wed, 9 Dec 2009 17:49:20 +0000 Subject: [PATCH] Check if we have 64 or 32 bit. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34598 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/ACPI.h | 7 ++++++- .../kernel/bus_managers/acpi/include/platform/achaiku.h | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/headers/os/drivers/ACPI.h b/headers/os/drivers/ACPI.h index 1706806e8e..2c25fb3fca 100644 --- a/headers/os/drivers/ACPI.h +++ b/headers/os/drivers/ACPI.h @@ -15,10 +15,15 @@ typedef struct acpi_object_type acpi_object_type; #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; diff --git a/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h b/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h index f1c15d1882..82bbdc550d 100644 --- a/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h +++ b/src/add-ons/kernel/bus_managers/acpi/include/platform/achaiku.h @@ -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