Commit a4df451a authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Removed obsolete ACPI_NO_INTEGER64_SUPPORT define 



Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent a69c77c7

include/acpi/acmacros.h

+1 −11
Original line number Diff line number Diff line
@@ -61,21 +61,11 @@ 


#define ACPI_ARRAY_LENGTH(x)            (sizeof(x) / sizeof((x)[0]))



#ifdef ACPI_NO_INTEGER64_SUPPORT

/*

 * acpi_integer is 32-bits, no 64-bit support on this platform

 */

#define ACPI_LODWORD(l)                 ((u32)(l))

#define ACPI_HIDWORD(l)                 ((u32)(0))



#else



/*

 * Full 64-bit address/integer on both 32-bit and 64-bit platforms

 * Full 64-bit integer must be available on both 32-bit and 64-bit platforms

 */

#define ACPI_LODWORD(l)                 ((u32)(u64)(l))

#define ACPI_HIDWORD(l)                 ((u32)(((*(struct uint64_struct *)(void *)(&l))).hi))

#endif



/*

 * printf() format helpers

include/acpi/actypes.h

+3 −20
Original line number Diff line number Diff line
@@ -323,27 +323,11 @@ struct uint32_struct { 
#define acpi_semaphore                  void *



/*

 * Acpi integer width. In ACPI version 1, integers are

 * 32 bits.  In ACPI version 2, integers are 64 bits.

 * Note that this pertains to the ACPI integer type only, not

 * other integers used in the implementation of the ACPI CA

 * Acpi integer width. In ACPI version 1, integers are 32 bits.  In ACPI

 * version 2, integers are 64 bits. Note that this pertains to the ACPI integer

 * type only, not other integers used in the implementation of the ACPI CA

 * subsystem.

 */

#ifdef ACPI_NO_INTEGER64_SUPPORT



/* 32-bit integers only, no 64-bit support */



typedef u32 acpi_integer;

#define ACPI_INTEGER_MAX                ACPI_UINT32_MAX

#define ACPI_INTEGER_BIT_SIZE           32

#define ACPI_MAX_DECIMAL_DIGITS         10	/* 2^32 = 4,294,967,296 */



#define ACPI_USE_NATIVE_DIVIDE	/* Use compiler native 32-bit divide */



#else



/* 64-bit integers */



typedef unsigned long long acpi_integer;

#define ACPI_INTEGER_MAX                ACPI_UINT64_MAX

#define ACPI_INTEGER_BIT_SIZE           64
@@ -352,7 +336,6 @@ typedef unsigned long long acpi_integer; 
#if ACPI_MACHINE_WIDTH == 64

#define ACPI_USE_NATIVE_DIVIDE	/* Use compiler native 64-bit divide */

#endif

#endif



#define ACPI_MAX64_DECIMAL_DIGITS       20

#define ACPI_MAX32_DECIMAL_DIGITS       10