From 4e0e3fcfdb4f769121678d9bcc28ed3f77b5a36c Mon Sep 17 00:00:00 2001 From: that Date: Mon, 13 Apr 2015 19:52:49 +0200 Subject: bootloader: align with AOSP code - Define a minimal Volume structure so that AOSP code for handling /misc works in TWRP without major changes. - Remove set/get_bootloader_message_*_name Change-Id: Ifcee59568141a184adebb94b8ef8beca072a7942 --- twrp-functions.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'twrp-functions.cpp') diff --git a/twrp-functions.cpp b/twrp-functions.cpp index b6f9c56fc..3bc879929 100644 --- a/twrp-functions.cpp +++ b/twrp-functions.cpp @@ -487,15 +487,8 @@ void TWFunc::Update_Log_File(void) { if (Part != NULL) { struct bootloader_message boot; memset(&boot, 0, sizeof(boot)); - if (Part->Current_File_System == "mtd") { - if (set_bootloader_message_mtd_name(&boot, Part->MTD_Name.c_str()) != 0) - LOGERR("Unable to set MTD bootloader message.\n"); - } else if (Part->Current_File_System == "emmc") { - if (set_bootloader_message_block_name(&boot, Part->Actual_Block_Device.c_str()) != 0) - LOGERR("Unable to set emmc bootloader message.\n"); - } else { - LOGERR("Unknown file system for /misc: '%s'\n", Part->Current_File_System.c_str()); - } + if (set_bootloader_message(&boot) != 0) + LOGERR("Unable to set bootloader message.\n"); } if (PartitionManager.Mount_By_Path("/cache", true)) { -- cgit v1.2.3