Changeset a35b458 in mainline for kernel/genarch/src/multiboot

Timestamp:

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

Location:

kernel/genarch/src/multiboot

Files:

• multiboot.c (modified) (7 diffs)
• multiboot2.c (modified) (5 diffs)

kernel/genarch/src/multiboot/multiboot.c

@@ -52 +52 @@
         if (end == NULL)
                 end = cmd_line + str_size(cmd_line);
-        
+
         /*
          * Find last occurence of '/' before 'end'. If found, place start at
@@ -59 +59 @@
         const char *cp = end;
         const char *start = buf;
-        
+
         while (cp != start) {
                 if (*cp == '/') {
@@ -67 +67 @@
                 cp--;
         }
-        
+
         /* Copy the command. */
         str_ncpy(buf, size, start, (size_t) (end - start));
@@ -106 +106 @@
                 if (init.cnt >= CONFIG_INIT_TASKS)
                         break;
-                
+
                 init.tasks[init.cnt].paddr = mods[i].start;
                 init.tasks[init.cnt].size = mods[i].end - mods[i].start;
-                
+
                 /* Copy command line, if available. */
                 if (mods[i].string) {
@@ -120 +120 @@
                         init.tasks[init.cnt].arguments[0] = 0;
                 }
-                
+
                 init.cnt++;
         }
@@ -128 +128 @@
 {
         uint32_t pos = 0;
-        
+
         while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) {
                 e820table[e820counter] = memmap->mm_info;
-                
+
                 /* Compute address of next structure. */
                 uint32_t size = sizeof(memmap->size) + memmap->size;
                 memmap = (multiboot_memmap_t *) ((uintptr_t) memmap + size);
                 pos += size;
-                
+
                 e820counter++;
         }
@@ -163 +163 @@
                 multiboot_modules(info->mods_count,
                     (multiboot_module_t *) MULTIBOOT_PTR(info->mods_addr));
-        
+
         /* Copy memory map. */
         if ((info->flags & MULTIBOOT_INFO_FLAGS_MMAP) != 0)

kernel/genarch/src/multiboot/multiboot2.c

@@ -56 +56 @@
                 multiboot_extract_argument(init.tasks[init.cnt].arguments,
                     CONFIG_TASK_ARGUMENTS_BUFLEN, module->string);
-                
+
                 init.cnt++;
         }
@@ -66 +66 @@
             ((uintptr_t) memmap + sizeof(*memmap));
         uint32_t pos = sizeof(*memmap);
-        
+
         while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) {
                 e820table[e820counter].base_address = entry->base_address;
                 e820table[e820counter].size = entry->size;
                 e820table[e820counter].type = entry->type;
-                
+
                 /* Compute address of next entry. */
                 entry = (multiboot2_memmap_entry_t *)
                     ((uintptr_t) entry + memmap->entry_size);
                 pos += memmap->entry_size;
-                
+
                 e820counter++;
         }
@@ -90 +90 @@
                 bfb_bpp = fbinfo->bpp;
                 bfb_scanline = fbinfo->scanline;
-                
+
                 bfb_red_pos = fbinfo->rgb.red_pos;
                 bfb_red_size = fbinfo->rgb.red_size;
-                
+
                 bfb_green_pos = fbinfo->rgb.green_pos;
                 bfb_green_size = fbinfo->rgb.green_size;
-                
+
                 bfb_blue_pos = fbinfo->rgb.blue_pos;
                 bfb_blue_size = fbinfo->rgb.blue_size;
@@ -116 +116 @@
         if (signature != MULTIBOOT2_LOADER_MAGIC)
                 return;
-        
+
         const multiboot2_tag_t *tag = (const multiboot2_tag_t *)
             ALIGN_UP((uintptr_t) info + sizeof(*info), MULTIBOOT2_TAG_ALIGN);
-        
+
         while (tag->type != MULTIBOOT2_TAG_TERMINATOR) {
                 switch (tag->type) {
@@ -135 +135 @@
                         break;
                 }
-                
+
                 tag = (const multiboot2_tag_t *)
                     ALIGN_UP((uintptr_t) tag + tag->size, MULTIBOOT2_TAG_ALIGN);