Changeset cbf528f in mainline

Timestamp:

2018-11-13T15:15:05Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

159c1525

Parents:

705ca2b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 15:09:15)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-13 15:15:05)

Message:

Fix rsdp search

Forgot that sizeof(string) includes the NUL byte.

File:

• kernel/genarch/src/acpi/acpi.c (modified) (1 diff)

kernel/genarch/src/acpi/acpi.c

@@ -171 +171 @@
 }
 
+typedef uint64_t _a64_t __attribute__((may_alias));
+
 static uint8_t *search_rsdp(uint8_t *base, size_t len)
 {
+        uint64_t signature = *(_a64_t *) RSDP_SIGNATURE;
+
         for (size_t i = 0; i < len; i += 16) {
-                if (memcmp(&base[i], RSDP_SIGNATURE, sizeof(RSDP_SIGNATURE)) == 0 &&
-                    rsdp_check(&base[i]))
+                if (*((_a64_t *) &base[i]) == signature && rsdp_check(&base[i]))
                         return &base[i];
         }