projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ACPI] ACPICA 20051117
[deliverable/linux.git]
/
drivers
/
acpi
/
resources
/
rscalc.c
diff --git
a/drivers/acpi/resources/rscalc.c
b/drivers/acpi/resources/rscalc.c
index eca7439ee9da259c839e6465875e79df3cb439d1..c2c4d9079c6cfe08a8140bc8976cb8be0f993378 100644
(file)
--- a/
drivers/acpi/resources/rscalc.c
+++ b/
drivers/acpi/resources/rscalc.c
@@
-300,7
+300,7
@@
acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed)
/* Point to the next object */
resource =
/* Point to the next object */
resource =
- ACPI_
PTR_ADD
(struct acpi_resource, resource,
+ ACPI_
ADD_PTR
(struct acpi_resource, resource,
resource->length);
}
resource->length);
}
@@
-374,8
+374,7
@@
acpi_rs_get_list_length(u8 * aml_buffer,
* Get the number of bits set in the 16-bit IRQ mask
*/
ACPI_MOVE_16_TO_16(&temp16, buffer);
* Get the number of bits set in the 16-bit IRQ mask
*/
ACPI_MOVE_16_TO_16(&temp16, buffer);
- extra_struct_bytes =
- acpi_rs_count_set_bits(temp16) * sizeof(u32);
+ extra_struct_bytes = acpi_rs_count_set_bits(temp16);
break;
case ACPI_RESOURCE_NAME_DMA:
break;
case ACPI_RESOURCE_NAME_DMA:
@@
-383,8
+382,7
@@
acpi_rs_get_list_length(u8 * aml_buffer,
* DMA Resource:
* Get the number of bits set in the 8-bit DMA mask
*/
* DMA Resource:
* Get the number of bits set in the 8-bit DMA mask
*/
- extra_struct_bytes =
- acpi_rs_count_set_bits(*buffer) * sizeof(u32);
+ extra_struct_bytes = acpi_rs_count_set_bits(*buffer);
break;
case ACPI_RESOURCE_NAME_VENDOR_SMALL:
break;
case ACPI_RESOURCE_NAME_VENDOR_SMALL:
@@
-399,9
+397,9
@@
acpi_rs_get_list_length(u8 * aml_buffer,
case ACPI_RESOURCE_NAME_END_TAG:
/*
case ACPI_RESOURCE_NAME_END_TAG:
/*
- * End Tag: This is the normal exit
+ * End Tag: This is the normal exit
, add size of end_tag
*/
*/
- *size_needed = buffer_size;
+ *size_needed = buffer_size
+ ACPI_RS_SIZE_MIN
;
return_ACPI_STATUS(AE_OK);
case ACPI_RESOURCE_NAME_VENDOR_LARGE:
return_ACPI_STATUS(AE_OK);
case ACPI_RESOURCE_NAME_VENDOR_LARGE:
@@
-466,7
+464,7
@@
acpi_rs_get_list_length(u8 * aml_buffer,
temp16 = (u16) (acpi_gbl_resource_struct_sizes[resource_index] +
extra_struct_bytes);
temp16 = (u16) (acpi_gbl_resource_struct_sizes[resource_index] +
extra_struct_bytes);
- buffer_size += (u32) ACPI_
ALIGN_RESOURCE_SIZE
(temp16);
+ buffer_size += (u32) ACPI_
ROUND_UP_TO_NATIVE_WORD
(temp16);
/*
* Point to the next resource within the stream
/*
* Point to the next resource within the stream
This page took
0.047367 seconds
and
5
git commands to generate.