Skip to content

L
linux-davinci
Commit 486368bf authored by Len Brown's avatar Len Brown
Browse files
Options

[ACPI] clean up ACPICA 20050916's rscalc typedef syntax 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent eca008c8
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
drivers/acpi/resources/rscalc.c
View file @ 486368bf
...@@ -78,51 +78,50 @@ static u8 acpi_gbl_stream_sizes[] = { ...@@ -78,51 +78,50 @@ static u8 acpi_gbl_stream_sizes[] = {
* Base sizes of resource descriptors, both the actual AML stream length and * Base sizes of resource descriptors, both the actual AML stream length and
* size of the internal struct representation. * size of the internal struct representation.
*/ */
typedef struct acpi_resource_sizes { struct acpi_resource_sizes {
u8 minimum_stream_size; u8 minimum_stream_size;
u8 minimum_struct_size; u8 minimum_struct_size;
};
} ACPI_RESOURCE_SIZES; static struct acpi_resource_sizes acpi_gbl_sm_resource_sizes[] = {
{0, 0}, /* 0x00, Reserved */
static ACPI_RESOURCE_SIZES acpi_gbl_sm_resource_sizes[] = { {0, 0}, /* 0x01, Reserved */
0, 0, /* 0x00, Reserved */ {0, 0}, /* 0x02, Reserved */
0, 0, /* 0x01, Reserved */ {0, 0}, /* 0x03, Reserved */
0, 0, /* 0x02, Reserved */ {3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_irq)}, /* ACPI_RDESC_TYPE_IRQ_FORMAT */
0, 0, /* 0x03, Reserved */ {3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_dma)}, /* ACPI_RDESC_TYPE_DMA_FORMAT */
3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_irq), /* ACPI_RDESC_TYPE_IRQ_FORMAT */ {1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_start_dpf)}, /* ACPI_RDESC_TYPE_START_DEPENDENT */
3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_dma), /* ACPI_RDESC_TYPE_DMA_FORMAT */ {1, ACPI_RESOURCE_LENGTH}, /* ACPI_RDESC_TYPE_END_DEPENDENT */
1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_start_dpf), /* ACPI_RDESC_TYPE_START_DEPENDENT */ {8, ACPI_SIZEOF_RESOURCE(struct acpi_resource_io)}, /* ACPI_RDESC_TYPE_IO_PORT */
1, ACPI_RESOURCE_LENGTH, /* ACPI_RDESC_TYPE_END_DEPENDENT */ {4, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_io)}, /* ACPI_RDESC_TYPE_FIXED_IO_PORT */
8, ACPI_SIZEOF_RESOURCE(struct acpi_resource_io), /* ACPI_RDESC_TYPE_IO_PORT */ {0, 0}, /* 0x0A, Reserved */
4, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_io), /* ACPI_RDESC_TYPE_FIXED_IO_PORT */ {0, 0}, /* 0x0B, Reserved */
0, 0, /* 0x0A, Reserved */ {0, 0}, /* 0x0C, Reserved */
0, 0, /* 0x0B, Reserved */ {0, 0}, /* 0x0D, Reserved */
0, 0, /* 0x0C, Reserved */ {1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor)}, /* ACPI_RDESC_TYPE_SMALL_VENDOR */
0, 0, /* 0x0D, Reserved */ {2, ACPI_RESOURCE_LENGTH}, /* ACPI_RDESC_TYPE_END_TAG */
1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor), /* ACPI_RDESC_TYPE_SMALL_VENDOR */
2, ACPI_RESOURCE_LENGTH, /* ACPI_RDESC_TYPE_END_TAG */
}; };
static ACPI_RESOURCE_SIZES acpi_gbl_lg_resource_sizes[] = { static struct acpi_resource_sizes acpi_gbl_lg_resource_sizes[] = {
0, 0, /* 0x00, Reserved */ {0, 0}, /* 0x00, Reserved */
12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24), /* ACPI_RDESC_TYPE_MEMORY_24 */ {12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24)}, /* ACPI_RDESC_TYPE_MEMORY_24 */
15, ACPI_SIZEOF_RESOURCE(struct acpi_resource_generic_reg), /* ACPI_RDESC_TYPE_GENERIC_REGISTER */ {15, ACPI_SIZEOF_RESOURCE(struct acpi_resource_generic_reg)}, /* ACPI_RDESC_TYPE_GENERIC_REGISTER */
0, 0, /* 0x03, Reserved */ {0, 0}, /* 0x03, Reserved */
3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor), /* ACPI_RDESC_TYPE_LARGE_VENDOR */ {3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor)}, /* ACPI_RDESC_TYPE_LARGE_VENDOR */
20, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32), /* ACPI_RDESC_TYPE_MEMORY_32 */ {20, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32)}, /* ACPI_RDESC_TYPE_MEMORY_32 */
12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_mem32), /* ACPI_RDESC_TYPE_FIXED_MEMORY_32 */ {12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_mem32)}, /* ACPI_RDESC_TYPE_FIXED_MEMORY_32 */
26, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32), /* ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE */ {26, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32)}, /* ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE */
16, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16), /* ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE */ {16, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16)}, /* ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE */
9, ACPI_SIZEOF_RESOURCE(struct acpi_resource_ext_irq), /* ACPI_RDESC_TYPE_EXTENDED_XRUPT */ {9, ACPI_SIZEOF_RESOURCE(struct acpi_resource_ext_irq)}, /* ACPI_RDESC_TYPE_EXTENDED_XRUPT */
46, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64), /* ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE */ {46, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64)}, /* ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE */
56, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64), /* ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE */ {56, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64)}, /* ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE */
}; };
/* Local prototypes */ /* Local prototypes */
static u8 acpi_rs_count_set_bits(u16 bit_field); static u8 acpi_rs_count_set_bits(u16 bit_field);
static ACPI_RESOURCE_SIZES *acpi_rs_get_resource_sizes(u8 resource_type); static struct acpi_resource_sizes *acpi_rs_get_resource_sizes(u8 resource_type);
static u16 acpi_rs_get_resource_length(u8 * resource); static u16 acpi_rs_get_resource_length(u8 * resource);
...@@ -173,9 +172,9 @@ static u8 acpi_rs_count_set_bits(u16 bit_field) ...@@ -173,9 +172,9 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
* *
******************************************************************************/ ******************************************************************************/
static ACPI_RESOURCE_SIZES *acpi_rs_get_resource_sizes(u8 resource_type) static struct acpi_resource_sizes *acpi_rs_get_resource_sizes(u8 resource_type)
{ {
ACPI_RESOURCE_SIZES *size_info; struct acpi_resource_sizes *size_info;
ACPI_FUNCTION_ENTRY(); ACPI_FUNCTION_ENTRY();
...@@ -489,7 +488,7 @@ acpi_rs_get_list_length(u8 * byte_stream_buffer, ...@@ -489,7 +488,7 @@ acpi_rs_get_list_length(u8 * byte_stream_buffer,
u32 byte_stream_buffer_length, acpi_size * size_needed) u32 byte_stream_buffer_length, acpi_size * size_needed)
{ {
u8 *buffer; u8 *buffer;
ACPI_RESOURCE_SIZES *resource_info; struct acpi_resource_sizes *resource_info;
u32 buffer_size = 0; u32 buffer_size = 0;
u32 bytes_parsed = 0; u32 bytes_parsed = 0;
u8 resource_type; u8 resource_type;
...@@ -759,7 +758,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, ...@@ -759,7 +758,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
(*sub_object_list)->string. (*sub_object_list)->string.
length + 1); length + 1);
} else { } else {
temp_size_needed += acpi_ns_get_pathname_length((*sub_object_list)->reference.node); temp_size_needed +=
acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
} }
} else { } else {
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment