<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20730">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/device: Fix checkpatch warning: no spaces at the start of a line<br><br>This excludes some files in the device/oprom/x86emu folder which<br>are mostly spaces, and which I felt should be handled separately.<br>debug.c, decode.c, fpu.c, ops.c, ops2.c, & prim_ops.c<br><br>Change-Id: I5c12d3fc942c9ad99bbe6e6e54db93e5a8402392<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/device/device_util.c<br>M src/device/oprom/include/x86emu/fpu_regs.h<br>M src/device/oprom/include/x86emu/regs.h<br>M src/device/oprom/include/x86emu/x86emu.h<br>M src/device/oprom/x86emu/sys.c<br>M src/device/oprom/yabel/compat/functions.c<br>M src/device/oprom/yabel/compat/of.h<br>M src/device/oprom/yabel/compat/rtas.h<br>M src/device/oprom/yabel/io.c<br>M src/device/pci_rom.c<br>10 files changed, 89 insertions(+), 89 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/30/20730/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/device/device_util.c b/src/device/device_util.c<br>index 859de31..762f0e7 100644<br>--- a/src/device/device_util.c<br>+++ b/src/device/device_util.c<br>@@ -812,11 +812,11 @@<br> indent[i] = ' ';<br> indent[i] = '\0';<br> <br>- do_printk(BIOS_DEBUG, "%s%s", indent, dev_path(root));<br>- if (root->link_list && root->link_list->children)<br>- do_printk(BIOS_DEBUG, " child on link 0 %s",<br>- dev_path(root->link_list->children));<br>- do_printk(BIOS_DEBUG, "\n");<br>+ do_printk(BIOS_DEBUG, "%s%s", indent, dev_path(root));<br>+ if (root->link_list && root->link_list->children)<br>+ do_printk(BIOS_DEBUG, " child on link 0 %s",<br>+ dev_path(root->link_list->children));<br>+ do_printk(BIOS_DEBUG, "\n");<br> <br> for (res = root->resource_list; res; res = res->next) {<br> do_printk(debug_level, "%s%s resource base %llx size %llx "<br>diff --git a/src/device/oprom/include/x86emu/fpu_regs.h b/src/device/oprom/include/x86emu/fpu_regs.h<br>index f49fb1d..a9b4893 100644<br>--- a/src/device/oprom/include/x86emu/fpu_regs.h<br>+++ b/src/device/oprom/include/x86emu/fpu_regs.h<br>@@ -46,11 +46,11 @@<br> /* Basic 8087 register can hold any of the following values: */<br> <br> union x86_fpu_reg_u {<br>- s8 tenbytes[10];<br>- double dval;<br>- float fval;<br>- s16 sval;<br>- s32 lval;<br>+ s8 tenbytes[10];<br>+ double dval;<br>+ float fval;<br>+ s16 sval;<br>+ s32 lval;<br> };<br> <br> struct x86_fpu_reg {<br>@@ -81,10 +81,10 @@<br> #define X86_FPU_STKTOP 0<br> <br> struct x86_fpu_registers {<br>- struct x86_fpu_reg x86_fpu_stack[8];<br>- int x86_fpu_flags;<br>- int x86_fpu_config; /* rounding modes, etc. */<br>- short x86_fpu_tos, x86_fpu_bos;<br>+ struct x86_fpu_reg x86_fpu_stack[8];<br>+ int x86_fpu_flags;<br>+ int x86_fpu_config; /* rounding modes, etc. */<br>+ short x86_fpu_tos, x86_fpu_bos;<br> };<br> <br> #pragma pack()<br>diff --git a/src/device/oprom/include/x86emu/regs.h b/src/device/oprom/include/x86emu/regs.h<br>index b5fb9e2..8eec112 100644<br>--- a/src/device/oprom/include/x86emu/regs.h<br>+++ b/src/device/oprom/include/x86emu/regs.h<br>@@ -61,7 +61,7 @@<br> #ifdef __BIG_ENDIAN__<br> <br> typedef struct {<br>- u32 e_reg;<br>+ u32 e_reg;<br> } I32_reg_t;<br> <br> typedef struct {<br>@@ -75,7 +75,7 @@<br> #else /* !__BIG_ENDIAN__ */<br> <br> typedef struct {<br>- u32 e_reg;<br>+ u32 e_reg;<br> } I32_reg_t;<br> <br> typedef struct {<br>@@ -111,7 +111,7 @@<br> */<br> <br> struct i386_segment_regs {<br>- u16 CS, DS, SS, ES, FS, GS;<br>+ u16 CS, DS, SS, ES, FS, GS;<br> };<br> <br> /* 8 bit registers */<br>@@ -260,35 +260,35 @@<br> #define INTR_HALTED 0x4<br> <br> typedef struct {<br>- struct i386_general_regs gen;<br>- struct i386_special_regs spc;<br>- struct i386_segment_regs seg;<br>- /*<br>- * MODE contains information on:<br>- * REPE prefix 2 bits repe,repne<br>- * SEGMENT overrides 5 bits normal,DS,SS,CS,ES<br>- * Delayed flag set 3 bits (zero, signed, parity)<br>- * reserved 6 bits<br>- * interrupt # 8 bits instruction raised interrupt<br>- * BIOS video segregs 4 bits<br>- * Interrupt Pending 1 bits<br>- * Extern interrupt 1 bits<br>- * Halted 1 bits<br>- */<br>- u32 mode;<br>- volatile int intr; /* mask of pending interrupts */<br>- volatile int debug;<br>+ struct i386_general_regs gen;<br>+ struct i386_special_regs spc;<br>+ struct i386_segment_regs seg;<br>+ /*<br>+ * MODE contains information on:<br>+ * REPE prefix 2 bits repe,repne<br>+ * SEGMENT overrides 5 bits normal,DS,SS,CS,ES<br>+ * Delayed flag set 3 bits (zero, signed, parity)<br>+ * reserved 6 bits<br>+ * interrupt # 8 bits instruction raised interrupt<br>+ * BIOS video segregs 4 bits<br>+ * Interrupt Pending 1 bits<br>+ * Extern interrupt 1 bits<br>+ * Halted 1 bits<br>+ */<br>+ u32 mode;<br>+ volatile int intr; /* mask of pending interrupts */<br>+ volatile int debug;<br> #if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br>- int check;<br>- u16 saved_ip;<br>- u16 saved_cs;<br>- int enc_pos;<br>- int enc_str_pos;<br>- char decode_buf[32]; /* encoded byte stream */<br>- char decoded_buf[256]; /* disassembled strings */<br>+ int check;<br>+ u16 saved_ip;<br>+ u16 saved_cs;<br>+ int enc_pos;<br>+ int enc_str_pos;<br>+ char decode_buf[32]; /* encoded byte stream */<br>+ char decoded_buf[256]; /* disassembled strings */<br> #endif<br>- u8 intno;<br>- u8 __pad[3];<br>+ u8 intno;<br>+ u8 __pad[3];<br> } X86EMU_regs;<br> <br> /****************************************************************************<br>diff --git a/src/device/oprom/include/x86emu/x86emu.h b/src/device/oprom/include/x86emu/x86emu.h<br>index 3d1b949..a5d436a 100644<br>--- a/src/device/oprom/include/x86emu/x86emu.h<br>+++ b/src/device/oprom/include/x86emu/x86emu.h<br>@@ -155,7 +155,7 @@<br> <br> #if IS_ENABLED(CONFIG_X86EMU_DEBUG)<br> #define HALT_SYS() \<br>- printf("halt_sys: in %s\n", __func__); \<br>+ printf("halt_sys: in %s\n", __func__); \<br> X86EMU_halt_sys();<br> #else<br> #define HALT_SYS() X86EMU_halt_sys()<br>diff --git a/src/device/oprom/x86emu/sys.c b/src/device/oprom/x86emu/sys.c<br>index afb7efb..9c293bc 100644<br>--- a/src/device/oprom/x86emu/sys.c<br>+++ b/src/device/oprom/x86emu/sys.c<br>@@ -138,7 +138,7 @@<br> u8 *ptr;<br> <br> ptr = mem_ptr(addr, 4);<br>- val = *(u32 *) (ptr);<br>+ val = *(u32 *) (ptr);<br> <br> DB(if (DEBUG_MEM_TRACE())<br> printf("%#08x 4 -> %#x\n", addr, val);)<br>diff --git a/src/device/oprom/yabel/compat/functions.c b/src/device/oprom/yabel/compat/functions.c<br>index 5a51f18..1cebdf0 100644<br>--- a/src/device/oprom/yabel/compat/functions.c<br>+++ b/src/device/oprom/yabel/compat/functions.c<br>@@ -72,15 +72,15 @@<br> <br> u64 get_time(void)<br> {<br>- u64 act = 0;<br>+ u64 act = 0;<br> #if IS_ENABLED(CONFIG_ARCH_X86)<br>- u32 eax, edx;<br>+ u32 eax, edx;<br> <br>- __asm__ __volatile__(<br>- "rdtsc"<br>- : "=a"(eax), "=d"(edx)<br>- : /* no inputs, no clobber */);<br>- act = ((u64) edx << 32) | eax;<br>+ __asm__ __volatile__(<br>+ "rdtsc"<br>+ : "=a"(eax), "=d"(edx)<br>+ : /* no inputs, no clobber */);<br>+ act = ((u64) edx << 32) | eax;<br> #endif<br>- return act;<br>+ return act;<br> }<br>diff --git a/src/device/oprom/yabel/compat/of.h b/src/device/oprom/yabel/compat/of.h<br>index ac13af2..31c9b59 100644<br>--- a/src/device/oprom/yabel/compat/of.h<br>+++ b/src/device/oprom/yabel/compat/of.h<br>@@ -42,10 +42,10 @@<br> <br> typedef struct<br> {<br>- unsigned int serv;<br>- int nargs;<br>- int nrets;<br>- unsigned int args[16];<br>+ unsigned int serv;<br>+ int nargs;<br>+ int nrets;<br>+ unsigned int args[16];<br> } of_arg_t;<br> <br> <br>diff --git a/src/device/oprom/yabel/compat/rtas.h b/src/device/oprom/yabel/compat/rtas.h<br>index f701cc6..ccad9e9 100644<br>--- a/src/device/oprom/yabel/compat/rtas.h<br>+++ b/src/device/oprom/yabel/compat/rtas.h<br>@@ -38,13 +38,13 @@<br> #include "of.h"<br> <br> typedef struct dtime {<br>- unsigned int year;<br>- unsigned int month;<br>- unsigned int day;<br>- unsigned int hour;<br>- unsigned int minute;<br>- unsigned int second;<br>- unsigned int nano;<br>+ unsigned int year;<br>+ unsigned int month;<br>+ unsigned int day;<br>+ unsigned int hour;<br>+ unsigned int minute;<br>+ unsigned int second;<br>+ unsigned int nano;<br> } dtime;<br> <br> typedef void (*thread_t) (int);<br>diff --git a/src/device/oprom/yabel/io.c b/src/device/oprom/yabel/io.c<br>index d673801..b50a2f1 100644<br>--- a/src/device/oprom/yabel/io.c<br>+++ b/src/device/oprom/yabel/io.c<br>@@ -101,47 +101,47 @@<br> static unsigned int<br> read_io(void *addr, size_t sz)<br> {<br>- unsigned int ret;<br>+ unsigned int ret;<br> /* since we are using inb instructions, we need the port number as 16bit value */<br> u16 port = (u16)(u32) addr;<br> <br>- switch (sz) {<br>- case 1:<br>+ switch (sz) {<br>+ case 1:<br> ret = inb(port);<br>- break;<br>- case 2:<br>+ break;<br>+ case 2:<br> ret = inw(port);<br>- break;<br>- case 4:<br>+ break;<br>+ case 4:<br> ret = inl(port);<br>- break;<br>- default:<br>- ret = 0;<br>- }<br>+ break;<br>+ default:<br>+ ret = 0;<br>+ }<br> <br>- return ret;<br>+ return ret;<br> }<br> <br> static int<br> write_io(void *addr, unsigned int value, size_t sz)<br> {<br> u16 port = (u16)(u32) addr;<br>- switch (sz) {<br>+ switch (sz) {<br> /* since we are using inb instructions, we need the port number as 16bit value */<br>- case 1:<br>+ case 1:<br> outb(value, port);<br>- break;<br>- case 2:<br>+ break;<br>+ case 2:<br> outw(value, port);<br>- break;<br>- case 4:<br>+ break;<br>+ case 4:<br> outl(value, port);<br>- break;<br>- default:<br>- return -1;<br>- }<br>+ break;<br>+ default:<br>+ return -1;<br>+ }<br> <br>- return 0;<br>+ return 0;<br> }<br> <br> u32 pci_cfg_read(X86EMU_pioAddr addr, u8 size);<br>diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c<br>index 6456d17..a411f06 100644<br>--- a/src/device/pci_rom.c<br>+++ b/src/device/pci_rom.c<br>@@ -148,7 +148,7 @@<br> * whether the ROM image is for a VGA device because some<br> * devices have a mismatch between the hardware and the ROM.<br> */<br>- if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {<br>+ if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {<br> #if !IS_ENABLED(CONFIG_MULTIPLE_VGA_ADAPTERS)<br> extern device_t vga_pri; /* Primary VGA device (device.c). */<br> if (dev != vga_pri) return NULL; /* Only one VGA supported. */<br></pre><p>To view, visit <a href="https://review.coreboot.org/20730">change 20730</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20730"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I5c12d3fc942c9ad99bbe6e6e54db93e5a8402392 </div>
<div style="display:none"> Gerrit-Change-Number: 20730 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>