Deleted Added
full compact
6c6
< * $Revision: 102 $
---
> * $Revision: 104 $
187c187
< DEBUG_PRINTP (TRACE_IO, ("About to write %04X to %04X\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %04X\n",
332c332
< DEBUG_PRINTP (ACPI_ERROR, ("Bad Sleep object %p type %X\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Bad Sleep object %p type %X\n",
542c542
< DEBUG_PRINT (TRACE_IO, ("PM1 control: Read %X\n", RegisterValue));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM1 control: Read %X\n", RegisterValue));
582c582
< DEBUG_PRINT (TRACE_IO, ("PM2 control: Read %X from %p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM2 control: Read %X from %p\n",
592c592
< DEBUG_PRINT (TRACE_IO, ("About to write %04X to %p\n", RegisterValue,
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %p\n", RegisterValue,
606c606
< DEBUG_PRINT (TRACE_IO, ("PM_TIMER: Read %X from %p\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM_TIMER: Read %X from %p\n",
648c648
< DEBUG_PRINT (TRACE_IO, ("GPE Enable bits: Read %X from %X\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "GPE Enable bits: Read %X from %X\n",
661c661
< DEBUG_PRINT (TRACE_IO, ("About to write %04X to %04X\n",
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %04X\n",
689c689
< DEBUG_PRINT (TRACE_IO, ("Register I/O: returning %X\n", RegisterValue));
---
> ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Register I/O: returning %X\n", RegisterValue));
761a762,766
> /*
> * For the GPE? Blocks, the lower word of RegisterId contains the
> * byte offset for which to read, as each part of each block may be
> * several bytes long.
> */
764c769,770
< Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe0Blk, 0);
---
> BankOffset = REGISTER_BIT_ID(RegisterId);
> Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe0Blk, BankOffset);
767d772
<
770,771c775,776
< BankOffset = DIV_2 (AcpiGbl_FADT->Gpe0BlkLen);
< Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe0Blk, BankOffset);
---
> BankOffset = DIV_2 (AcpiGbl_FADT->Gpe0BlkLen) + REGISTER_BIT_ID(RegisterId);
> Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe0Blk, BankOffset);
774d778
<
777c781,782
< Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe1Blk, 0);
---
> BankOffset = REGISTER_BIT_ID(RegisterId);
> Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe1Blk, BankOffset);
780d784
<
783,784c787,788
< BankOffset = DIV_2 (AcpiGbl_FADT->Gpe1BlkLen);
< Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe1Blk, BankOffset);
---
> BankOffset = DIV_2 (AcpiGbl_FADT->Gpe1BlkLen) + REGISTER_BIT_ID(RegisterId);
> Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe1Blk, BankOffset);
787d790
<
793d795
<
890c892,893
< AcpiHwLowLevelWrite (8, Value, &AcpiGbl_FADT->XGpe0Blk, 0);
---
> BankOffset = REGISTER_BIT_ID(RegisterId);
> AcpiHwLowLevelWrite (8, Value, &AcpiGbl_FADT->XGpe0Blk, BankOffset);
896c899
< BankOffset = DIV_2 (AcpiGbl_FADT->Gpe0BlkLen);
---
> BankOffset = DIV_2 (AcpiGbl_FADT->Gpe0BlkLen) + REGISTER_BIT_ID(RegisterId);
903c906,907
< AcpiHwLowLevelWrite (8, Value, &AcpiGbl_FADT->XGpe1Blk, 0);
---
> BankOffset = REGISTER_BIT_ID(RegisterId);
> AcpiHwLowLevelWrite (8, Value, &AcpiGbl_FADT->XGpe1Blk, BankOffset);
909c913
< BankOffset = DIV_2 (AcpiGbl_FADT->Gpe1BlkLen);
---
> BankOffset = DIV_2 (AcpiGbl_FADT->Gpe1BlkLen) + REGISTER_BIT_ID(RegisterId);