diff options
Diffstat (limited to 'sys/contrib/dev/acpica/hwregs.c')
| -rw-r--r-- | sys/contrib/dev/acpica/hwregs.c | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/sys/contrib/dev/acpica/hwregs.c b/sys/contrib/dev/acpica/hwregs.c index d231b47..8bcda9d 100644 --- a/sys/contrib/dev/acpica/hwregs.c +++ b/sys/contrib/dev/acpica/hwregs.c @@ -3,7 +3,7 @@ * * Module Name: hwregs - Read/write access functions for the various ACPI * control and status registers. - * $Revision: 104 $ + * $Revision: 109 $ * ******************************************************************************/ @@ -126,12 +126,6 @@ MODULE_NAME ("hwregs") -/* This matches the #defines in actypes.h. */ - -NATIVE_CHAR *SleepStateTable[] = {"\\_S0_","\\_S1_","\\_S2_","\\_S3_", - "\\_S4_","\\_S5_","\\_S4B"}; - - /******************************************************************************* * * FUNCTION: AcpiHwGetBitShift @@ -196,7 +190,7 @@ AcpiHwClearAcpiStatus (void) if (ACPI_VALID_ADDRESS (AcpiGbl_FADT->XPm1bEvtBlk.Address)) { - AcpiOsWritePort ((ACPI_IO_ADDRESS) + AcpiOsWritePort ((ACPI_IO_ADDRESS) ACPI_GET_ADDRESS (AcpiGbl_FADT->XPm1bEvtBlk.Address), ALL_FIXED_STS_BITS, 16); } @@ -263,7 +257,6 @@ AcpiHwObtainSleepTypeRegisterData ( /* * Validate parameters */ - if ((SleepState > ACPI_S_STATES_MAX) || !Slp_TypA || !Slp_TypB) { @@ -273,8 +266,8 @@ AcpiHwObtainSleepTypeRegisterData ( /* * AcpiEvaluate the namespace object containing the values for this state */ - - Status = AcpiNsEvaluateByName (SleepStateTable[SleepState], NULL, &ObjDesc); + Status = AcpiNsEvaluateByName ((NATIVE_CHAR *) AcpiGbl_DbSleepStates[SleepState], + NULL, &ObjDesc); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -391,7 +384,6 @@ AcpiHwRegisterBitAccess ( * Check bit id to fine locate Register offset. * Check Mask to determine Register offset, and then read-write. */ - switch (REGISTER_BLOCK_ID (RegisterId)) { case PM1_STS: @@ -442,7 +434,6 @@ AcpiHwRegisterBitAccess ( * others should be written as 0 so they will be left * unchanged */ - Value <<= AcpiHwGetBitShift (Mask); Value &= Mask; @@ -557,7 +548,6 @@ AcpiHwRegisterBitAccess ( * Therefore, pass the RegisterId, not just generic PM1_CONTROL, * because we need to do different things. Yuck. */ - AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, RegisterId, (UINT16) RegisterValue); } @@ -625,7 +615,6 @@ AcpiHwRegisterBitAccess ( * gpe_block_id is one of GPE[01]_EN_BLOCK and GPE[01]_STS_BLOCK * gpe_bit_number is relative from the gpe_block (0x00~0xFF) */ - Mask = REGISTER_BIT_ID(RegisterId); /* gpe_bit_number */ RegisterId = REGISTER_BLOCK_ID(RegisterId) | (Mask >> 3); Mask = AcpiGbl_DecodeTo8bit [Mask % 8]; @@ -655,9 +644,10 @@ AcpiHwRegisterBitAccess ( Value &= Mask; RegisterValue |= Value; - /* This write will put the Action state into the General Purpose */ - /* Enable Register indexed by the value in Mask */ - + /* + * This write will put the Action state into the General Purpose + * Enable Register indexed by the value in Mask + */ ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %04X to %04X\n", RegisterValue, RegisterId)); AcpiHwRegisterWrite (ACPI_MTX_DO_NOT_LOCK, RegisterId, @@ -670,6 +660,7 @@ AcpiHwRegisterBitAccess ( case SMI_CMD_BLOCK: case PROCESSOR_BLOCK: + /* Not used by any callers at this time - therefore, not implemented */ default: @@ -714,7 +705,7 @@ AcpiHwRegisterRead ( UINT32 BankOffset; - FUNCTION_TRACE ("AcpiHwRegisterRead"); + FUNCTION_TRACE ("HwRegisterRead"); if (ACPI_MTX_LOCK == UseLock) @@ -760,13 +751,13 @@ AcpiHwRegisterRead ( /* - * 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 + * 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. */ case GPE0_STS_BLOCK: /* 8-bit access */ - BankOffset = REGISTER_BIT_ID(RegisterId); + BankOffset = REGISTER_BIT_ID(RegisterId); Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe0Blk, BankOffset); break; @@ -778,7 +769,7 @@ AcpiHwRegisterRead ( case GPE1_STS_BLOCK: /* 8-bit access */ - BankOffset = REGISTER_BIT_ID(RegisterId); + BankOffset = REGISTER_BIT_ID(RegisterId); Value = AcpiHwLowLevelRead (8, &AcpiGbl_FADT->XGpe1Blk, BankOffset); break; @@ -830,7 +821,8 @@ AcpiHwRegisterWrite ( { UINT32 BankOffset; - FUNCTION_TRACE ("AcpiHwRegisterWrite"); + + FUNCTION_TRACE ("HwRegisterWrite"); if (ACPI_MTX_LOCK == UseLock) @@ -889,7 +881,7 @@ AcpiHwRegisterWrite ( case GPE0_STS_BLOCK: /* 8-bit access */ - BankOffset = REGISTER_BIT_ID(RegisterId); + BankOffset = REGISTER_BIT_ID(RegisterId); AcpiHwLowLevelWrite (8, Value, &AcpiGbl_FADT->XGpe0Blk, BankOffset); break; @@ -903,7 +895,7 @@ AcpiHwRegisterWrite ( case GPE1_STS_BLOCK: /* 8-bit access */ - BankOffset = REGISTER_BIT_ID(RegisterId); + BankOffset = REGISTER_BIT_ID(RegisterId); AcpiHwLowLevelWrite (8, Value, &AcpiGbl_FADT->XGpe1Blk, BankOffset); break; @@ -966,6 +958,9 @@ AcpiHwLowLevelRead ( UINT16 PciRegister; + FUNCTION_ENTRY (); + + /* * Must have a valid pointer to a GAS structure, and * a non-zero address within @@ -981,7 +976,6 @@ AcpiHwLowLevelRead ( * Three address spaces supported: * Memory, Io, or PCI config. */ - switch (Reg->AddressSpaceId) { case ACPI_ADR_SPACE_SYSTEM_MEMORY: @@ -1045,6 +1039,9 @@ AcpiHwLowLevelWrite ( UINT16 PciRegister; + FUNCTION_ENTRY (); + + /* * Must have a valid pointer to a GAS structure, and * a non-zero address within @@ -1060,7 +1057,6 @@ AcpiHwLowLevelWrite ( * Three address spaces supported: * Memory, Io, or PCI config. */ - switch (Reg->AddressSpaceId) { case ACPI_ADR_SPACE_SYSTEM_MEMORY: |
