summaryrefslogtreecommitdiff
path: root/util/nvramtool
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-27 06:56:47 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-27 06:56:47 +0000
commit14e22779625de673569c7b950ecc2753fb915b31 (patch)
tree14a6ed759e116e9e6e9bbd7f499b74b96d6cc072 /util/nvramtool
parent0e1e8065e303030c39c3f2c27e5d32ee58a16c66 (diff)
downloadcoreboot-14e22779625de673569c7b950ecc2753fb915b31.tar.xz
Since some people disapprove of white space cleanups mixed in regular commits
while others dislike them being extra commits, let's clean them up once and for all for the existing code. If it's ugly, let it only be ugly once :-) Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5507 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/nvramtool')
-rw-r--r--util/nvramtool/Makefile2
-rw-r--r--util/nvramtool/cmos_lowlevel.c4
-rw-r--r--util/nvramtool/cmos_ops.c2
-rw-r--r--util/nvramtool/common.c2
-rw-r--r--util/nvramtool/coreboot_tables.h12
-rw-r--r--util/nvramtool/hexdump.c2
-rw-r--r--util/nvramtool/ip_checksum.h2
-rw-r--r--util/nvramtool/nvramtool.82
8 files changed, 14 insertions, 14 deletions
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 752e106da8..010c859b4f 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -1,6 +1,6 @@
#
# Makefile for nvram utility
-#
+#
# (C) 2005-2008 coresystems GmbH
# written by Stefan Reinauer <stepan@coresystems.de>
#
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 67d561b267..ecfc99b74f 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -75,7 +75,7 @@ static inline unsigned char get_bits(unsigned long long value, unsigned bit,
static inline void put_bits(unsigned char value, unsigned bit,
unsigned nr_bits, unsigned long long *result)
{
- *result += ((unsigned long long)(value &
+ *result += ((unsigned long long)(value &
((unsigned char)((1 << nr_bits) - 1)))) << bit;
}
@@ -161,7 +161,7 @@ void cmos_write(const cmos_entry_t * e, unsigned long long value)
} else {
for (next_bit = 0, bits_left = length;
bits_left; next_bit += nr_bits, bits_left -= nr_bits) {
- nr_bits = cmos_bit_op_strategy(bit + next_bit,
+ nr_bits = cmos_bit_op_strategy(bit + next_bit,
bits_left, &where);
cmos_write_bits(&where, nr_bits,
get_bits(value, next_bit, nr_bits));
diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c
index 73d68e0a23..86ffe1022b 100644
--- a/util/nvramtool/cmos_ops.c
+++ b/util/nvramtool/cmos_ops.c
@@ -122,7 +122,7 @@ int prepare_cmos_write(const cmos_entry_t * e, const char value_str[],
break;
case CMOS_ENTRY_HEX:
- /* See if the first character of 'value_str' (excluding
+ /* See if the first character of 'value_str' (excluding
* any initial whitespace) is a minus sign.
*/
for (p = value_str; isspace(*p); p++) ;
diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c
index c80c2da6df..45338ec4de 100644
--- a/util/nvramtool/common.c
+++ b/util/nvramtool/common.c
@@ -48,7 +48,7 @@ int get_line_from_file(FILE * f, char line[], int line_buf_size)
return LINE_EOF;
/* If the file contains a line that is too long, then it's best
- * to let the user know right away rather than passing back a
+ * to let the user know right away rather than passing back a
* truncated result that will lead to problems later on.
*/
return (strlen(line) == ((size_t) (line_buf_size - 1))) ?
diff --git a/util/nvramtool/coreboot_tables.h b/util/nvramtool/coreboot_tables.h
index d6e1b76942..08f0be63fa 100644
--- a/util/nvramtool/coreboot_tables.h
+++ b/util/nvramtool/coreboot_tables.h
@@ -17,7 +17,7 @@
* is expected to be information that cannot be discovered by
* other means, such as quering the hardware directly.
*
- * All of the information should be Position Independent Data.
+ * All of the information should be Position Independent Data.
* That is it should be safe to relocated any of the information
* without it's meaning/correctnes changing. For table that
* can reasonably be used on multiple architectures the data
@@ -40,9 +40,9 @@
* table entries and be backwards compatible, but it is not required.
*/
-/* Since coreboot is usually compiled 32bit, gcc will align 64bit
- * types to 32bit boundaries. If the coreboot table is dumped on a
- * 64bit system, a uint64_t would be aligned to 64bit boundaries,
+/* Since coreboot is usually compiled 32bit, gcc will align 64bit
+ * types to 32bit boundaries. If the coreboot table is dumped on a
+ * 64bit system, a uint64_t would be aligned to 64bit boundaries,
* breaking the table format.
*
* lb_uint64 will keep 64bit coreboot table values aligned to 32bit
@@ -177,7 +177,7 @@ struct cmos_entries {
uint32_t config; /* e=enumeration, h=hex, r=reserved */
uint32_t config_id; /* a number linking to an enumeration record */
#define CMOS_MAX_NAME_LENGTH 32
- uint8_t name[CMOS_MAX_NAME_LENGTH]; /* name of entry in ascii,
+ uint8_t name[CMOS_MAX_NAME_LENGTH]; /* name of entry in ascii,
variable length int aligned */
};
@@ -192,7 +192,7 @@ struct cmos_enums {
uint32_t config_id; /* a number identifying the config id */
uint32_t value; /* the value associated with the text */
#define CMOS_MAX_TEXT_LENGTH 32
- uint8_t text[CMOS_MAX_TEXT_LENGTH]; /* enum description in ascii,
+ uint8_t text[CMOS_MAX_TEXT_LENGTH]; /* enum description in ascii,
variable length int aligned */
};
diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c
index 78199eb0ce..405703fe73 100644
--- a/util/nvramtool/hexdump.c
+++ b/util/nvramtool/hexdump.c
@@ -88,7 +88,7 @@ void hexdump(const void *mem, int bytes, uint64_t addrprint_start,
* terminates, the number of remaining bytes to display (if any)
* will not be enough to fill an entire line.
*/
- for (bytes_left = bytes;
+ for (bytes_left = bytes;
bytes_left >= format->bytes_per_line;
bytes_left -= format->bytes_per_line) {
/* print start address for current line */
diff --git a/util/nvramtool/ip_checksum.h b/util/nvramtool/ip_checksum.h
index ebd52ceb2c..f2a13070a3 100644
--- a/util/nvramtool/ip_checksum.h
+++ b/util/nvramtool/ip_checksum.h
@@ -7,7 +7,7 @@
/* Note: The contents of this file were borrowed from the coreboot source
* code which may be obtained from http://www.coreboot.org.
- * Specifically, this code was obtained from coreboot (LinuxBIOS)
+ * Specifically, this code was obtained from coreboot (LinuxBIOS)
* version 1.0.0.8.
*/
diff --git a/util/nvramtool/nvramtool.8 b/util/nvramtool/nvramtool.8
index e12070bf39..9159a2a6dd 100644
--- a/util/nvramtool/nvramtool.8
+++ b/util/nvramtool/nvramtool.8
@@ -114,7 +114,7 @@ input.
If
.B "VALUE"
is present then set the CMOS checksum for the coreboot parameters to
-.B "VALUE."
+.B "VALUE."
Otherwise, show the checksum value.
.TP
.B "-l [ARG]"