From 5deb88ac3fa0e4cbad40bbfe2f04c2209b1b9a1e Mon Sep 17 00:00:00 2001
From: aystarik <aystarik>
Date: Wed, 29 Jun 2005 20:24:37 +0000
Subject: [PATCH] date	2001.12.12.00.13.00;	author rmoore1;	state Exp;

---
 source/include/platform/acintel.h | 33 +++++--------------------------
 source/include/platform/acwin64.h | 23 +++++++++++----------
 2 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/source/include/platform/acintel.h b/source/include/platform/acintel.h
index 41063a552..2744ba6ce 100644
--- a/source/include/platform/acintel.h
+++ b/source/include/platform/acintel.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acintel.h - VC specific defines, etc.
- *       $Revision: 1.6 $
+ *       $Revision: 1.1 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -117,36 +117,13 @@
 #ifndef __ACINTEL_H__
 #define __ACINTEL_H__
 
-
-#define COMPILER_DEPENDENT_INT64   __int64
-#define COMPILER_DEPENDENT_UINT64  unsigned __int64
-
-/*
- * Calling conventions:
- *
- * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
- * ACPI_EXTERNAL_XFACE      - External ACPI interfaces 
- * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
- * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
- */
-#define ACPI_SYSTEM_XFACE
-#define ACPI_EXTERNAL_XFACE
-#define ACPI_INTERNAL_XFACE
-#define ACPI_INTERNAL_VAR_XFACE
+#define COMPILER_DEPENDENT_UINT64   unsigned __int64
 
 /*
  * Math helper functions
  */
-#define ACPI_DIV_64_BY_32(n, n_hi, n_lo, d32, q32, r32) \
-{ \
-    q32 = n / d32; \
-    r32 = n % d32; \
-}
-
-#define ACPI_SHIFT_RIGHT_64(n, n_hi, n_lo) \
-{ \
-    n <<= 1; \
-}
+#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32)
+#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo)
 
 
 #pragma warning(disable:810)
diff --git a/source/include/platform/acwin64.h b/source/include/platform/acwin64.h
index 9967ef1ad..559f92015 100644
--- a/source/include/platform/acwin64.h
+++ b/source/include/platform/acwin64.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acwin.h - OS specific defines, etc.
- *       $Revision: 1.8 $
+ *       $Revision: 1.1 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999 - 2002, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
  * All rights reserved.
  *
  * 2. License
@@ -124,8 +124,6 @@
 
 #define ACPI_OS_NAME                "Windows"
 
-#define ACPI_BITS_PER_LONG          64
-
 #define strupr              _strupr
 #define ACPI_USE_STANDARD_HEADERS
 
@@ -140,22 +138,23 @@
 /*! [Begin] no source code translation  */
 
 #define ACPI_ASM_MACROS
-#define causeinterrupt(level)
-#define BREAKPOINT3
-#define ACPI_DISABLE_IRQS()
-#define ACPI_ENABLE_IRQS()
-#define ACPI_FLUSH_CPU_CACHE()
+#define causeinterrupt(level)   
+#define BREAKPOINT3             
+#define disable()               
+#define enable()                
+#define halt()                  
+#define wbinvd()                
 
 
 /*
  * For Acpi applications, we don't want to try to access the global lock
  */
 #ifdef ACPI_APPLICATION
-#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)       if (AcpiGbl_GlobalLockPresent) {Acq = 0xFF;} else {Acq = 0;}
-#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Pnd)       if (AcpiGbl_GlobalLockPresent) {Pnd = 0xFF;} else {Pnd = 0;}
+#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)       (Acq = 0xFF)
+#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Pnd)       (Pnd = 0)
 #else
 
-#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)
+#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)     
 
 #define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Pnd)