diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-25 16:53:42 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-04-25 16:53:42 +0000 |
| commit | 6b8f78e0a6a7880856440b372097482adb326592 (patch) | |
| tree | 643f58d38011b3076bfc6a234d83f22c69487b8c /source/components/debugger/dbcmds.c | |
| parent | 7c6f304a2eb855cf2d71ca0638d4f3c72f436fcd (diff) | |
Import ACPICA 20140424.vendor/acpica/20140424
Notes
svn path=/vendor-sys/acpica/dist/; revision=264919
svn path=/vendor-sys/acpica/20140424/; revision=264920; tag=vendor/acpica/20140424
Diffstat (limited to 'source/components/debugger/dbcmds.c')
| -rw-r--r-- | source/components/debugger/dbcmds.c | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/source/components/debugger/dbcmds.c b/source/components/debugger/dbcmds.c index e9774cdebe67..d9aa2e7aa1c3 100644 --- a/source/components/debugger/dbcmds.c +++ b/source/components/debugger/dbcmds.c @@ -339,7 +339,7 @@ AcpiDbDisplayTableInfo ( /* Header */ - AcpiOsPrintf ("Idx ID Status Type Sig Address Len Header\n"); + AcpiOsPrintf ("Idx ID Status Type TableHeader (Sig, Address, Length)\n"); /* Walk the entire root table list */ @@ -366,22 +366,22 @@ AcpiDbDisplayTableInfo ( { case ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL: - AcpiOsPrintf ("External virtual "); + AcpiOsPrintf ("External/virtual "); break; case ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL: - AcpiOsPrintf ("Internal physical "); + AcpiOsPrintf ("Internal/physical "); break; case ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL: - AcpiOsPrintf ("Internal virtual "); + AcpiOsPrintf ("Internal/virtual "); break; default: - AcpiOsPrintf ("INVALID "); + AcpiOsPrintf ("INVALID TYPE "); break; } @@ -1187,14 +1187,25 @@ AcpiDbGenerateGpe ( char *GpeArg, char *BlockArg) { - UINT32 BlockNumber; + UINT32 BlockNumber = 0; UINT32 GpeNumber; ACPI_GPE_EVENT_INFO *GpeEventInfo; - GpeNumber = ACPI_STRTOUL (GpeArg, NULL, 0); - BlockNumber = ACPI_STRTOUL (BlockArg, NULL, 0); + GpeNumber = ACPI_STRTOUL (GpeArg, NULL, 0); + /* + * If no block arg, or block arg == 0 or 1, use the FADT-defined + * GPE blocks. + */ + if (BlockArg) + { + BlockNumber = ACPI_STRTOUL (BlockArg, NULL, 0); + if (BlockNumber == 1) + { + BlockNumber = 0; + } + } GpeEventInfo = AcpiEvGetGpeEventInfo (ACPI_TO_POINTER (BlockNumber), GpeNumber); |