Usermode/libposix - Added types for F_GETLK

[tpg/acess2.git] / Externals / ACPICA / acacess.h

diff --git a/Externals/ACPICA/acacess.h b/Externals/ACPICA/acacess.h
index bcbdc9d..fdbf335 100644 (file)
--- a/Externals/ACPICA/acacess.h
+++ b/Externals/ACPICA/acacess.h
@@ -9,8 +9,9 @@
 
 #define ACPI_USE_SYSTEM_CLIBRARY
 #define ACPI_USE_DO_WHILE_0
-#define ACPI_MUTEX_TYPE             ACPI_BINARY_SEMAPHORE
+#define ACPI_MUTEX_TYPE             ACPI_OSL_MUTEX
 
+//#define ACPI_DEBUG_OUTPUT    1
 
 #ifdef __KERNEL__
 
@@ -20,14 +21,23 @@
 
 #define ACPI_MACHINE_WIDTH          BITS
 
-#define ACPI_SPINLOCK               tShortSpinlock
+typedef struct sACPICache      tACPICache;
+
+#define ACPI_CACHE_T   tACPICache
+#define ACPI_SPINLOCK               tShortSpinlock*
 #define ACPI_CPU_FLAGS              unsigned long
 
 #define COMPILER_DEPENDENT_UINT64      Uint64
 #define COMPILER_DEPENDENT_INT64       Sint64
 
 #define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) do { \
-       q32 = DivMod64( ((Sint64)n_hi<<32)|n_lo, d32, &r32 ); \
+       Uint64  rem; \
+       Sint64  num = ((Sint64)n_hi<<32)|n_lo; \
+        int    sgn = 1; \
+       if(num < 0) {num = -num; sgn = -sgn; } \
+       if(d32 < 0) {d32 = -d32; sgn = -sgn; } \
+       q32 = sgn * DivMod64U( num, d32, &rem ); \
+       r32 = rem; \
        }while(0)
 #define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) do { \
        n_lo >>= 1; \