summaryrefslogtreecommitdiff
path: root/firmware/stub
diff options
context:
space:
mode:
authorGabe Black <gabeblack@chromium.org>2013-03-16 04:03:40 -0700
committerChromeBot <chrome-bot@google.com>2013-03-19 16:55:44 -0700
commitac8805e7e9bd40c03baf44e37b26f28d9b763ab5 (patch)
tree9297d954f0fc50bb9de01fb9672ddaea076e2f01 /firmware/stub
parent77f55ca1cd282ac6c540ea3a8bacbc35c2600d60 (diff)
downloadvboot-ac8805e7e9bd40c03baf44e37b26f28d9b763ab5.tar.gz
Get rid of some crufty macros.
These were macros that were never used, or that were only set to one thing and could be substituted up front. I left in code guarded by the HAVE_ENDIAN_H and HAVE_LITTLE_ENDIAN macros even though those are never defined because they guard a reportedly significantly faster implementation of some functionality, at least according to a comment in the source. It would be a good idea to enable that code path and see if it really does make a big difference before removing it entirely. BUG=None TEST=Built for Link, Daisy, and the host with FEATURES=test. Built depthcharge for Link and booted in normal mode. BRANCH=None Change-Id: I934a4dd0da169ac018ba07350d56924ab88b1acc Signed-off-by: Gabe Black <gabeblack@google.com> Reviewed-on: https://gerrit.chromium.org/gerrit/45687 Reviewed-by: Randall Spangler <rspangler@chromium.org> Commit-Queue: Gabe Black <gabeblack@chromium.org> Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'firmware/stub')
-rw-r--r--firmware/stub/tpm_lite_stub.c8
-rw-r--r--firmware/stub/vboot_api_stub.c3
-rw-r--r--firmware/stub/vboot_api_stub_disk.c3
-rw-r--r--firmware/stub/vboot_api_stub_init.c3
-rw-r--r--firmware/stub/vboot_api_stub_sf.c3
5 files changed, 5 insertions, 15 deletions
diff --git a/firmware/stub/tpm_lite_stub.c b/firmware/stub/tpm_lite_stub.c
index 60065e64..6818f2b1 100644
--- a/firmware/stub/tpm_lite_stub.c
+++ b/firmware/stub/tpm_lite_stub.c
@@ -57,7 +57,7 @@ static VbError_t DoError(VbError_t result, const char* format, ...) {
/* Print |n| bytes from array |a|, with newlines.
*/
-POSSIBLY_UNUSED static void PrintBytes(const uint8_t* a, int n) {
+__attribute__((unused)) static void PrintBytes(const uint8_t* a, int n) {
int i;
for (i = 0; i < n; i++) {
VBDEBUG(("%02x ", a[i]));
@@ -112,7 +112,8 @@ static VbError_t TpmExecute(const uint8_t *in, const uint32_t in_len,
/* Gets the tag field of a TPM command.
*/
-POSSIBLY_UNUSED static INLINE int TpmTag(const uint8_t* buffer) {
+__attribute__((unused))
+static inline int TpmTag(const uint8_t* buffer) {
uint16_t tag;
FromTpmUint16(buffer, &tag);
return (int) tag;
@@ -121,7 +122,8 @@ POSSIBLY_UNUSED static INLINE int TpmTag(const uint8_t* buffer) {
/* Gets the size field of a TPM command.
*/
-POSSIBLY_UNUSED static INLINE int TpmResponseSize(const uint8_t* buffer) {
+__attribute__((unused))
+static inline int TpmResponseSize(const uint8_t* buffer) {
uint32_t size;
FromTpmUint32(buffer + sizeof(uint16_t), &size);
return (int) size;
diff --git a/firmware/stub/vboot_api_stub.c b/firmware/stub/vboot_api_stub.c
index 1829764f..fd531ac7 100644
--- a/firmware/stub/vboot_api_stub.c
+++ b/firmware/stub/vboot_api_stub.c
@@ -15,9 +15,6 @@
#include "vboot_api.h"
-/* disable MSVC warnings on unused arguments */
-__pragma(warning (disable: 4100))
-
void VbExSleepMs(uint32_t msec)
{
}
diff --git a/firmware/stub/vboot_api_stub_disk.c b/firmware/stub/vboot_api_stub_disk.c
index 463b2f98..aca38afa 100644
--- a/firmware/stub/vboot_api_stub_disk.c
+++ b/firmware/stub/vboot_api_stub_disk.c
@@ -15,9 +15,6 @@
#include "vboot_api.h"
-/* disable MSVC warnings on unused arguments */
-__pragma(warning (disable: 4100))
-
VbError_t VbExDiskGetInfo(VbDiskInfo** infos_ptr, uint32_t* count,
uint32_t disk_flags) {
diff --git a/firmware/stub/vboot_api_stub_init.c b/firmware/stub/vboot_api_stub_init.c
index 76a29175..76052da1 100644
--- a/firmware/stub/vboot_api_stub_init.c
+++ b/firmware/stub/vboot_api_stub_init.c
@@ -15,9 +15,6 @@
#include "vboot_api.h"
-/* disable MSVC warnings on unused arguments */
-__pragma(warning (disable: 4100))
-
/* U-Boot's printf uses '%L' for uint64_t. gcc uses '%l'. */
#define MAX_FMT 255
static char fmtbuf[MAX_FMT+1];
diff --git a/firmware/stub/vboot_api_stub_sf.c b/firmware/stub/vboot_api_stub_sf.c
index 41a16467..96eeb85c 100644
--- a/firmware/stub/vboot_api_stub_sf.c
+++ b/firmware/stub/vboot_api_stub_sf.c
@@ -15,9 +15,6 @@
#include "vboot_api.h"
-/* disable MSVC warnings on unused arguments */
-__pragma(warning (disable: 4100))
-
void *VbExMalloc(size_t size)
{
void *p = malloc(size);