Changeset a35b458 in mainline for kernel/genarch/src/acpi/acpi.c

Timestamp:

2018-03-02T20:10:49Z (7 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:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• kernel/genarch/src/acpi/acpi.c (modified) (11 diffs)

kernel/genarch/src/acpi/acpi.c

@@ -69 +69 @@
         uint8_t sum = 0;
         uint32_t i;
-        
+
         for (i = 0; i < 20; i++)
                 sum = (uint8_t) (sum + _rsdp[i]);
-        
+
         if (sum)
                 return 0; /* bad checksum */
-        
+
         if (rsdp->revision == 0)
                 return 1; /* ACPI 1.0 */
-        
+
         for (; i < rsdp->length; i++)
                 sum = (uint8_t) (sum + _rsdp[i]);
-        
+
         return !sum;
 }
@@ -90 +90 @@
         uint8_t sum = 0;
         unsigned int i;
-        
+
         for (i = 0; i < hdr->length; i++)
                 sum = (uint8_t) (sum + sdt[i]);
-        
+
         return !sum;
 }
@@ -109 +109 @@
         vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt,
             vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE);
-        
+
         // TODO: do not leak vtmp
 
@@ -121 +121 @@
         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)
@@ -127 +127 @@
                         struct acpi_sdt_header *hdr =
                             (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i];
-                        
+
                         struct acpi_sdt_header *vhdr = map_sdt(hdr);
                         if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) {
                                 if (!acpi_sdt_check((uint8_t *) vhdr))
                                         break;
-                                
+
                                 *signature_map[j].sdt_ptr = vhdr;
                                 LOG("%p: ACPI %s", *signature_map[j].sdt_ptr,
@@ -147 +147 @@
         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)
@@ -153 +153 @@
                         struct acpi_sdt_header *hdr =
                             (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]);
-                        
+
                         struct acpi_sdt_header *vhdr = map_sdt(hdr);
                         if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) {
                                 if (!acpi_sdt_check((uint8_t *) vhdr))
                                         break;
-                                
+
                                 *signature_map[j].sdt_ptr = vhdr;
                                 LOG("%p: ACPI %s", *signature_map[j].sdt_ptr,
@@ -174 +174 @@
         unsigned int length[2] = { 1024, 128 * 1024 };
         uint64_t *sig = (uint64_t *) RSDP_SIGNATURE;
-        
+
         /*
          * Find Root System Description Pointer
@@ -180 +180 @@
          * 2. search 128K starting at 0xe0000
          */
-        
+
         addr[0] = (uint8_t *) PA2KA(ebda);
         for (i = (ebda ? 0 : 1); i < 2; i++) {
@@ -191 +191 @@
                 }
         }
-        
+
         return;
-        
+
 rsdp_found:
         LOG("%p: ACPI Root System Description Pointer", acpi_rsdp);
-        
+
         uintptr_t acpi_rsdt_p = (uintptr_t) acpi_rsdp->rsdt_address;
         uintptr_t acpi_xsdt_p = 0;
@@ -202 +202 @@
         if (acpi_rsdp->revision)
                 acpi_xsdt_p = (uintptr_t) acpi_rsdp->xsdt_address;
-        
+
         if (acpi_rsdt_p)
                 acpi_rsdt = (struct acpi_rsdt *) map_sdt(
                     (struct acpi_sdt_header *) acpi_rsdt_p);
-        
+
         if (acpi_xsdt_p)
                 acpi_xsdt = (struct acpi_xsdt *) map_sdt(
                     (struct acpi_sdt_header *) acpi_xsdt_p);
-        
+
         if ((acpi_rsdt) && (!acpi_sdt_check((uint8_t *) acpi_rsdt))) {
                 log(LF_ARCH, LVL_ERROR, "RSDT: bad checksum");
                 return;
         }
-        
+
         if ((acpi_xsdt) && (!acpi_sdt_check((uint8_t *) acpi_xsdt))) {
                 log(LF_ARCH, LVL_ERROR, "XSDT: bad checksum");
                 return;
         }
-        
+
         if (acpi_xsdt)
                 configure_via_xsdt();