aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/resources
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-22 01:57:01 -0400
committerLen Brown <len.brown@intel.com>2005-09-22 01:58:50 -0400
commit486368bf33a2844319ad4865039543cd50ac90dd (patch)
tree268ac55f3f4e49abda178e05cc5a98c6e1d157ff /drivers/acpi/resources
parenteca008c8134df15262a0362623edb59902628c95 (diff)
[ACPI] clean up ACPICA 20050916's rscalc typedef syntax
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/resources')
-rw-r--r--drivers/acpi/resources/rscalc.c76
1 files changed, 38 insertions, 38 deletions
diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index cd051c97bf5b..2da7c6a8182e 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -78,51 +78,50 @@ static u8 acpi_gbl_stream_sizes[] = {
78 * Base sizes of resource descriptors, both the actual AML stream length and 78 * Base sizes of resource descriptors, both the actual AML stream length and
79 * size of the internal struct representation. 79 * size of the internal struct representation.
80 */ 80 */
81typedef struct acpi_resource_sizes { 81struct acpi_resource_sizes {
82 u8 minimum_stream_size; 82 u8 minimum_stream_size;
83 u8 minimum_struct_size; 83 u8 minimum_struct_size;
84};
84 85
85} ACPI_RESOURCE_SIZES; 86static struct acpi_resource_sizes acpi_gbl_sm_resource_sizes[] = {
86 87 {0, 0}, /* 0x00, Reserved */
87static ACPI_RESOURCE_SIZES acpi_gbl_sm_resource_sizes[] = { 88 {0, 0}, /* 0x01, Reserved */
88 0, 0, /* 0x00, Reserved */ 89 {0, 0}, /* 0x02, Reserved */
89 0, 0, /* 0x01, Reserved */ 90 {0, 0}, /* 0x03, Reserved */
90 0, 0, /* 0x02, Reserved */ 91 {3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_irq)}, /* ACPI_RDESC_TYPE_IRQ_FORMAT */
91 0, 0, /* 0x03, Reserved */ 92 {3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_dma)}, /* ACPI_RDESC_TYPE_DMA_FORMAT */
92 3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_irq), /* ACPI_RDESC_TYPE_IRQ_FORMAT */ 93 {1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_start_dpf)}, /* ACPI_RDESC_TYPE_START_DEPENDENT */
93 3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_dma), /* ACPI_RDESC_TYPE_DMA_FORMAT */ 94 {1, ACPI_RESOURCE_LENGTH}, /* ACPI_RDESC_TYPE_END_DEPENDENT */
94 1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_start_dpf), /* ACPI_RDESC_TYPE_START_DEPENDENT */ 95 {8, ACPI_SIZEOF_RESOURCE(struct acpi_resource_io)}, /* ACPI_RDESC_TYPE_IO_PORT */
95 1, ACPI_RESOURCE_LENGTH, /* ACPI_RDESC_TYPE_END_DEPENDENT */ 96 {4, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_io)}, /* ACPI_RDESC_TYPE_FIXED_IO_PORT */
96 8, ACPI_SIZEOF_RESOURCE(struct acpi_resource_io), /* ACPI_RDESC_TYPE_IO_PORT */ 97 {0, 0}, /* 0x0A, Reserved */
97 4, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_io), /* ACPI_RDESC_TYPE_FIXED_IO_PORT */ 98 {0, 0}, /* 0x0B, Reserved */
98 0, 0, /* 0x0A, Reserved */ 99 {0, 0}, /* 0x0C, Reserved */
99 0, 0, /* 0x0B, Reserved */ 100 {0, 0}, /* 0x0D, Reserved */
100 0, 0, /* 0x0C, Reserved */ 101 {1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor)}, /* ACPI_RDESC_TYPE_SMALL_VENDOR */
101 0, 0, /* 0x0D, Reserved */ 102 {2, ACPI_RESOURCE_LENGTH}, /* ACPI_RDESC_TYPE_END_TAG */
102 1, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor), /* ACPI_RDESC_TYPE_SMALL_VENDOR */
103 2, ACPI_RESOURCE_LENGTH, /* ACPI_RDESC_TYPE_END_TAG */
104}; 103};
105 104
106static ACPI_RESOURCE_SIZES acpi_gbl_lg_resource_sizes[] = { 105static struct acpi_resource_sizes acpi_gbl_lg_resource_sizes[] = {
107 0, 0, /* 0x00, Reserved */ 106 {0, 0}, /* 0x00, Reserved */
108 12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24), /* ACPI_RDESC_TYPE_MEMORY_24 */ 107 {12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem24)}, /* ACPI_RDESC_TYPE_MEMORY_24 */
109 15, ACPI_SIZEOF_RESOURCE(struct acpi_resource_generic_reg), /* ACPI_RDESC_TYPE_GENERIC_REGISTER */ 108 {15, ACPI_SIZEOF_RESOURCE(struct acpi_resource_generic_reg)}, /* ACPI_RDESC_TYPE_GENERIC_REGISTER */
110 0, 0, /* 0x03, Reserved */ 109 {0, 0}, /* 0x03, Reserved */
111 3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor), /* ACPI_RDESC_TYPE_LARGE_VENDOR */ 110 {3, ACPI_SIZEOF_RESOURCE(struct acpi_resource_vendor)}, /* ACPI_RDESC_TYPE_LARGE_VENDOR */
112 20, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32), /* ACPI_RDESC_TYPE_MEMORY_32 */ 111 {20, ACPI_SIZEOF_RESOURCE(struct acpi_resource_mem32)}, /* ACPI_RDESC_TYPE_MEMORY_32 */
113 12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_mem32), /* ACPI_RDESC_TYPE_FIXED_MEMORY_32 */ 112 {12, ACPI_SIZEOF_RESOURCE(struct acpi_resource_fixed_mem32)}, /* ACPI_RDESC_TYPE_FIXED_MEMORY_32 */
114 26, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32), /* ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE */ 113 {26, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address32)}, /* ACPI_RDESC_TYPE_DWORD_ADDRESS_SPACE */
115 16, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16), /* ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE */ 114 {16, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address16)}, /* ACPI_RDESC_TYPE_WORD_ADDRESS_SPACE */
116 9, ACPI_SIZEOF_RESOURCE(struct acpi_resource_ext_irq), /* ACPI_RDESC_TYPE_EXTENDED_XRUPT */ 115 {9, ACPI_SIZEOF_RESOURCE(struct acpi_resource_ext_irq)}, /* ACPI_RDESC_TYPE_EXTENDED_XRUPT */
117 46, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64), /* ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE */ 116 {46, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64)}, /* ACPI_RDESC_TYPE_QWORD_ADDRESS_SPACE */
118 56, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64), /* ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE */ 117 {56, ACPI_SIZEOF_RESOURCE(struct acpi_resource_address64)}, /* ACPI_RDESC_TYPE_EXTENDED_ADDRESS_SPACE */
119}; 118};
120 119
121/* Local prototypes */ 120/* Local prototypes */
122 121
123static u8 acpi_rs_count_set_bits(u16 bit_field); 122static u8 acpi_rs_count_set_bits(u16 bit_field);
124 123
125static ACPI_RESOURCE_SIZES *acpi_rs_get_resource_sizes(u8 resource_type); 124static struct acpi_resource_sizes *acpi_rs_get_resource_sizes(u8 resource_type);
126 125
127static u16 acpi_rs_get_resource_length(u8 * resource); 126static u16 acpi_rs_get_resource_length(u8 * resource);
128 127
@@ -173,9 +172,9 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
173 * 172 *
174 ******************************************************************************/ 173 ******************************************************************************/
175 174
176static ACPI_RESOURCE_SIZES *acpi_rs_get_resource_sizes(u8 resource_type) 175static struct acpi_resource_sizes *acpi_rs_get_resource_sizes(u8 resource_type)
177{ 176{
178 ACPI_RESOURCE_SIZES *size_info; 177 struct acpi_resource_sizes *size_info;
179 178
180 ACPI_FUNCTION_ENTRY(); 179 ACPI_FUNCTION_ENTRY();
181 180
@@ -489,7 +488,7 @@ acpi_rs_get_list_length(u8 * byte_stream_buffer,
489 u32 byte_stream_buffer_length, acpi_size * size_needed) 488 u32 byte_stream_buffer_length, acpi_size * size_needed)
490{ 489{
491 u8 *buffer; 490 u8 *buffer;
492 ACPI_RESOURCE_SIZES *resource_info; 491 struct acpi_resource_sizes *resource_info;
493 u32 buffer_size = 0; 492 u32 buffer_size = 0;
494 u32 bytes_parsed = 0; 493 u32 bytes_parsed = 0;
495 u8 resource_type; 494 u8 resource_type;
@@ -759,7 +758,8 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
759 (*sub_object_list)->string. 758 (*sub_object_list)->string.
760 length + 1); 759 length + 1);
761 } else { 760 } else {
762 temp_size_needed += acpi_ns_get_pathname_length((*sub_object_list)->reference.node); 761 temp_size_needed +=
762 acpi_ns_get_pathname_length((*sub_object_list)->reference.node);
763 } 763 }
764 } else { 764 } else {
765 /* 765 /*
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-21 16:12:41 -0400