summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2014-03-05 16:38:26 -0600
committerAaron Durbin <adurbin@google.com>2014-03-11 19:42:50 +0100
commit01650045f471bbe7ca1ca36868c82a47df8decd3 (patch)
treefdbbac79a3743463a9dd3a8a5432e120394fc004
parentfae75172d1976edb4a7f375d221a2042ec286b0c (diff)
downloadcoreboot-01650045f471bbe7ca1ca36868c82a47df8decd3.tar.xz
cbfstool: add get8/put8 variants to xdr structures
In order to provide consistent usage provide the get8() and put8() callbacks to xdr operations. That way no futzing needs to be done to handle 8-bit reads and writes. Change-Id: I1233d25df67134dc5c3bbd1a84206be77f0da417 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/5365 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--util/cbfstool/common.h2
-rw-r--r--util/cbfstool/xdr.c8
2 files changed, 6 insertions, 4 deletions
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index 5d3b900047..16e75f9cf9 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -100,9 +100,11 @@ void do_lzma_compress(char *in, int in_len, char *out, int *out_len);
void do_lzma_uncompress(char *dst, int dst_len, char *src, int src_len);
/* xdr.c */
struct xdr {
+ uint8_t (*get8)(struct buffer *input);
uint16_t (*get16)(struct buffer *input);
uint32_t (*get32)(struct buffer *input);
uint64_t (*get64)(struct buffer *input);
+ void (*put8)(struct buffer *input, uint8_t val);
void (*put16)(struct buffer *input, uint16_t val);
void (*put32)(struct buffer *input, uint32_t val);
void (*put64)(struct buffer *input, uint64_t val);
diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c
index ddc282ed48..e2cafd14b4 100644
--- a/util/cbfstool/xdr.c
+++ b/util/cbfstool/xdr.c
@@ -139,11 +139,11 @@ static void put64le(struct buffer *input, uint64_t val)
}
struct xdr xdr_be = {
- get16be, get32be, get64be,
- put16be, put32be, put64be
+ get8, get16be, get32be, get64be,
+ put8, put16be, put32be, put64be
};
struct xdr xdr_le = {
- get16le, get32le, get64le,
- put16le, put32le, put64le
+ get8, get16le, get32le, get64le,
+ put8, put16le, put32le, put64le
};