← Back to branch summary

~ubuntu-branches/ubuntu/wily/fwts/wily

« back to all changes in this revision

Viewing changes to src/acpica/source/components/events/evgpeblk.c

  • Committer: Package Import Robot
  • Author(s): Ivan Hu, Colin Ian King, Keng-Yu Lin
  • Date: 2014-06-18 10:20:44 UTC
  • mfrom: (34.2.17)
  • Revision ID: package-import@ubuntu.com-20140618102044-njbyt477zf2kqh59
Tags: 14.06.00-0ubuntu0
https://launchpad.net/bugs/1321664
https://launchpad.net/bugs/1322543
https://launchpad.net/bugs/1322531
https://launchpad.net/bugs/1312351
https://launchpad.net/bugs/1322545
[Colin Ian King]
* lib: fwts_framework: change fwts-live progress feedback (LP: #1321664)
* cpu: cpufreq: add more granularity to progress feedback
* acpi: fan: add more granularity to progress feedback
* acpi: acpidump: remove duplicate consts
* live-image: save various system and firmware data at end of test
  (LP: #1322543)
* cpu: cpufreq: add more precision to GHz CPU frequency information
* cpu: cpufreq: print MHz as float, remove erroneous rounding
* cpu: cpufreq: show Turbo Boost with top _PSS value
* cpu: cpufreq: sort frequencies using almost equal comparison (LP: #1322531)
* acpica: update to version 20140424 (LP: #1312351)
* Add support for ACPI 1.0 GUID
* live-image: Add UEFI tests to the run all batch tests menu item
  (LP: #1322545)
* fwts-test: arg-show-progress-dialog-0001: fix armhf failures
* fwts-test: arg-show-progress-dialog-0001: fix armhf failures, for test-0002

[Keng-Yu Lin]
* debian: add watch file
* fwts-test: arg-show-progress-dialog: sync with fwts

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/acpica/source/components/events/evgpeblk.c
354
354
    {
355
355
        /* Init the RegisterInfo for this GPE register (8 GPEs) */
356
356
 
357
 
        ThisRegister->BaseGpeNumber = (UINT8) (GpeBlock->BlockBaseNumber +
358
 
                                             (i * ACPI_GPE_REGISTER_WIDTH));
 
357
        ThisRegister->BaseGpeNumber = (UINT16)
 
358
            (GpeBlock->BlockBaseNumber + (i * ACPI_GPE_REGISTER_WIDTH));
359
359
 
360
360
        ThisRegister->StatusAddress.Address =
361
 
            GpeBlock->BlockAddress.Address + i;
 
361
            GpeBlock->Address + i;
362
362
 
363
363
        ThisRegister->EnableAddress.Address =
364
 
            GpeBlock->BlockAddress.Address + i + GpeBlock->RegisterCount;
 
364
            GpeBlock->Address + i + GpeBlock->RegisterCount;
365
365
 
366
 
        ThisRegister->StatusAddress.SpaceId   = GpeBlock->BlockAddress.SpaceId;
367
 
        ThisRegister->EnableAddress.SpaceId   = GpeBlock->BlockAddress.SpaceId;
 
366
        ThisRegister->StatusAddress.SpaceId   = GpeBlock->SpaceId;
 
367
        ThisRegister->EnableAddress.SpaceId   = GpeBlock->SpaceId;
368
368
        ThisRegister->StatusAddress.BitWidth  = ACPI_GPE_REGISTER_WIDTH;
369
369
        ThisRegister->EnableAddress.BitWidth  = ACPI_GPE_REGISTER_WIDTH;
370
370
        ThisRegister->StatusAddress.BitOffset = 0;
437
437
ACPI_STATUS
438
438
AcpiEvCreateGpeBlock (
439
439
    ACPI_NAMESPACE_NODE     *GpeDevice,
440
 
    ACPI_GENERIC_ADDRESS    *GpeBlockAddress,
 
440
    UINT64                  Address,
 
441
    UINT8                   SpaceId,
441
442
    UINT32                  RegisterCount,
442
 
    UINT8                   GpeBlockBaseNumber,
 
443
    UINT16                  GpeBlockBaseNumber,
443
444
    UINT32                  InterruptNumber,
444
445
    ACPI_GPE_BLOCK_INFO     **ReturnGpeBlock)
445
446
{
466
467
 
467
468
    /* Initialize the new GPE block */
468
469
 
 
470
    GpeBlock->Address = Address;
 
471
    GpeBlock->SpaceId = SpaceId;
469
472
    GpeBlock->Node = GpeDevice;
470
473
    GpeBlock->GpeCount = (UINT16) (RegisterCount * ACPI_GPE_REGISTER_WIDTH);
471
474
    GpeBlock->Initialized = FALSE;
472
475
    GpeBlock->RegisterCount = RegisterCount;
473
476
    GpeBlock->BlockBaseNumber = GpeBlockBaseNumber;
474
477
 
475
 
    ACPI_MEMCPY (&GpeBlock->BlockAddress, GpeBlockAddress,
476
 
        sizeof (ACPI_GENERIC_ADDRESS));
477
 
 
478
478
    /*
479
479
     * Create the RegisterInfo and EventInfo sub-structures
480
480
     * Note: disables and clears all GPEs in the block
517
517
    }
518
518
 
519
519
    ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
520
 
        "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X\n",
 
520
        "    Initialized GPE %02X to %02X [%4.4s] %u regs on interrupt 0x%X%s\n",
521
521
        (UINT32) GpeBlock->BlockBaseNumber,
522
522
        (UINT32) (GpeBlock->BlockBaseNumber + (GpeBlock->GpeCount - 1)),
523
 
        GpeDevice->Name.Ascii, GpeBlock->RegisterCount,
524
 
        InterruptNumber));
 
523
        GpeDevice->Name.Ascii, GpeBlock->RegisterCount, InterruptNumber,
 
524
        InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
525
525
 
526
526
    /* Update global count of currently available GPEs */
527
527