diff options
author | Alex Deymo <deymo@google.com> | 2017-04-05 01:26:33 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-05 01:26:33 +0200 |
commit | c2e3f0e02eeb19238fc0eee55d07a7b4831852c5 (patch) | |
tree | 6e08a6684e5006fc58b22edcfd8e8acc8c42eaac /bootloader_message | |
parent | Merge "Change the internal representation in RangeSet." am: 7ffa8be41d am: 2e12242b7a (diff) | |
parent | Merge "Boot control HAL based on the A/B headers." am: b5fca37976 (diff) | |
download | android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.tar android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.tar.gz android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.tar.bz2 android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.tar.lz android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.tar.xz android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.tar.zst android_bootable_recovery-c2e3f0e02eeb19238fc0eee55d07a7b4831852c5.zip |
Diffstat (limited to '')
-rw-r--r-- | bootloader_message/bootloader_message.cpp | 7 | ||||
-rw-r--r-- | bootloader_message/include/bootloader_message/bootloader_message.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/bootloader_message/bootloader_message.cpp b/bootloader_message/bootloader_message.cpp index d8086be28..f91446b43 100644 --- a/bootloader_message/bootloader_message.cpp +++ b/bootloader_message/bootloader_message.cpp @@ -117,6 +117,13 @@ static bool write_misc_partition(const void* p, size_t size, const std::string& return true; } +std::string get_bootloader_message_blk_device(std::string* err) { + std::string misc_blk_device = get_misc_blk_device(err); + if (misc_blk_device.empty()) return ""; + if (!wait_for_device(misc_blk_device, err)) return ""; + return misc_blk_device; +} + bool read_bootloader_message_from(bootloader_message* boot, const std::string& misc_blk_device, std::string* err) { return read_misc_partition(boot, sizeof(*boot), misc_blk_device, diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index bc5104ddf..2ffbfc9e3 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -180,6 +180,11 @@ static_assert(sizeof(struct bootloader_control) == #include <string> #include <vector> +// Return the block device name for the bootloader message partition and waits +// for the device for up to 10 seconds. In case of error returns the empty +// string. +std::string get_bootloader_message_blk_device(std::string* err); + // Read bootloader message into boot. Error message will be set in err. bool read_bootloader_message(bootloader_message* boot, std::string* err); |