Skip to contentSkip to conversation

ACPI constant overflow fixes

PATCH William Lee Irwin III 1 participant 1 message May 22, 2003

Subsystems (2)
lore
Share & tools
lore
#0 lore raw
include/acpi/actypes.h +9 -5
diff -prauN mm8-2.5.69-1/include/acpi/actypes.h mm8-2.5.69-2/include/acpi/actypes.h
@@ -51,10 +51,10 @@
 /*
  * Data type ranges
  */
-#define ACPI_UINT8_MAX                  (UINT8)  0xFF
-#define ACPI_UINT16_MAX                 (UINT16) 0xFFFF
-#define ACPI_UINT32_MAX                 (UINT32) 0xFFFFFFFF
-#define ACPI_UINT64_MAX                 (UINT64) 0xFFFFFFFFFFFFFFFF
+#define ACPI_UINT8_MAX                  (~((UINT8)  0))
+#define ACPI_UINT16_MAX                 (~((UINT16) 0))
+#define ACPI_UINT32_MAX                 (~((UINT32) 0))
+#define ACPI_UINT64_MAX                 (~((UINT64) 0))
 #define ACPI_ASCII_MAX                  0x7F
 
 
@@ -313,7 +313,11 @@ typedef u32                             
 typedef u64                                     acpi_integer;
 #define ACPI_INTEGER_MAX                ACPI_UINT64_MAX
 #define ACPI_INTEGER_BIT_SIZE           64
-#define ACPI_MAX_BCD_VALUE              9999999999999999
+#if ACPI_MACHINE_WIDTH == 64
+#define ACPI_MAX_BCD_VALUE              9999999999999999UL
+#else
+#define ACPI_MAX_BCD_VALUE              9999999999999999ULL
+#endif
 #define ACPI_MAX_BCD_DIGITS             16
 #define ACPI_MAX_DECIMAL_DIGITS         19