Changeset 3bacee1 in mainline for kernel/genarch/src/acpi/acpi.c
- Timestamp:
- 2018-04-12T16:27:17Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3cf22f9
- Parents:
- 76d0981d
- git-author:
- Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)
- git-committer:
- Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/genarch/src/acpi/acpi.c
r76d0981d r3bacee1 65 65 }; 66 66 67 static int rsdp_check(uint8_t *_rsdp) { 67 static int rsdp_check(uint8_t *_rsdp) 68 { 68 69 struct acpi_rsdp *rsdp = (struct acpi_rsdp *) _rsdp; 69 70 uint8_t sum = 0; … … 119 120 size_t i; 120 121 size_t j; 121 size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) 122 /sizeof(uint32_t);122 size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) / 123 sizeof(uint32_t); 123 124 124 125 for (i = 0; i < cnt; i++) { 125 for (j = 0; j < sizeof(signature_map) 126 /sizeof(struct acpi_signature_map); j++) {126 for (j = 0; j < sizeof(signature_map) / 127 sizeof(struct acpi_signature_map); j++) { 127 128 struct acpi_sdt_header *hdr = 128 129 (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i]; … … 145 146 size_t i; 146 147 size_t j; 147 size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) 148 /sizeof(uint64_t);148 size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) / 149 sizeof(uint64_t); 149 150 150 151 for (i = 0; i < cnt; i++) { 151 for (j = 0; j < sizeof(signature_map) 152 /sizeof(struct acpi_signature_map); j++) {152 for (j = 0; j < sizeof(signature_map) / 153 sizeof(struct acpi_signature_map); j++) { 153 154 struct acpi_sdt_header *hdr = 154 155 (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); … … 184 185 for (i = (ebda ? 0 : 1); i < 2; i++) { 185 186 for (j = 0; j < length[i]; j += 16) { 186 if ((*((uint64_t *) &addr[i][j]) == *sig) 187 &&(rsdp_check(&addr[i][j]))) {187 if ((*((uint64_t *) &addr[i][j]) == *sig) && 188 (rsdp_check(&addr[i][j]))) { 188 189 acpi_rsdp = (struct acpi_rsdp *) &addr[i][j]; 189 190 goto rsdp_found;
Note:
See TracChangeset
for help on using the changeset viewer.