acpica-unix2-20130823
PANKOVs restructure

@@ -16,31 +16,45 @@
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #ifndef _ACSOLARIS_H_
 #define _ACSOLARIS_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/sunddi.h>
 #include <sys/varargs.h>
 #include <sys/cpu.h>
 #include <sys/thread.h>
+#else
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#endif
 
+#ifdef __GNUC__
+#include "acgcc.h"
+#else
 /* Function name used for debug output. */
 #define ACPI_GET_FUNCTION_NAME  __func__
+#define ACPI_UNUSED_VAR
+#endif
 
 uint32_t __acpi_acquire_global_lock(void *);
 uint32_t __acpi_release_global_lock(void *);
 void     __acpi_wbinvd(void);
 

@@ -54,15 +68,19 @@
 #define COMPILER_DEPENDENT_UINT64       uint64_t
 
 #define ACPI_CAST_PTHREAD_T(pthread)    ((ACPI_THREAD_ID) (pthread))
 
 #define ACPI_PRINTF_LIKE_FUNC
-#define ACPI_UNUSED_VAR
+
 #define ACPI_USE_NATIVE_DIVIDE
 #define ACPI_FLUSH_CPU_CACHE()  (__acpi_wbinvd())
 
+#ifdef DEBUG
+#define ACPI_DEBUG_OUTPUT
 #define ACPI_DISASSEMBLER
+#endif
+
 #define ACPI_PACKED_POINTERS_NOT_SUPPORTED
 
 /*
  * Calling conventions:
  *