Changeset a35b458 in mainline for kernel/arch/ia32/src/mm/frame.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/arch/ia32/src/mm/frame.c (modified) (8 diffs)

kernel/arch/ia32/src/mm/frame.c

@@ -54 +54 @@
 {
         unsigned int i;
-        
+
         for (i = 0; i < e820counter; i++) {
                 uint64_t base64 = e820table[i].base_address;
                 uint64_t size64 = e820table[i].size;
-                
+
 #ifdef KARCH_ia32
                 /*
@@ -65 +65 @@
                 if (base64 >= PHYSMEM_LIMIT32)
                         continue;
-                
+
                 if (base64 + size64 > PHYSMEM_LIMIT32)
                         size64 = PHYSMEM_LIMIT32 - base64;
 #endif
-                
+
                 uintptr_t base = (uintptr_t) base64;
                 size_t size = (size_t) size64;
-                
+
                 if (!frame_adjust_zone_bounds(low, &base, &size))
                         continue;
-                
+
                 if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) {
                         /* To be safe, make the available zone possibly smaller */
@@ -81 +81 @@
                         uint64_t new_size = ALIGN_DOWN(size - (new_base - base),
                             FRAME_SIZE);
-                        
+
                         size_t count = SIZE2FRAMES(new_size);
                         pfn_t pfn = ADDR2PFN(new_base);
                         pfn_t conf;
-                        
+
                         if (low) {
                                 if ((minconf < pfn) || (minconf >= pfn + count))
@@ -105 +105 @@
                         uint64_t new_size = ALIGN_UP(size + (base - new_base),
                             FRAME_SIZE);
-                        
+
                         zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
                             ZONE_FIRMWARE);
@@ -113 +113 @@
                         uint64_t new_size = ALIGN_UP(size + (base - new_base),
                             FRAME_SIZE);
-                        
+
                         zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0,
                             ZONE_RESERVED);
@@ -133 +133 @@
         unsigned int i;
         printf("[base            ] [size            ] [name   ]\n");
-        
+
         for (i = 0; i < e820counter; i++) {
                 const char *name;
-                
+
                 if (e820table[i].type <= MEMMAP_MEMORY_UNUSABLE)
                         name = e820names[e820table[i].type];
                 else
                         name = "invalid";
-                
+
                 printf("%#018" PRIx64 " %#018" PRIx64" %s\n", e820table[i].base_address,
                     e820table[i].size, name);
@@ -150 +150 @@
 {
         pfn_t minconf;
-        
+
         if (config.cpu_active == 1) {
                 minconf = 1;
-                
+
 #ifdef CONFIG_SMP
                 minconf = max(minconf,
@@ -159 +159 @@
                     hardcoded_unmapped_kdata_size));
 #endif
-                
+
                 init_e820_memory(minconf, true);
-                
+
                 /* Reserve frame 0 (BIOS data) */
                 frame_mark_unavailable(0, 1);
-                
+
 #ifdef CONFIG_SMP
                 /* Reserve AP real mode bootstrap memory */