From f35d1cef7c19db975a1295e8c23c7fb8bd2489f9 Mon Sep 17 00:00:00 2001 From: Ken Sumrall Date: Wed, 13 Feb 2013 12:59:35 -0800 Subject: Move to using the new unified fstab in recovery. Instead of reading it's own fstab, have recovery invoke fs_mgr to read the unified fstab. Change-Id: I80c75d2c53b809ac60a4a69f0ef7ebfa707c39e9 --- common.h | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'common.h') diff --git a/common.h b/common.h index a1168cdbb..3587a31f2 100644 --- a/common.h +++ b/common.h @@ -39,24 +39,7 @@ extern "C" { #define STRINGIFY(x) #x #define EXPAND(x) STRINGIFY(x) -typedef struct { - const char* mount_point; // eg. "/cache". must live in the root directory. - - const char* fs_type; // "yaffs2" or "ext4" or "vfat" - - const char* device; // MTD partition name if fs_type == "yaffs" - // block device if fs_type == "ext4" or "vfat" - - const char* device2; // alternative device to try if fs_type - // == "ext4" or "vfat" and mounting - // 'device' fails - - long long length; // (ext4 partition only) when - // formatting, size to use for the - // partition. 0 or negative number - // means to format all but the last - // (that much). -} Volume; +typedef struct fstab_rec Volume; // fopen a file, mounting volumes and making parent dirs as necessary. FILE* fopen_path(const char *path, const char *mode); -- cgit v1.2.3 From 7c3ae45ef9306d2ff4b491e0488c8849bf15ce90 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 14 May 2013 11:03:02 -0700 Subject: recovery: turn on text display for install errors in debug builds Hopefully this will reduce the number of OTA "bugs" reported that are really just someone having changed their system partition, invalidating future incremental OTAs. Also fixes a longstanding TODO about putting LOGE() output in the on-screen display. Change-Id: I44e5be65b2dee7ebce2cce28ccd920dc3d6e522e --- common.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'common.h') diff --git a/common.h b/common.h index 3587a31f2..768f499f9 100644 --- a/common.h +++ b/common.h @@ -18,13 +18,13 @@ #define RECOVERY_COMMON_H #include +#include #ifdef __cplusplus extern "C" { #endif -// TODO: restore ui_print for LOGE -#define LOGE(...) fprintf(stdout, "E:" __VA_ARGS__) +#define LOGE(...) ui_print("E:" __VA_ARGS__) #define LOGW(...) fprintf(stdout, "W:" __VA_ARGS__) #define LOGI(...) fprintf(stdout, "I:" __VA_ARGS__) @@ -44,6 +44,8 @@ typedef struct fstab_rec Volume; // fopen a file, mounting volumes and making parent dirs as necessary. FILE* fopen_path(const char *path, const char *mode); +void ui_print(const char* format, ...); + #ifdef __cplusplus } #endif -- cgit v1.2.3