From 4f6eb6e936a80432270c3e11c43fe0894aed87e9 Mon Sep 17 00:00:00 2001 From: Pali Rohár Date: Sat, 24 Nov 2012 15:42:34 +0100 Subject: local: Read from CAL also overwritten hw revision --- src/local.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/local.c b/src/local.c index 35b5411..4ca7f96 100644 --- a/src/local.c +++ b/src/local.c @@ -71,13 +71,25 @@ static void local_cal_parse(void) { local_cal_store(cal, "content-ver", content_ver); local_cal_store(cal, "r&d_mode", rd_mode); + /* overwritten hw revision */ memset(buf, 0, sizeof(buf)); - local_cal_store(cal, "phone-info", buf); - buf[4] = 0; + local_cal_store(cal, "hw-ver", buf); - if ( sscanf(buf, "%hd", &hwrev) != 1 ) + if ( buf[0] && sscanf(buf, "%hd", &hwrev) != 1 ) hwrev = -1; + if ( hwrev == -1 ) { + + /* original hw revision */ + memset(buf, 0, sizeof(buf)); + local_cal_store(cal, "phone-info", buf); + buf[4] = 0; + + if ( buf[0] && sscanf(buf, "%hd", &hwrev) != 1 ) + hwrev = -1; + + } + buf[0] = 0; local_cal_store(cal, "usb_host_mode", buf); usb_host_mode = buf[0]; -- cgit v1.2.3