aboutsummaryrefslogtreecommitdiffstats
path: root/com32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2009-04-20 15:56:30 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2009-04-20 15:56:30 -0700
commit31937531087fb47aa4a3a218e8114b32176f8683 (patch)
tree45717a07f96c3053df052e084c06db151f1def84 /com32
parentf0e7d4b1ffdd5f636632ac4dd88671410f6dd575 (diff)
downloadsyslinux-31937531087fb47aa4a3a218e8114b32176f8683.tar.gz
syslinux-31937531087fb47aa4a3a218e8114b32176f8683.tar.xz
syslinux-31937531087fb47aa4a3a218e8114b32176f8683.zip
Global whitespace cleanup.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'com32')
-rw-r--r--com32/gdbstub/gdbstub.c4
-rw-r--r--com32/gdbstub/serial.c4
-rw-r--r--com32/gplinclude/cpuid.h2
-rw-r--r--com32/gpllib/dmi/dmi_base_board.c1
-rw-r--r--com32/gpllib/dmi/dmi_battery.c1
-rw-r--r--com32/gpllib/dmi/dmi_bios.c1
-rw-r--r--com32/gpllib/dmi/dmi_ipmi.c1
-rw-r--r--com32/gpllib/dmi/dmi_memory.c1
-rw-r--r--com32/gpllib/dmi/dmi_processor.c1
-rw-r--r--com32/hdt/hdt-cli-vesa.c1
-rw-r--r--com32/hdt/hdt-common.c1
-rw-r--r--com32/include/com32.h6
-rw-r--r--com32/include/sys/cpu.h4
-rw-r--r--com32/include/sys/pci.h12
-rw-r--r--com32/include/syslinux/keyboard.h1
-rw-r--r--com32/lib/malloc.h1
-rw-r--r--com32/lib/memcpy.S2
-rw-r--r--com32/lib/memmove.S2
-rw-r--r--com32/lib/mempcpy.S2
-rw-r--r--com32/lib/memset.S2
-rw-r--r--com32/lib/setjmp.S2
-rw-r--r--com32/lib/sys/ansicon_write.c2
-rw-r--r--com32/menu/drain.c4
-rw-r--r--com32/menu/execute.c3
-rw-r--r--com32/rosh/rosh.c28
25 files changed, 38 insertions, 51 deletions
diff --git a/com32/gdbstub/gdbstub.c b/com32/gdbstub/gdbstub.c
index 3e9ff5e8..f235a349 100644
--- a/com32/gdbstub/gdbstub.c
+++ b/com32/gdbstub/gdbstub.c
@@ -152,12 +152,12 @@ static void gdbmach_commit_hwbp ( struct hwbp *bp ) {
/* Set/clear local enable bit */
dr7 &= ~( 0x3 << 2 * regnum );
- dr7 |= bp->enabled << 2 * regnum;
+ dr7 |= bp->enabled << 2 * regnum;
}
int gdbmach_set_breakpoint ( int type, unsigned long addr, size_t len, int enable ) {
struct hwbp *bp;
-
+
/* Check and convert breakpoint type to x86 type */
switch ( type ) {
case GDBMACH_WATCH:
diff --git a/com32/gdbstub/serial.c b/com32/gdbstub/serial.c
index 1c4d4b6f..2b9fc2ef 100644
--- a/com32/gdbstub/serial.c
+++ b/com32/gdbstub/serial.c
@@ -91,7 +91,7 @@ void serial_putc ( int ch ) {
int status;
for (;;) {
status = uart_readb(UART_BASE + UART_LSR);
- if (status & UART_LSR_THRE) {
+ if (status & UART_LSR_THRE) {
/* TX buffer emtpy */
uart_writeb(ch, UART_BASE + UART_TBR);
break;
@@ -165,7 +165,7 @@ void serial_init ( void ) {
goto out;
}
uart_writeb(lcs, UART_BASE + UART_LCR);
-
+
/* disable interrupts */
uart_writeb(0x0, UART_BASE + UART_IER);
diff --git a/com32/gplinclude/cpuid.h b/com32/gplinclude/cpuid.h
index 2473b41e..ca1c3142 100644
--- a/com32/gplinclude/cpuid.h
+++ b/com32/gplinclude/cpuid.h
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------- *
- *
+ *
* Copyright 2006-2009 Erwan Velu - All Rights Reserved
*
* Portions of this file taken from the Linux kernel,
diff --git a/com32/gpllib/dmi/dmi_base_board.c b/com32/gpllib/dmi/dmi_base_board.c
index f37feec9..2f19fda4 100644
--- a/com32/gpllib/dmi/dmi_base_board.c
+++ b/com32/gpllib/dmi/dmi_base_board.c
@@ -35,4 +35,3 @@ const char *base_board_features_strings[]={
"Board is replaceable",
"Board is hot swappable" /* 4 */
};
-
diff --git a/com32/gpllib/dmi/dmi_battery.c b/com32/gpllib/dmi/dmi_battery.c
index 567254a8..02b5e6df 100644
--- a/com32/gpllib/dmi/dmi_battery.c
+++ b/com32/gpllib/dmi/dmi_battery.c
@@ -70,4 +70,3 @@ void dmi_battery_maximum_error(uint8_t code, char *error)
else
sprintf(error,"%u%%", code);
}
-
diff --git a/com32/gpllib/dmi/dmi_bios.c b/com32/gpllib/dmi/dmi_bios.c
index 9458d492..1fea7524 100644
--- a/com32/gpllib/dmi/dmi_bios.c
+++ b/com32/gpllib/dmi/dmi_bios.c
@@ -77,4 +77,3 @@ const char *bios_charac_x2_strings[]={
"Function key-initiated network boot is supported",
"Targeted content distribution is supported" /* 2 */
};
-
diff --git a/com32/gpllib/dmi/dmi_ipmi.c b/com32/gpllib/dmi/dmi_ipmi.c
index 8ea5f798..8081375c 100644
--- a/com32/gpllib/dmi/dmi_ipmi.c
+++ b/com32/gpllib/dmi/dmi_ipmi.c
@@ -56,4 +56,3 @@ void dmi_ipmi_base_address(uint8_t type, const uint8_t *p, s_ipmi *ipmi)
ipmi->base_address = QWORD(p);
}
}
-
diff --git a/com32/gpllib/dmi/dmi_memory.c b/com32/gpllib/dmi/dmi_memory.c
index dc354df1..9067009a 100644
--- a/com32/gpllib/dmi/dmi_memory.c
+++ b/com32/gpllib/dmi/dmi_memory.c
@@ -169,4 +169,3 @@ void dmi_memory_device_speed(uint16_t code, char *speed)
else
sprintf(speed,"%u MHz", code);
}
-
diff --git a/com32/gpllib/dmi/dmi_processor.c b/com32/gpllib/dmi/dmi_processor.c
index f86f0095..321f6e65 100644
--- a/com32/gpllib/dmi/dmi_processor.c
+++ b/com32/gpllib/dmi/dmi_processor.c
@@ -430,4 +430,3 @@ const char *cpu_flags_strings[PROCESSOR_FLAGS_ELEMENTS]={
"IA64 (IA64 capabilities)", /* 30 */
"PBE (Pending break enabled)" /* 31 */
};
-
diff --git a/com32/hdt/hdt-cli-vesa.c b/com32/hdt/hdt-cli-vesa.c
index 202b75f1..40cb3eef 100644
--- a/com32/hdt/hdt-cli-vesa.c
+++ b/com32/hdt/hdt-cli-vesa.c
@@ -91,4 +91,3 @@ void handle_vesa_commands(char *cli_line, struct s_hardware *hardware) {
return;
}
}
-
diff --git a/com32/hdt/hdt-common.c b/com32/hdt/hdt-common.c
index 6c2e1e4c..19a80e41 100644
--- a/com32/hdt/hdt-common.c
+++ b/com32/hdt/hdt-common.c
@@ -439,4 +439,3 @@ char *skipspace(char *p)
return p;
}
-
diff --git a/com32/include/com32.h b/com32/include/com32.h
index 44cd5732..da2edfb1 100644
--- a/com32/include/com32.h
+++ b/com32/include/com32.h
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------- *
- *
+ *
* Copyright 2002-2009 H. Peter Anvin - All Rights Reserved
* Copyright 2009 Intel Corporation; author: H. Peter Anvin
*
@@ -11,10 +11,10 @@
* sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following
* conditions:
- *
+ *
* The above copyright notice and this permission notice shall
* be included in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
diff --git a/com32/include/sys/cpu.h b/com32/include/sys/cpu.h
index dcc4abfa..fcae2da1 100644
--- a/com32/include/sys/cpu.h
+++ b/com32/include/sys/cpu.h
@@ -65,7 +65,7 @@ static inline __constfunc uint32_t cpuid_edx(uint32_t level)
static inline __constfunc bool cpu_has_eflag(uint32_t flag)
{
uint32_t f1, f2;
-
+
asm("pushfl\n\t"
"pushfl\n\t"
"popl %0\n\t"
@@ -78,7 +78,7 @@ static inline __constfunc bool cpu_has_eflag(uint32_t flag)
"popfl\n\t"
: "=&r" (f1), "=&r" (f2)
: "ir" (flag));
-
+
return ((f1^f2) & flag) != 0;
}
diff --git a/com32/include/sys/pci.h b/com32/include/sys/pci.h
index b44db62f..b6556ff0 100644
--- a/com32/include/sys/pci.h
+++ b/com32/include/sys/pci.h
@@ -4,13 +4,13 @@
#include <inttypes.h>
#include <sys/io.h>
-#define MAX_PCI_FUNC 8
-#define MAX_PCI_DEVICES 32
-#define MAX_PCI_BUSES 256
+#define MAX_PCI_FUNC 8
+#define MAX_PCI_DEVICES 32
+#define MAX_PCI_BUSES 256
#define LINUX_KERNEL_MODULE_SIZE 64
-#define PCI_VENDOR_NAME_SIZE 256
-#define PCI_PRODUCT_NAME_SIZE 256
-#define PCI_CLASS_NAME_SIZE 256
+#define PCI_VENDOR_NAME_SIZE 256
+#define PCI_PRODUCT_NAME_SIZE 256
+#define PCI_CLASS_NAME_SIZE 256
#define MAX_KERNEL_MODULES_PER_PCI_DEVICE 10
#define MAX_PCI_CLASSES 256
diff --git a/com32/include/syslinux/keyboard.h b/com32/include/syslinux/keyboard.h
index 8f21ad07..290cff32 100644
--- a/com32/include/syslinux/keyboard.h
+++ b/com32/include/syslinux/keyboard.h
@@ -50,4 +50,3 @@ syslinux_keyboard_map(void)
}
#endif /* _SYSLINUX_KEYBOARD_H */
-
diff --git a/com32/lib/malloc.h b/com32/lib/malloc.h
index 983a3c52..e70b8c9b 100644
--- a/com32/lib/malloc.h
+++ b/com32/lib/malloc.h
@@ -53,4 +53,3 @@ struct free_arena_header {
extern struct free_arena_header __malloc_head;
void __inject_free_block(struct free_arena_header *ah);
-
diff --git a/com32/lib/memcpy.S b/com32/lib/memcpy.S
index 5f2c4ec7..6b986a0d 100644
--- a/com32/lib/memcpy.S
+++ b/com32/lib/memcpy.S
@@ -80,7 +80,7 @@ memcpy:
popl %eax /* Return value */
popl %edi
popl %esi
-1:
+1:
ret
.size memcpy, .-memcpy
diff --git a/com32/lib/memmove.S b/com32/lib/memmove.S
index 90bbf3be..2fcb4b57 100644
--- a/com32/lib/memmove.S
+++ b/com32/lib/memmove.S
@@ -41,7 +41,7 @@ memmove:
pushl %esi
pushl %edi
pushl %eax /* Return value */
-
+
movl %eax,%edi
movl %edx,%esi
diff --git a/com32/lib/mempcpy.S b/com32/lib/mempcpy.S
index f6961f66..cad7b983 100644
--- a/com32/lib/mempcpy.S
+++ b/com32/lib/mempcpy.S
@@ -79,7 +79,7 @@ mempcpy:
movl %edi,%eax /* Return value */
popl %edi
popl %esi
-1:
+1:
ret
.size mempcpy, .-mempcpy
diff --git a/com32/lib/memset.S b/com32/lib/memset.S
index 4b2583c3..e641415d 100644
--- a/com32/lib/memset.S
+++ b/com32/lib/memset.S
@@ -47,7 +47,7 @@ memset:
movzwl %dx,%eax
shll $16,%edx
orl %edx,%eax
-
+
/* Initial alignment */
movl %edi,%edx
shrl $1,%edx
diff --git a/com32/lib/setjmp.S b/com32/lib/setjmp.S
index a368b78e..658df485 100644
--- a/com32/lib/setjmp.S
+++ b/com32/lib/setjmp.S
@@ -7,7 +7,7 @@
*
* The jmp_buf is assumed to contain the following, in order:
* %ebx
- * %esp
+ * %esp
* %ebp
* %esi
* %edi
diff --git a/com32/lib/sys/ansicon_write.c b/com32/lib/sys/ansicon_write.c
index 7bdc8cbd..3322ab24 100644
--- a/com32/lib/sys/ansicon_write.c
+++ b/com32/lib/sys/ansicon_write.c
@@ -242,7 +242,7 @@ ssize_t __ansicon_write(struct file_info *fp, const void *buf, size_t count)
void __ansicon_beep(void)
{
static com32sys_t ireg;
-
+
ireg.eax.w[0] = 0x0e07;
ireg.ebx.b[1] = BIOS_PAGE;
__intcall(0x10, &ireg, NULL);
diff --git a/com32/menu/drain.c b/com32/menu/drain.c
index 428d9709..ace04518 100644
--- a/com32/menu/drain.c
+++ b/com32/menu/drain.c
@@ -9,7 +9,7 @@ void drain_keyboard(void)
/* Prevent "ghost typing" and keyboard buffer snooping */
volatile char junk;
int rv;
-
+
do {
rv = read(0, (char *)&junk, 1);
} while (rv > 0);
@@ -23,5 +23,3 @@ void drain_keyboard(void)
memset((void *)0x41e, 0, 32); /* Clear the actual keyboard buffer */
sti();
}
-
-
diff --git a/com32/menu/execute.c b/com32/menu/execute.c
index ace0e571..d84958c5 100644
--- a/com32/menu/execute.c
+++ b/com32/menu/execute.c
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------- *
- *
+ *
* Copyright 2004-2008 H. Peter Anvin - All Rights Reserved
*
* This program is free software; you can redistribute it and/or modify
@@ -67,4 +67,3 @@ void execute(const char *cmdline, enum kernel_type type)
/* If this returns, something went bad; return to menu */
}
-
diff --git a/com32/rosh/rosh.c b/com32/rosh/rosh.c
index 5eaa47df..659df8a0 100644
--- a/com32/rosh/rosh.c
+++ b/com32/rosh/rosh.c
@@ -216,16 +216,16 @@ void rosh_print_tc(struct termios *tio)
*/
void rosh_console_raw()
{
-// struct termios itio, ntio;
-// tcgetattr(0, &itio);
-// rosh_print_tc(&itio);
+// struct termios itio, ntio;
+// tcgetattr(0, &itio);
+// rosh_print_tc(&itio);
/* ntio = itio;
ntio.c_lflag &= ~(ICANON|ECHO);
tcsetattr(0, TCSAFLUSH, &ntio);*/
console_ansi_raw(); /* Allows get_key to get just 1 key sequence
(w/o delay or display */
-// tcgetattr(0, &ntio);
-// rosh_print_tc(&ntio);
+// tcgetattr(0, &ntio);
+// rosh_print_tc(&ntio);
}
/*
@@ -233,9 +233,9 @@ void rosh_console_raw()
*/
void rosh_console_std()
{
-// struct termios itio, ntio;
+// struct termios itio, ntio;
console_ansi_std();
-// tcsetattr(0, TCSANOW, &itio);
+// tcsetattr(0, TCSANOW, &itio);
}
/*
@@ -247,11 +247,11 @@ int rosh_getkey()
int inc;
inc = KEY_NONE;
-// rosh_console_raw();
+// rosh_console_raw();
while (inc == KEY_NONE){
inc = get_key(stdin, 6000);
}
-// rosh_console_std();
+// rosh_console_std();
return inc;
} /* rosh_getkey */
@@ -361,7 +361,7 @@ void rosh_dir_arg(const char *ifilstr, const char *pwdstr)
char filestr2[ROSH_PATH_SZ + 1];
int fd2, file2pos;
#ifdef __COM32__
-// int inchar;
+// int inchar;
char ty;
#endif /* __COM32__ */
#endif /* DO_DEBUG */
@@ -431,7 +431,7 @@ printf("DIR:'%s' %8d %8d\n", d->dd_name, d->dd_fd, d->dd_sect);
}
printf("@%8d:%8d:%4d ", (int)de->d_ino, (int)de->d_size, de->d_mode);
#endif /* DO_DEBUG */
-// printf("%s\n", de->d_name);
+// printf("%s\n", de->d_name);
printf("'%s'\n", de->d_name);
#ifdef DO_DEBUG
// inchar = fgetc(stdin);
@@ -539,7 +539,7 @@ printf("--(%d/%d @%d)\n", bufcnt, buflen, bufpos);
bufpos = buflen; break;
case ' ':
numln = rows - 1;
-// default:
+// default:
}
}
/*tcgetattr(0, &tio);
@@ -758,7 +758,7 @@ int rosh_prompt(const char *icmdstr)
int rv;
char cmdstr[ROSH_CMD_SZ];
char pwdstr[ROSH_PATH_SZ + 1], ipwdstr[ROSH_PATH_SZ + 1];
-/* int numchar;
+/* int numchar;
*/ char do_exit;
char *c;
@@ -796,7 +796,7 @@ int main(int argc, char *argv[])
/* Initialization */
rv = 0;
console_ansi_std();
-// console_ansi_raw();
+// console_ansi_raw();
if (argc != 1) {
rv = rosh_argcat(cmdstr, argc, argv, 1);
} else {