summaryrefslogtreecommitdiff
path: root/host/include
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2011-06-24 16:11:45 -0700
committerRandall Spangler <rspangler@chromium.org>2011-06-27 09:24:28 -0700
commit7adcc60e6f5f6db081b9ad6e02288335502a0d77 (patch)
treeef170014731bf8ffc95db5fb3cc2283e517c6733 /host/include
parentc76136cd0de548a2b8a2fc9c8efd2466d0922319 (diff)
downloadvboot-7adcc60e6f5f6db081b9ad6e02288335502a0d77.tar.gz
Vboot wrapper API - crossystem and header files
Header file changes for wrapper API implementation Crossystem support for reading recovery reason from VbSharedData, and explicit support for version 1 VbSharedData structs. BUG=chromium-os:16970 TEST=make && make runtests; run crossystem on Alex and make sure it still reports recovery_reason in recovery mode. Change-Id: I15195b899583e425d3c9e8df09842d764528e2cb Reviewed-on: http://gerrit.chromium.org/gerrit/3203 Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org> Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'host/include')
-rw-r--r--host/include/crossystem_arch.h4
-rw-r--r--host/include/host_common.h5
2 files changed, 7 insertions, 2 deletions
diff --git a/host/include/crossystem_arch.h b/host/include/crossystem_arch.h
index 6d33c65b..fbef9b19 100644
--- a/host/include/crossystem_arch.h
+++ b/host/include/crossystem_arch.h
@@ -58,8 +58,8 @@ int VbWriteNvStorage(VbNvContext* vnc);
* some data was not returned; callers must handle this; this is not considered
* an error.
*
- * Returns the data buffer, which must be freed by the caller, or NULL if
- * error. */
+ * Returns the data buffer, which must be freed by the caller using
+ * free(), or NULL if error. */
VbSharedDataHeader* VbSharedDataRead(void);
/* Read an architecture-specific system property integer.
diff --git a/host/include/host_common.h b/host/include/host_common.h
index d8a2b092..007c9d91 100644
--- a/host/include/host_common.h
+++ b/host/include/host_common.h
@@ -8,12 +8,17 @@
#ifndef VBOOT_REFERENCE_HOST_COMMON_H_
#define VBOOT_REFERENCE_HOST_COMMON_H_
+/* Host is allowed direct use of stdlib funcs such as malloc() and free(),
+ * since it's using the stub implementation from firmware/lib/stub. */
+#define _STUB_IMPLEMENTATION_
+
#include "cryptolib.h"
#include "host_key.h"
#include "host_keyblock.h"
#include "host_misc.h"
#include "host_signature.h"
#include "utility.h"
+#include "vboot_api.h"
#include "vboot_struct.h"