diff options
Diffstat (limited to 'source/components/executer/exfldio.c')
| -rw-r--r-- | source/components/executer/exfldio.c | 63 | 
1 files changed, 34 insertions, 29 deletions
diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c index 5c95223b2c64..c5d9399cafd2 100644 --- a/source/components/executer/exfldio.c +++ b/source/components/executer/exfldio.c @@ -120,7 +120,8 @@ AcpiExSetupRegion (      if (!AcpiIsValidSpaceId (SpaceId))      { -        ACPI_ERROR ((AE_INFO, "Invalid/unknown Address Space ID: 0x%2.2X", SpaceId)); +        ACPI_ERROR ((AE_INFO, +            "Invalid/unknown Address Space ID: 0x%2.2X", SpaceId));          return_ACPI_STATUS (AE_AML_INVALID_SPACE_ID);      } @@ -170,8 +171,8 @@ AcpiExSetupRegion (       * (Region length is specified in bytes)       */      if (RgnDesc->Region.Length < -            (ObjDesc->CommonField.BaseByteOffset + FieldDatumByteOffset + -            ObjDesc->CommonField.AccessByteWidth)) +        (ObjDesc->CommonField.BaseByteOffset + FieldDatumByteOffset + +        ObjDesc->CommonField.AccessByteWidth))      {          if (AcpiGbl_EnableInterpreterSlack)          { @@ -198,7 +199,8 @@ AcpiExSetupRegion (               * byte, and a field with Dword access specified.               */              ACPI_ERROR ((AE_INFO, -                "Field [%4.4s] access width (%u bytes) too large for region [%4.4s] (length %u)", +                "Field [%4.4s] access width (%u bytes) " +                "too large for region [%4.4s] (length %u)",                  AcpiUtGetNodeName (ObjDesc->CommonField.Node),                  ObjDesc->CommonField.AccessByteWidth,                  AcpiUtGetNodeName (RgnDesc->Region.Node), @@ -210,7 +212,8 @@ AcpiExSetupRegion (           * exceeds region length, indicate an error           */          ACPI_ERROR ((AE_INFO, -            "Field [%4.4s] Base+Offset+Width %u+%u+%u is beyond end of region [%4.4s] (length %u)", +            "Field [%4.4s] Base+Offset+Width %u+%u+%u " +            "is beyond end of region [%4.4s] (length %u)",              AcpiUtGetNodeName (ObjDesc->CommonField.Node),              ObjDesc->CommonField.BaseByteOffset,              FieldDatumByteOffset, ObjDesc->CommonField.AccessByteWidth, @@ -300,8 +303,8 @@ AcpiExAccessRegion (      /* Invoke the appropriate AddressSpace/OpRegion handler */      Status = AcpiEvAddressSpaceDispatch (RgnDesc, ObjDesc, -                Function, RegionOffset, -                ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth), Value); +        Function, RegionOffset, +        ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth), Value);      if (ACPI_FAILURE (Status))      { @@ -512,8 +515,8 @@ AcpiExFieldDatumIo (           * For simple RegionFields, we just directly access the owning           * Operation Region.           */ -        Status = AcpiExAccessRegion (ObjDesc, FieldDatumByteOffset, Value, -                    ReadWrite); +        Status = AcpiExAccessRegion ( +            ObjDesc, FieldDatumByteOffset, Value, ReadWrite);          break;      case ACPI_TYPE_LOCAL_INDEX_FIELD: @@ -536,8 +539,7 @@ AcpiExFieldDatumIo (              FieldDatumByteOffset));          Status = AcpiExInsertIntoField (ObjDesc->IndexField.IndexObj, -                    &FieldDatumByteOffset, -                    sizeof (FieldDatumByteOffset)); +            &FieldDatumByteOffset, sizeof (FieldDatumByteOffset));          if (ACPI_FAILURE (Status))          {              return_ACPI_STATUS (Status); @@ -550,8 +552,8 @@ AcpiExFieldDatumIo (              ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,                  "Read from Data Register\n")); -            Status = AcpiExExtractFromField (ObjDesc->IndexField.DataObj, -                        Value, sizeof (UINT64)); +            Status = AcpiExExtractFromField ( +                ObjDesc->IndexField.DataObj, Value, sizeof (UINT64));          }          else          { @@ -561,8 +563,8 @@ AcpiExFieldDatumIo (                  "Write to Data Register: Value %8.8X%8.8X\n",                  ACPI_FORMAT_UINT64 (*Value))); -            Status = AcpiExInsertIntoField (ObjDesc->IndexField.DataObj, -                        Value, sizeof (UINT64)); +            Status = AcpiExInsertIntoField ( +                ObjDesc->IndexField.DataObj, Value, sizeof (UINT64));          }          break; @@ -644,14 +646,14 @@ AcpiExWriteWithUpdateRule (               * ones)  The left shift drops the bits we want to ignore.               */              if ((~Mask << (ACPI_MUL_8 (sizeof (Mask)) - -                           ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth))) != 0) +                   ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth))) != 0)              {                  /*                   * Read the current contents of the byte/word/dword containing                   * the field, and merge with the new field value.                   */ -                Status = AcpiExFieldDatumIo (ObjDesc, FieldDatumByteOffset, -                            &CurrentValue, ACPI_READ); +                Status = AcpiExFieldDatumIo ( +                    ObjDesc, FieldDatumByteOffset, &CurrentValue, ACPI_READ);                  if (ACPI_FAILURE (Status))                  {                      return_ACPI_STATUS (Status); @@ -679,13 +681,15 @@ AcpiExWriteWithUpdateRule (              ACPI_ERROR ((AE_INFO,                  "Unknown UpdateRule value: 0x%X", -                (ObjDesc->CommonField.FieldFlags & AML_FIELD_UPDATE_RULE_MASK))); +                (ObjDesc->CommonField.FieldFlags & +                    AML_FIELD_UPDATE_RULE_MASK)));              return_ACPI_STATUS (AE_AML_OPERAND_VALUE);          }      }      ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, -        "Mask %8.8X%8.8X, DatumOffset %X, Width %X, Value %8.8X%8.8X, MergedValue %8.8X%8.8X\n", +        "Mask %8.8X%8.8X, DatumOffset %X, Width %X, " +        "Value %8.8X%8.8X, MergedValue %8.8X%8.8X\n",          ACPI_FORMAT_UINT64 (Mask),          FieldDatumByteOffset,          ObjDesc->CommonField.AccessByteWidth, @@ -694,8 +698,8 @@ AcpiExWriteWithUpdateRule (      /* Write the merged value */ -    Status = AcpiExFieldDatumIo (ObjDesc, FieldDatumByteOffset, -                &MergedValue, ACPI_WRITE); +    Status = AcpiExFieldDatumIo ( +        ObjDesc, FieldDatumByteOffset, &MergedValue, ACPI_WRITE);      return_ACPI_STATUS (Status);  } @@ -806,8 +810,8 @@ AcpiExExtractFromField (          /* Get next input datum from the field */          FieldOffset += ObjDesc->CommonField.AccessByteWidth; -        Status = AcpiExFieldDatumIo (ObjDesc, FieldOffset, -                    &RawDatum, ACPI_READ); +        Status = AcpiExFieldDatumIo ( +            ObjDesc, FieldOffset, &RawDatum, ACPI_READ);          if (ACPI_FAILURE (Status))          {              return_ACPI_STATUS (Status); @@ -904,7 +908,8 @@ AcpiExInsertIntoField (      NewBuffer = NULL;      RequiredLength = ACPI_ROUND_BITS_UP_TO_BYTES ( -                        ObjDesc->CommonField.BitLength); +        ObjDesc->CommonField.BitLength); +      /*       * We must have a buffer that is at least as long as the field       * we are writing to. This is because individual fields are @@ -982,8 +987,8 @@ AcpiExInsertIntoField (          /* Write merged datum to the target field */          MergedDatum &= Mask; -        Status = AcpiExWriteWithUpdateRule (ObjDesc, Mask, -                    MergedDatum, FieldOffset); +        Status = AcpiExWriteWithUpdateRule ( +            ObjDesc, Mask, MergedDatum, FieldOffset);          if (ACPI_FAILURE (Status))          {              goto Exit; @@ -1040,8 +1045,8 @@ AcpiExInsertIntoField (      /* Write the last datum to the field */      MergedDatum &= Mask; -    Status = AcpiExWriteWithUpdateRule (ObjDesc, -                Mask, MergedDatum, FieldOffset); +    Status = AcpiExWriteWithUpdateRule ( +        ObjDesc, Mask, MergedDatum, FieldOffset);  Exit:      /* Free temporary buffer if we used one */  | 
