Changeset 3bacee1 in mainline for kernel/genarch/src/acpi

Timestamp:

2018-04-12T16:27:17Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

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)

Message:

Make ccheck-fix again and commit more good files.

Location:

kernel/genarch/src/acpi

Files:

• acpi.c (modified) (4 diffs)
• madt.c (modified) (2 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -65 +65 @@
 };
 
-static int rsdp_check(uint8_t *_rsdp) {
+static int rsdp_check(uint8_t *_rsdp)
+{
         struct acpi_rsdp *rsdp = (struct acpi_rsdp *) _rsdp;
         uint8_t sum = 0;
@@ -119 +120 @@
         size_t i;
         size_t j;
-        size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header))
-            / sizeof(uint32_t);
+        size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) /
+            sizeof(uint32_t);
 
         for (i = 0; i < cnt; i++) {
-                for (j = 0; j < sizeof(signature_map)
-                    / sizeof(struct acpi_signature_map); j++) {
+                for (j = 0; j < sizeof(signature_map) /
+                    sizeof(struct acpi_signature_map); j++) {
                         struct acpi_sdt_header *hdr =
                             (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i];
@@ -145 +146 @@
         size_t i;
         size_t j;
-        size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header))
-            / sizeof(uint64_t);
+        size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) /
+            sizeof(uint64_t);
 
         for (i = 0; i < cnt; i++) {
-                for (j = 0; j < sizeof(signature_map)
-                    / sizeof(struct acpi_signature_map); j++) {
+                for (j = 0; j < sizeof(signature_map) /
+                    sizeof(struct acpi_signature_map); j++) {
                         struct acpi_sdt_header *hdr =
                             (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]);
@@ -184 +185 @@
         for (i = (ebda ? 0 : 1); i < 2; i++) {
                 for (j = 0; j < length[i]; j += 16) {
-                        if ((*((uint64_t *) &addr[i][j]) == *sig)
-                            && (rsdp_check(&addr[i][j]))) {
+                        if ((*((uint64_t *) &addr[i][j]) == *sig) &&
+                            (rsdp_check(&addr[i][j]))) {
                                 acpi_rsdp = (struct acpi_rsdp *) &addr[i][j];
                                 goto rsdp_found;

kernel/genarch/src/acpi/madt.c

@@ -225 +225 @@
                 case MADT_IO_APIC:
                         madt_io_apic_entry((struct madt_io_apic *) hdr, i);
-                break;
+                        break;
                 case MADT_INTR_SRC_OVRD:
                         madt_intr_src_ovrd_entry((struct madt_intr_src_ovrd *) hdr, i);
@@ -240 +240 @@
                         break;
                 default:
-                        if ((hdr->type >= MADT_RESERVED_SKIP_BEGIN)
-                            && (hdr->type <= MADT_RESERVED_SKIP_END))
+                        if ((hdr->type >= MADT_RESERVED_SKIP_BEGIN) &&
+                            (hdr->type <= MADT_RESERVED_SKIP_END))
                                 log(LF_ARCH, LVL_NOTE,
                                     "MADT: Skipping reserved entry (type=%" PRIu8 ")",