patch-2.4.6 linux/drivers/acpi/resources/rsdump.c
Next file: linux/drivers/acpi/resources/rsio.c
Previous file: linux/drivers/acpi/resources/rscreate.c
Back to the patch index
Back to the overall index
- Lines: 1143
- Date:
Wed Jun 20 17:47:40 2001
- Orig file:
v2.4.5/linux/drivers/acpi/resources/rsdump.c
- Orig date:
Fri Feb 9 11:45:58 2001
diff -u --recursive --new-file v2.4.5/linux/drivers/acpi/resources/rsdump.c linux/drivers/acpi/resources/rsdump.c
@@ -1,7 +1,7 @@
/*******************************************************************************
*
- * Module Name: rsdump - Functions do dump out the resource structures.
- * $Revision: 16 $
+ * Module Name: rsdump - Functions to display the resource structures.
+ * $Revision: 20 $
*
******************************************************************************/
@@ -27,7 +27,7 @@
#include "acpi.h"
#include "acresrc.h"
-#define _COMPONENT RESOURCE_MANAGER
+#define _COMPONENT ACPI_RESOURCES
MODULE_NAME ("rsdump")
@@ -37,7 +37,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -45,28 +45,24 @@
void
acpi_rs_dump_irq (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- IRQ_RESOURCE *irq_data = (IRQ_RESOURCE*) data;
+ ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ *) data;
u8 index = 0;
- acpi_os_printf ("\t_iRQ Resource\n");
+ acpi_os_printf ("IRQ Resource\n");
- acpi_os_printf ("\t\t%s Triggered\n",
- LEVEL_SENSITIVE == irq_data->edge_level ?
- "Level" : "Edge");
+ acpi_os_printf (" %s Triggered\n",
+ LEVEL_SENSITIVE == irq_data->edge_level ? "Level" : "Edge");
- acpi_os_printf ("\t\t_active %s\n",
- ACTIVE_LOW == irq_data->active_high_low ?
- "Low" : "High");
+ acpi_os_printf (" Active %s\n",
+ ACTIVE_LOW == irq_data->active_high_low ? "Low" : "High");
- acpi_os_printf ("\t\t%s\n",
- SHARED == irq_data->shared_exclusive ?
- "Shared" : "Exclusive");
+ acpi_os_printf (" %s\n",
+ SHARED == irq_data->shared_exclusive ? "Shared" : "Exclusive");
- acpi_os_printf ("\t\t%X Interrupts ( ",
- irq_data->number_of_interrupts);
+ acpi_os_printf (" %X Interrupts ( ", irq_data->number_of_interrupts);
for (index = 0; index < irq_data->number_of_interrupts; index++) {
acpi_os_printf ("%X ", irq_data->interrupts[index]);
@@ -83,7 +79,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -91,62 +87,59 @@
void
acpi_rs_dump_dma (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- DMA_RESOURCE *dma_data = (DMA_RESOURCE*) data;
+ ACPI_RESOURCE_DMA *dma_data = (ACPI_RESOURCE_DMA *) data;
u8 index = 0;
- acpi_os_printf ("\t_dMA Resource\n");
+ acpi_os_printf ("DMA Resource\n");
- switch (dma_data->type)
- {
+ switch (dma_data->type) {
case COMPATIBILITY:
- acpi_os_printf ("\t\t_compatibility mode\n");
+ acpi_os_printf (" Compatibility mode\n");
break;
case TYPE_A:
- acpi_os_printf ("\t\t_type A\n");
+ acpi_os_printf (" Type A\n");
break;
case TYPE_B:
- acpi_os_printf ("\t\t_type B\n");
+ acpi_os_printf (" Type B\n");
break;
case TYPE_F:
- acpi_os_printf ("\t\t_type F\n");
+ acpi_os_printf (" Type F\n");
break;
default:
- acpi_os_printf ("\t\t_invalid DMA type\n");
+ acpi_os_printf (" Invalid DMA type\n");
break;
}
- acpi_os_printf ("\t\t%sBus Master\n",
- BUS_MASTER == dma_data->bus_master ?
- "" : "Not a ");
+ acpi_os_printf (" %sBus Master\n",
+ BUS_MASTER == dma_data->bus_master ? "" : "Not a ");
- switch (dma_data->transfer)
- {
+
+ switch (dma_data->transfer) {
case TRANSFER_8:
- acpi_os_printf ("\t\t8-bit only transfer\n");
+ acpi_os_printf (" 8-bit only transfer\n");
break;
case TRANSFER_8_16:
- acpi_os_printf ("\t\t8 and 16-bit transfer\n");
+ acpi_os_printf (" 8 and 16-bit transfer\n");
break;
case TRANSFER_16:
- acpi_os_printf ("\t\t16 bit only transfer\n");
+ acpi_os_printf (" 16 bit only transfer\n");
break;
default:
- acpi_os_printf ("\t\t_invalid transfer preference\n");
+ acpi_os_printf (" Invalid transfer preference\n");
break;
}
- acpi_os_printf ("\t\t_number of Channels: %X ( ",
- dma_data->number_of_channels);
+ acpi_os_printf (" Number of Channels: %X ( ", dma_data->number_of_channels);
for (index = 0; index < dma_data->number_of_channels; index++) {
acpi_os_printf ("%X ", dma_data->channels[index]);
@@ -163,7 +156,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -171,49 +164,47 @@
void
acpi_rs_dump_start_dependent_functions (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- START_DEPENDENT_FUNCTIONS_RESOURCE *sdf_data =
- (START_DEPENDENT_FUNCTIONS_RESOURCE*) data;
+ ACPI_RESOURCE_START_DPF *sdf_data = (ACPI_RESOURCE_START_DPF *) data;
+
+ acpi_os_printf ("Start Dependent Functions Resource\n");
- acpi_os_printf ("\t_start Dependent Functions Resource\n");
- switch (sdf_data->compatibility_priority)
- {
+ switch (sdf_data->compatibility_priority) {
case GOOD_CONFIGURATION:
- acpi_os_printf ("\t\t_good configuration\n");
+ acpi_os_printf (" Good configuration\n");
break;
case ACCEPTABLE_CONFIGURATION:
- acpi_os_printf ("\t\t_acceptable configuration\n");
+ acpi_os_printf (" Acceptable configuration\n");
break;
case SUB_OPTIMAL_CONFIGURATION:
- acpi_os_printf ("\t\t_sub-optimal configuration\n");
+ acpi_os_printf (" Sub-optimal configuration\n");
break;
default:
- acpi_os_printf ("\t\t_invalid compatibility priority\n");
+ acpi_os_printf (" Invalid compatibility priority\n");
break;
}
- switch(sdf_data->performance_robustness)
- {
+ switch(sdf_data->performance_robustness) {
case GOOD_CONFIGURATION:
- acpi_os_printf ("\t\t_good configuration\n");
+ acpi_os_printf (" Good configuration\n");
break;
case ACCEPTABLE_CONFIGURATION:
- acpi_os_printf ("\t\t_acceptable configuration\n");
+ acpi_os_printf (" Acceptable configuration\n");
break;
case SUB_OPTIMAL_CONFIGURATION:
- acpi_os_printf ("\t\t_sub-optimal configuration\n");
+ acpi_os_printf (" Sub-optimal configuration\n");
break;
default:
- acpi_os_printf ("\t\t_invalid performance "
+ acpi_os_printf (" Invalid performance "
"robustness preference\n");
break;
}
@@ -228,7 +219,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -236,26 +227,26 @@
void
acpi_rs_dump_io (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- IO_RESOURCE *io_data = (IO_RESOURCE*) data;
+ ACPI_RESOURCE_IO *io_data = (ACPI_RESOURCE_IO *) data;
- acpi_os_printf ("\t_io Resource\n");
+ acpi_os_printf ("Io Resource\n");
- acpi_os_printf ("\t\t%d bit decode\n",
+ acpi_os_printf (" %d bit decode\n",
DECODE_16 == io_data->io_decode ? 16 : 10);
- acpi_os_printf ("\t\t_range minimum base: %08X\n",
+ acpi_os_printf (" Range minimum base: %08X\n",
io_data->min_base_address);
- acpi_os_printf ("\t\t_range maximum base: %08X\n",
+ acpi_os_printf (" Range maximum base: %08X\n",
io_data->max_base_address);
- acpi_os_printf ("\t\t_alignment: %08X\n",
+ acpi_os_printf (" Alignment: %08X\n",
io_data->alignment);
- acpi_os_printf ("\t\t_range Length: %08X\n",
+ acpi_os_printf (" Range Length: %08X\n",
io_data->range_length);
return;
@@ -268,7 +259,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -276,16 +267,16 @@
void
acpi_rs_dump_fixed_io (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- FIXED_IO_RESOURCE *fixed_io_data = (FIXED_IO_RESOURCE*) data;
+ ACPI_RESOURCE_FIXED_IO *fixed_io_data = (ACPI_RESOURCE_FIXED_IO *) data;
- acpi_os_printf ("\t_fixed Io Resource\n");
- acpi_os_printf ("\t\t_range base address: %08X",
+ acpi_os_printf ("Fixed Io Resource\n");
+ acpi_os_printf (" Range base address: %08X",
fixed_io_data->base_address);
- acpi_os_printf ("\t\t_range length: %08X",
+ acpi_os_printf (" Range length: %08X",
fixed_io_data->range_length);
return;
@@ -298,7 +289,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -306,18 +297,18 @@
void
acpi_rs_dump_vendor_specific (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- VENDOR_RESOURCE *vendor_data = (VENDOR_RESOURCE*) data;
+ ACPI_RESOURCE_VENDOR *vendor_data = (ACPI_RESOURCE_VENDOR *) data;
u16 index = 0;
- acpi_os_printf ("\t_vendor Specific Resource\n");
+ acpi_os_printf ("Vendor Specific Resource\n");
- acpi_os_printf ("\t\t_length: %08X\n", vendor_data->length);
+ acpi_os_printf (" Length: %08X\n", vendor_data->length);
for (index = 0; index < vendor_data->length; index++) {
- acpi_os_printf ("\t\t_byte %X: %08X\n",
+ acpi_os_printf (" Byte %X: %08X\n",
index, vendor_data->reserved[index]);
}
@@ -331,7 +322,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -339,28 +330,28 @@
void
acpi_rs_dump_memory24 (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- MEMORY24_RESOURCE *memory24_data = (MEMORY24_RESOURCE*) data;
+ ACPI_RESOURCE_MEM24 *memory24_data = (ACPI_RESOURCE_MEM24 *) data;
- acpi_os_printf ("\t24-Bit Memory Range Resource\n");
+ acpi_os_printf ("24-Bit Memory Range Resource\n");
- acpi_os_printf ("\t\t_read%s\n",
+ acpi_os_printf (" Read%s\n",
READ_WRITE_MEMORY ==
memory24_data->read_write_attribute ?
"/Write" : " only");
- acpi_os_printf ("\t\t_range minimum base: %08X\n",
+ acpi_os_printf (" Range minimum base: %08X\n",
memory24_data->min_base_address);
- acpi_os_printf ("\t\t_range maximum base: %08X\n",
+ acpi_os_printf (" Range maximum base: %08X\n",
memory24_data->max_base_address);
- acpi_os_printf ("\t\t_alignment: %08X\n",
+ acpi_os_printf (" Alignment: %08X\n",
memory24_data->alignment);
- acpi_os_printf ("\t\t_range length: %08X\n",
+ acpi_os_printf (" Range length: %08X\n",
memory24_data->range_length);
return;
@@ -373,7 +364,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -381,28 +372,28 @@
void
acpi_rs_dump_memory32 (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- MEMORY32_RESOURCE *memory32_data = (MEMORY32_RESOURCE*) data;
+ ACPI_RESOURCE_MEM32 *memory32_data = (ACPI_RESOURCE_MEM32 *) data;
- acpi_os_printf ("\t32-Bit Memory Range Resource\n");
+ acpi_os_printf ("32-Bit Memory Range Resource\n");
- acpi_os_printf ("\t\t_read%s\n",
+ acpi_os_printf (" Read%s\n",
READ_WRITE_MEMORY ==
memory32_data->read_write_attribute ?
"/Write" : " only");
- acpi_os_printf ("\t\t_range minimum base: %08X\n",
+ acpi_os_printf (" Range minimum base: %08X\n",
memory32_data->min_base_address);
- acpi_os_printf ("\t\t_range maximum base: %08X\n",
+ acpi_os_printf (" Range maximum base: %08X\n",
memory32_data->max_base_address);
- acpi_os_printf ("\t\t_alignment: %08X\n",
+ acpi_os_printf (" Alignment: %08X\n",
memory32_data->alignment);
- acpi_os_printf ("\t\t_range length: %08X\n",
+ acpi_os_printf (" Range length: %08X\n",
memory32_data->range_length);
return;
@@ -423,22 +414,22 @@
void
acpi_rs_dump_fixed_memory32 (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- FIXED_MEMORY32_RESOURCE *fixed_memory32_data = (FIXED_MEMORY32_RESOURCE*) data;
+ ACPI_RESOURCE_FIXED_MEM32 *fixed_memory32_data = (ACPI_RESOURCE_FIXED_MEM32 *) data;
- acpi_os_printf ("\t32-Bit Fixed Location Memory Range Resource\n");
+ acpi_os_printf ("32-Bit Fixed Location Memory Range Resource\n");
- acpi_os_printf ("\t\t_read%s\n",
+ acpi_os_printf (" Read%s\n",
READ_WRITE_MEMORY ==
fixed_memory32_data->read_write_attribute ?
"/Write" : " Only");
- acpi_os_printf ("\t\t_range base address: %08X\n",
+ acpi_os_printf (" Range base address: %08X\n",
fixed_memory32_data->range_base_address);
- acpi_os_printf ("\t\t_range length: %08X\n",
+ acpi_os_printf (" Range length: %08X\n",
fixed_memory32_data->range_length);
return;
@@ -451,7 +442,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -459,49 +450,47 @@
void
acpi_rs_dump_address16 (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- ADDRESS16_RESOURCE *address16_data = (ADDRESS16_RESOURCE*) data;
+ ACPI_RESOURCE_ADDRESS16 *address16_data = (ACPI_RESOURCE_ADDRESS16 *) data;
- acpi_os_printf ("\t16-Bit Address Space Resource\n");
- acpi_os_printf ("\t\t_resource Type: ");
+ acpi_os_printf ("16-Bit Address Space Resource\n");
+ acpi_os_printf (" Resource Type: ");
- switch (address16_data->resource_type)
- {
+ switch (address16_data->resource_type) {
case MEMORY_RANGE:
acpi_os_printf ("Memory Range\n");
- switch (address16_data->attribute.memory.cache_attribute)
- {
+ switch (address16_data->attribute.memory.cache_attribute) {
case NON_CACHEABLE_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Noncacheable memory\n");
break;
case CACHABLE_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Cacheable memory\n");
break;
case WRITE_COMBINING_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Write-combining memory\n");
break;
case PREFETCHABLE_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Prefetchable memory\n");
break;
default:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Invalid cache attribute\n");
break;
}
- acpi_os_printf ("\t\t_type Specific: Read%s\n",
+ acpi_os_printf (" Type Specific: Read%s\n",
READ_WRITE_MEMORY ==
address16_data->attribute.memory.read_write_attribute ?
"/Write" : " Only");
@@ -511,25 +500,24 @@
acpi_os_printf ("I/O Range\n");
- switch (address16_data->attribute.io.range_attribute)
- {
+ switch (address16_data->attribute.io.range_attribute) {
case NON_ISA_ONLY_RANGES:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Non-ISA Io Addresses\n");
break;
case ISA_ONLY_RANGES:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"ISA Io Addresses\n");
break;
case ENTIRE_RANGE:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"ISA and non-ISA Io Addresses\n");
break;
default:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Invalid range attribute\n");
break;
}
@@ -546,42 +534,42 @@
return;
}
- acpi_os_printf ("\t\t_resource %s\n",
+ acpi_os_printf (" Resource %s\n",
CONSUMER == address16_data->producer_consumer ?
"Consumer" : "Producer");
- acpi_os_printf ("\t\t%s decode\n",
+ acpi_os_printf (" %s decode\n",
SUB_DECODE == address16_data->decode ?
"Subtractive" : "Positive");
- acpi_os_printf ("\t\t_min address is %s fixed\n",
+ acpi_os_printf (" Min address is %s fixed\n",
ADDRESS_FIXED == address16_data->min_address_fixed ?
"" : "not");
- acpi_os_printf ("\t\t_max address is %s fixed\n",
+ acpi_os_printf (" Max address is %s fixed\n",
ADDRESS_FIXED == address16_data->max_address_fixed ?
"" : "not");
- acpi_os_printf ("\t\t_granularity: %08X\n",
+ acpi_os_printf (" Granularity: %08X\n",
address16_data->granularity);
- acpi_os_printf ("\t\t_address range min: %08X\n",
+ acpi_os_printf (" Address range min: %08X\n",
address16_data->min_address_range);
- acpi_os_printf ("\t\t_address range max: %08X\n",
+ acpi_os_printf (" Address range max: %08X\n",
address16_data->max_address_range);
- acpi_os_printf ("\t\t_address translation offset: %08X\n",
+ acpi_os_printf (" Address translation offset: %08X\n",
address16_data->address_translation_offset);
- acpi_os_printf ("\t\t_address Length: %08X\n",
+ acpi_os_printf (" Address Length: %08X\n",
address16_data->address_length);
- if (0xFF != address16_data->resource_source_index) {
- acpi_os_printf ("\t\t_resource Source Index: %X\n",
- address16_data->resource_source_index);
- acpi_os_printf ("\t\t_resource Source: %s\n",
- address16_data->resource_source);
+ if (0xFF != address16_data->resource_source.index) {
+ acpi_os_printf (" Resource Source Index: %X\n",
+ address16_data->resource_source.index);
+ acpi_os_printf (" Resource Source: %s\n",
+ address16_data->resource_source.string_ptr);
}
return;
@@ -594,7 +582,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -602,48 +590,46 @@
void
acpi_rs_dump_address32 (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- ADDRESS32_RESOURCE *address32_data = (ADDRESS32_RESOURCE*) data;
+ ACPI_RESOURCE_ADDRESS32 *address32_data = (ACPI_RESOURCE_ADDRESS32 *) data;
- acpi_os_printf ("\t32-Bit Address Space Resource\n");
+ acpi_os_printf ("32-Bit Address Space Resource\n");
- switch (address32_data->resource_type)
- {
+ switch (address32_data->resource_type) {
case MEMORY_RANGE:
- acpi_os_printf ("\t\t_resource Type: Memory Range\n");
+ acpi_os_printf (" Resource Type: Memory Range\n");
- switch (address32_data->attribute.memory.cache_attribute)
- {
+ switch (address32_data->attribute.memory.cache_attribute) {
case NON_CACHEABLE_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Noncacheable memory\n");
break;
case CACHABLE_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Cacheable memory\n");
break;
case WRITE_COMBINING_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Write-combining memory\n");
break;
case PREFETCHABLE_MEMORY:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Prefetchable memory\n");
break;
default:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Invalid cache attribute\n");
break;
}
- acpi_os_printf ("\t\t_type Specific: Read%s\n",
+ acpi_os_printf (" Type Specific: Read%s\n",
READ_WRITE_MEMORY ==
address32_data->attribute.memory.read_write_attribute ?
"/Write" : " Only");
@@ -651,27 +637,26 @@
case IO_RANGE:
- acpi_os_printf ("\t\t_resource Type: Io Range\n");
+ acpi_os_printf (" Resource Type: Io Range\n");
- switch (address32_data->attribute.io.range_attribute)
- {
+ switch (address32_data->attribute.io.range_attribute) {
case NON_ISA_ONLY_RANGES:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Non-ISA Io Addresses\n");
break;
case ISA_ONLY_RANGES:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"ISA Io Addresses\n");
break;
case ENTIRE_RANGE:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"ISA and non-ISA Io Addresses\n");
break;
default:
- acpi_os_printf ("\t\t_type Specific: "
+ acpi_os_printf (" Type Specific: "
"Invalid Range attribute");
break;
}
@@ -679,51 +664,190 @@
case BUS_NUMBER_RANGE:
- acpi_os_printf ("\t\t_resource Type: Bus Number Range\n");
+ acpi_os_printf (" Resource Type: Bus Number Range\n");
break;
default:
- acpi_os_printf ("\t\t_invalid Resource Type..exiting.\n");
+ acpi_os_printf (" Invalid Resource Type..exiting.\n");
return;
}
- acpi_os_printf ("\t\t_resource %s\n",
+ acpi_os_printf (" Resource %s\n",
CONSUMER == address32_data->producer_consumer ?
"Consumer" : "Producer");
- acpi_os_printf ("\t\t%s decode\n",
+ acpi_os_printf (" %s decode\n",
SUB_DECODE == address32_data->decode ?
"Subtractive" : "Positive");
- acpi_os_printf ("\t\t_min address is %s fixed\n",
+ acpi_os_printf (" Min address is %s fixed\n",
ADDRESS_FIXED == address32_data->min_address_fixed ?
"" : "not ");
- acpi_os_printf ("\t\t_max address is %s fixed\n",
+ acpi_os_printf (" Max address is %s fixed\n",
ADDRESS_FIXED == address32_data->max_address_fixed ?
"" : "not ");
- acpi_os_printf ("\t\t_granularity: %08X\n",
+ acpi_os_printf (" Granularity: %08X\n",
address32_data->granularity);
- acpi_os_printf ("\t\t_address range min: %08X\n",
+ acpi_os_printf (" Address range min: %08X\n",
address32_data->min_address_range);
- acpi_os_printf ("\t\t_address range max: %08X\n",
+ acpi_os_printf (" Address range max: %08X\n",
address32_data->max_address_range);
- acpi_os_printf ("\t\t_address translation offset: %08X\n",
+ acpi_os_printf (" Address translation offset: %08X\n",
address32_data->address_translation_offset);
- acpi_os_printf ("\t\t_address Length: %08X\n",
+ acpi_os_printf (" Address Length: %08X\n",
address32_data->address_length);
- if(0xFF != address32_data->resource_source_index) {
- acpi_os_printf ("\t\t_resource Source Index: %X\n",
- address32_data->resource_source_index);
- acpi_os_printf ("\t\t_resource Source: %s\n",
- address32_data->resource_source);
+ if(0xFF != address32_data->resource_source.index) {
+ acpi_os_printf (" Resource Source Index: %X\n",
+ address32_data->resource_source.index);
+ acpi_os_printf (" Resource Source: %s\n",
+ address32_data->resource_source.string_ptr);
+ }
+
+ return;
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: Acpi_rs_dump_address64
+ *
+ * PARAMETERS: Data - pointer to the resource structure to dump.
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Prints out the various members of the Data structure type.
+ *
+ ******************************************************************************/
+
+void
+acpi_rs_dump_address64 (
+ ACPI_RESOURCE_DATA *data)
+{
+ ACPI_RESOURCE_ADDRESS64 *address64_data = (ACPI_RESOURCE_ADDRESS64 *) data;
+
+
+ acpi_os_printf ("64-Bit Address Space Resource\n");
+
+ switch (address64_data->resource_type) {
+ case MEMORY_RANGE:
+
+ acpi_os_printf (" Resource Type: Memory Range\n");
+
+ switch (address64_data->attribute.memory.cache_attribute) {
+ case NON_CACHEABLE_MEMORY:
+ acpi_os_printf (" Type Specific: "
+ "Noncacheable memory\n");
+ break;
+
+ case CACHABLE_MEMORY:
+ acpi_os_printf (" Type Specific: "
+ "Cacheable memory\n");
+ break;
+
+ case WRITE_COMBINING_MEMORY:
+ acpi_os_printf (" Type Specific: "
+ "Write-combining memory\n");
+ break;
+
+ case PREFETCHABLE_MEMORY:
+ acpi_os_printf (" Type Specific: "
+ "Prefetchable memory\n");
+ break;
+
+ default:
+ acpi_os_printf (" Type Specific: "
+ "Invalid cache attribute\n");
+ break;
+ }
+
+ acpi_os_printf (" Type Specific: Read%s\n",
+ READ_WRITE_MEMORY ==
+ address64_data->attribute.memory.read_write_attribute ?
+ "/Write" : " Only");
+ break;
+
+ case IO_RANGE:
+
+ acpi_os_printf (" Resource Type: Io Range\n");
+
+ switch (address64_data->attribute.io.range_attribute) {
+ case NON_ISA_ONLY_RANGES:
+ acpi_os_printf (" Type Specific: "
+ "Non-ISA Io Addresses\n");
+ break;
+
+ case ISA_ONLY_RANGES:
+ acpi_os_printf (" Type Specific: "
+ "ISA Io Addresses\n");
+ break;
+
+ case ENTIRE_RANGE:
+ acpi_os_printf (" Type Specific: "
+ "ISA and non-ISA Io Addresses\n");
+ break;
+
+ default:
+ acpi_os_printf (" Type Specific: "
+ "Invalid Range attribute");
+ break;
+ }
+ break;
+
+ case BUS_NUMBER_RANGE:
+
+ acpi_os_printf (" Resource Type: Bus Number Range\n");
+ break;
+
+ default:
+
+ acpi_os_printf (" Invalid Resource Type..exiting.\n");
+ return;
+ }
+
+ acpi_os_printf (" Resource %s\n",
+ CONSUMER == address64_data->producer_consumer ?
+ "Consumer" : "Producer");
+
+ acpi_os_printf (" %s decode\n",
+ SUB_DECODE == address64_data->decode ?
+ "Subtractive" : "Positive");
+
+ acpi_os_printf (" Min address is %s fixed\n",
+ ADDRESS_FIXED == address64_data->min_address_fixed ?
+ "" : "not ");
+
+ acpi_os_printf (" Max address is %s fixed\n",
+ ADDRESS_FIXED == address64_data->max_address_fixed ?
+ "" : "not ");
+
+ acpi_os_printf (" Granularity: %16X\n",
+ address64_data->granularity);
+
+ acpi_os_printf (" Address range min: %16X\n",
+ address64_data->min_address_range);
+
+ acpi_os_printf (" Address range max: %16X\n",
+ address64_data->max_address_range);
+
+ acpi_os_printf (" Address translation offset: %16X\n",
+ address64_data->address_translation_offset);
+
+ acpi_os_printf (" Address Length: %16X\n",
+ address64_data->address_length);
+
+ if(0xFF != address64_data->resource_source.index) {
+ acpi_os_printf (" Resource Source Index: %X\n",
+ address64_data->resource_source.index);
+ acpi_os_printf (" Resource Source: %s\n",
+ address64_data->resource_source.string_ptr);
}
return;
@@ -736,7 +860,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Prints out the various members of the Data structure type.
*
@@ -744,31 +868,31 @@
void
acpi_rs_dump_extended_irq (
- RESOURCE_DATA *data)
+ ACPI_RESOURCE_DATA *data)
{
- EXTENDED_IRQ_RESOURCE *ext_irq_data = (EXTENDED_IRQ_RESOURCE*) data;
+ ACPI_RESOURCE_EXT_IRQ *ext_irq_data = (ACPI_RESOURCE_EXT_IRQ *) data;
u8 index = 0;
- acpi_os_printf ("\t_extended IRQ Resource\n");
+ acpi_os_printf ("Extended IRQ Resource\n");
- acpi_os_printf ("\t\t_resource %s\n",
+ acpi_os_printf (" Resource %s\n",
CONSUMER == ext_irq_data->producer_consumer ?
"Consumer" : "Producer");
- acpi_os_printf ("\t\t%s\n",
+ acpi_os_printf (" %s\n",
LEVEL_SENSITIVE == ext_irq_data->edge_level ?
"Level" : "Edge");
- acpi_os_printf ("\t\t_active %s\n",
+ acpi_os_printf (" Active %s\n",
ACTIVE_LOW == ext_irq_data->active_high_low ?
"low" : "high");
- acpi_os_printf ("\t\t%s\n",
+ acpi_os_printf (" %s\n",
SHARED == ext_irq_data->shared_exclusive ?
"Shared" : "Exclusive");
- acpi_os_printf ("\t\t_interrupts : %X ( ",
+ acpi_os_printf (" Interrupts : %X ( ",
ext_irq_data->number_of_interrupts);
for (index = 0; index < ext_irq_data->number_of_interrupts; index++) {
@@ -777,11 +901,11 @@
acpi_os_printf (")\n");
- if(0xFF != ext_irq_data->resource_source_index) {
- acpi_os_printf ("\t\t_resource Source Index: %X",
- ext_irq_data->resource_source_index);
- acpi_os_printf ("\t\t_resource Source: %s",
- ext_irq_data->resource_source);
+ if(0xFF != ext_irq_data->resource_source.index) {
+ acpi_os_printf (" Resource Source Index: %X",
+ ext_irq_data->resource_source.index);
+ acpi_os_printf (" Resource Source: %s",
+ ext_irq_data->resource_source.string_ptr);
}
return;
@@ -794,7 +918,7 @@
*
* PARAMETERS: Data - pointer to the resource structure to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Dispatches the structure to the correct dump routine.
*
@@ -802,7 +926,7 @@
void
acpi_rs_dump_resource_list (
- RESOURCE *resource)
+ ACPI_RESOURCE *resource)
{
u8 count = 0;
u8 done = FALSE;
@@ -810,66 +934,69 @@
if (acpi_dbg_level & TRACE_RESOURCES && _COMPONENT & acpi_dbg_layer) {
while (!done) {
- acpi_os_printf ("\t_resource structure %x.\n", count++);
+ acpi_os_printf ("Resource structure %x.\n", count++);
- switch (resource->id)
- {
- case irq:
+ switch (resource->id) {
+ case ACPI_RSTYPE_IRQ:
acpi_rs_dump_irq (&resource->data);
break;
- case dma:
+ case ACPI_RSTYPE_DMA:
acpi_rs_dump_dma (&resource->data);
break;
- case start_dependent_functions:
+ case ACPI_RSTYPE_START_DPF:
acpi_rs_dump_start_dependent_functions (&resource->data);
break;
- case end_dependent_functions:
- acpi_os_printf ("\t_end_dependent_functions Resource\n");
+ case ACPI_RSTYPE_END_DPF:
+ acpi_os_printf ("End_dependent_functions Resource\n");
/* Acpi_rs_dump_end_dependent_functions (Resource->Data);*/
break;
- case io:
+ case ACPI_RSTYPE_IO:
acpi_rs_dump_io (&resource->data);
break;
- case fixed_io:
+ case ACPI_RSTYPE_FIXED_IO:
acpi_rs_dump_fixed_io (&resource->data);
break;
- case vendor_specific:
+ case ACPI_RSTYPE_VENDOR:
acpi_rs_dump_vendor_specific (&resource->data);
break;
- case end_tag:
+ case ACPI_RSTYPE_END_TAG:
/*Rs_dump_end_tag (Resource->Data);*/
- acpi_os_printf ("\t_end_tag Resource\n");
+ acpi_os_printf ("End_tag Resource\n");
done = TRUE;
break;
- case memory24:
+ case ACPI_RSTYPE_MEM24:
acpi_rs_dump_memory24 (&resource->data);
break;
- case memory32:
+ case ACPI_RSTYPE_MEM32:
acpi_rs_dump_memory32 (&resource->data);
break;
- case fixed_memory32:
+ case ACPI_RSTYPE_FIXED_MEM32:
acpi_rs_dump_fixed_memory32 (&resource->data);
break;
- case address16:
+ case ACPI_RSTYPE_ADDRESS16:
acpi_rs_dump_address16 (&resource->data);
break;
- case address32:
+ case ACPI_RSTYPE_ADDRESS32:
acpi_rs_dump_address32 (&resource->data);
break;
- case extended_irq:
+ case ACPI_RSTYPE_ADDRESS64:
+ acpi_rs_dump_address64 (&resource->data);
+ break;
+
+ case ACPI_RSTYPE_EXT_IRQ:
acpi_rs_dump_extended_irq (&resource->data);
break;
@@ -879,8 +1006,7 @@
}
- resource = (RESOURCE *) ((NATIVE_UINT) resource +
- (NATIVE_UINT) resource->length);
+ resource = POINTER_ADD (ACPI_RESOURCE, resource, resource->length);
}
}
@@ -893,7 +1019,7 @@
*
* PARAMETERS: Data - pointer to the routing table to dump.
*
- * RETURN:
+ * RETURN: None
*
* DESCRIPTION: Dispatches the structures to the correct dump routine.
*
@@ -913,16 +1039,16 @@
prt_element = (PCI_ROUTING_TABLE *) buffer;
while (!done) {
- acpi_os_printf ("\t_pCI IRQ Routing Table structure %X.\n", count++);
+ acpi_os_printf ("PCI IRQ Routing Table structure %X.\n", count++);
- acpi_os_printf ("\t\t_address: %X\n",
+ acpi_os_printf (" Address: %X\n",
prt_element->address);
- acpi_os_printf ("\t\t_pin: %X\n", prt_element->pin);
+ acpi_os_printf (" Pin: %X\n", prt_element->pin);
- acpi_os_printf ("\t\t_source: %s\n", prt_element->source);
+ acpi_os_printf (" Source: %s\n", prt_element->source);
- acpi_os_printf ("\t\t_source_index: %X\n",
+ acpi_os_printf (" Source_index: %X\n",
prt_element->source_index);
buffer += prt_element->length;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)