Author: tkreuzer
Date: Sun Apr 11 03:35:16 2010
New Revision: 46832
URL: http://svn.reactos.org/svn/reactos?rev=46832&view=rev
Log:
[ACPICA]
- revert hacks to gcc specific header
- Hack acwin64.h, don't assume msvc for win64
Modified:
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h
Modified:
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h?rev=46832&r1=46831&r2=46832&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acgcc.h
[iso-8859-1] Sun Apr 11 03:35:16 2010
@@ -134,33 +134,6 @@
*/
#define ACPI_UNUSED_VAR __attribute__ ((unused))
-#if defined (_AMD64_)
-
-#define COMPILER_DEPENDENT_INT64 long long int
-#define COMPILER_DEPENDENT_UINT64 unsigned long long int
-
-// FIXME: These are only sonly stubs to make it compile
-
-#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- int dummy; \
- asm("1: movl (%1),%%eax;" \
- "movl %%eax,%%edx;" \
- :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~1L):"dx"); \
- } while(0)
-
-#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \
- do { \
- int dummy; \
- asm("1: movl (%1),%%eax;" \
- "movl %%eax,%%edx;" \
- :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \
- } while(0)
-
-/*! [End] no source code translation !*/
-
-#else /* DO IA32 */
-
#define COMPILER_DEPENDENT_INT64 long long int
#define COMPILER_DEPENDENT_UINT64 unsigned long long int
@@ -191,9 +164,6 @@
:"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \
} while(0)
-#endif /* IA 32 */
-
-
#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
{ \
q32 = n_hi / d32; \
Modified:
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h?rev=46832&r1=46831&r2=46832&view=diff
==============================================================================
---
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h
[iso-8859-1] (original)
+++
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h
[iso-8859-1] Sun Apr 11 03:35:16 2010
@@ -118,10 +118,14 @@
/*! [Begin] no source code translation (Keep the include) */
-#include "acintel.h"
+//#include "acintel.h"
+// HACK
+#define INT32 _ACPI_INT32
+#define UINT32 _ACPI_UINT32
+
/*! [End] no source code translation !*/
-#define ACPI_MACHINE_WIDTH 64
+#define ACPI_MACHINE_WIDTH 64
#define ACPI_USE_STANDARD_HEADERS
