aboot: mdtp : Add generic MTDP image file
This change abstracts MDTP UI target specifics picture parameters from
LK code.
with this change, picture parameters such as width, height, and
offset of the picture inside mdtp.img, comes from mdtp.img
header, rather than hard-coded in LK.
Change-Id: Ife509642014cd4b6033a34d5dc0d3c1c73a89698
diff --git a/app/aboot/mdtp.c b/app/aboot/mdtp.c
index d44efa3..a2d52bf 100644
--- a/app/aboot/mdtp.c
+++ b/app/aboot/mdtp.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -42,6 +42,8 @@
#include <image_verify.h>
#include "scm.h"
#include "mdtp.h"
+#include "mdtp_fs.h"
+
#define DIP_ENCRYPT (0)
#define DIP_DECRYPT (1)
@@ -208,6 +210,12 @@
/* calculating the hash value using HW crypto */
target_crypto_init_params();
+
+ if(strcmp(name, "mdtp") == 0){
+ buf[0] = 0; // removes first byte
+ dprintf(INFO, "mdtp: verify_partition_single_hash: removes 1st byte\n");
+ }
+
hash_find(buf, size, digest, CRYPTO_AUTH_ALG_SHA256);
if (memcmp(digest, hash_table->hash, HASH_LEN))
@@ -383,6 +391,11 @@
return 0;
}
+/* Display the recovery UI in case mdtp image is corrupted */
+static void display_mdtp_fail_recovery_ui(){
+ display_error_msg_mdtp();
+}
+
/* Display the recovery UI to allow the user to enter the PIN and continue boot */
static void display_recovery_ui(mdtp_cfg_t *mdtp_cfg)
{
@@ -554,6 +567,7 @@
{
int i;
int verify_failure = 0;
+ int verify_temp_result = 0;
int ext_partition_verify_failure = 0;
uint32_t total_num_blocks;
@@ -579,6 +593,7 @@
{
for(i=0; i<MAX_PARTITIONS; i++)
{
+ verify_temp_result = 0;
if(dip->partition_cfg[i].lock_enabled && dip->partition_cfg[i].size)
{
total_num_blocks = ((dip->partition_cfg[i].size - 1) / MDTP_FWLOCK_BLOCK_SIZE);
@@ -591,12 +606,18 @@
break;
}
- verify_failure |= (verify_partition(dip->partition_cfg[i].name,
+ verify_temp_result |= (verify_partition(dip->partition_cfg[i].name,
dip->partition_cfg[i].size,
dip->partition_cfg[i].hash_mode,
(dip->partition_cfg[i].verify_ratio * total_num_blocks) / 100,
dip->partition_cfg[i].hash_table,
dip->partition_cfg[i].force_verify_block) != 0);
+
+ if((verify_temp_result) && (strcmp("mdtp",dip->partition_cfg[i].name) == 0)){
+ *verify_result = VERIFY_MDTP_FAILED;
+ }
+
+ verify_failure |= verify_temp_result;
}
}
@@ -680,7 +701,13 @@
else if (verify_result == VERIFY_SKIPPED)
{
dprintf(SPEW, "mdtp: validate_DIP_and_firmware: Verify skipped\n");
- } else /* VERIFY_FAILED */
+ }
+ else if(verify_result == VERIFY_MDTP_FAILED)
+ {
+ dprintf(CRITICAL, "mdtp: validate_DIP_and_firmware: ERROR, corrupted mdtp image\n");
+ display_mdtp_fail_recovery_ui();
+ }
+ else /* VERIFY_FAILED */
{
dprintf(CRITICAL, "mdtp: validate_DIP_and_firmware: ERROR, corrupted firmware\n");
display_recovery_ui(&mdtp_cfg);
@@ -694,6 +721,7 @@
return;
}
+
/********************************************************************************/
/** Entry point of the MDTP Firmware Lock.
@@ -707,6 +735,10 @@
int ret;
bool enabled;
+ if(mdtp_fs_init() != 0){
+ dprintf(CRITICAL, "mdtp: mdtp_img: ERROR, image file could not be loaded\n");
+ display_error_msg_mdtp(); /* This will never return */
+ }
/* sets the default value of this global to be MDTP not activated */
is_mdtp_activated = 0;
diff --git a/app/aboot/mdtp.h b/app/aboot/mdtp.h
index 03e3b7c..88eff44 100644
--- a/app/aboot/mdtp.h
+++ b/app/aboot/mdtp.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -137,6 +137,7 @@
VERIFY_SKIPPED = 0,
VERIFY_OK,
VERIFY_FAILED,
+ VERIFY_MDTP_FAILED,
} verify_result_t;
/**
@@ -185,6 +186,15 @@
void display_error_msg();
/**
+ * display_error_msg_mdtp
+ *
+ * Display error message in case mdtp image corrupted and stop boot process.
+ *
+ * @return - None.
+ */
+void display_error_msg_mdtp();
+
+/**
* mdtp_activated
*
* Indicates whether the MDTP is currently in ACTIVATED state.
diff --git a/app/aboot/mdtp_defs.c b/app/aboot/mdtp_defs.c
index d9eb903..b246e50 100644
--- a/app/aboot/mdtp_defs.c
+++ b/app/aboot/mdtp_defs.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,42 +30,6 @@
#include <compiler.h>
#include "mdtp_defs.h"
-struct mdtp_ui_defs mdtp_ui_defs_default = {
- // Image dimensions
- 1412, // error_msg_width;
- 212, // error_msg_height;
- 1364, // main_text_width;
- 288, // main_text_height;
- 180, // pin_digit_width;
- 180, // pin_digit_height;
- 644, // ok_button_width;
- 158, // ok_button_height;
- 1384, // digits_instructions_width;
- 166, // digits_instructions_height;
- 920, // pin_instructions_width;
- 204, // pin_instructions_height;
-
- // Image offsets
- 0x1000, // error_msg_offset;
- 0xDD000, // initial_delay_offset;
- 0x1FD000, // enter_pin_offset;
- 0x31D000, // invalid_pin_offset;
- 0x43D000, // pin_digit_0_offset;
- 0x18000, // pin_digits_offset;
- 0x52D000, // pin_selected_digit_0_offset;
- 0x61D000, // ok_button_offset;
- 0x668000, // selected_ok_button_offset;
- 0x6B3000, // digits_instructions_offset;
- 0x75C000, // pin_instructions_offset;
-
- //Display settings
- 12 // mdtp_digit_space;
-};
-
-__WEAK struct mdtp_ui_defs mdtp_get_target_ui_defs()
-{
- return mdtp_ui_defs_default;
-}
__WEAK int mdtp_get_target_efuse(struct mdtp_target_efuse* target_efuse)
{
diff --git a/app/aboot/mdtp_defs.h b/app/aboot/mdtp_defs.h
index 9fe05ae..b5551ce 100644
--- a/app/aboot/mdtp_defs.h
+++ b/app/aboot/mdtp_defs.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -29,44 +29,10 @@
#include <stdlib.h>
-struct mdtp_ui_defs {
-
- // Image dimensions
- uint32_t error_msg_width;
- uint32_t error_msg_height;
- uint32_t main_text_width;
- uint32_t main_text_height;
- uint32_t pin_digit_width;
- uint32_t pin_digit_height;
- uint32_t ok_button_width;
- uint32_t ok_button_height;
- uint32_t digits_instructions_width;
- uint32_t digits_instructions_height;
- uint32_t pin_instructions_width;
- uint32_t pin_instructions_height;
-
- // Image offsets
- uint32_t error_msg_offset;
- uint32_t initial_delay_offset;
- uint32_t enter_pin_offset;
- uint32_t invalid_pin_offset;
- uint32_t pin_digit_0_offset;
- uint32_t pin_digits_offset;
- uint32_t pin_selected_digit_0_offset;
- uint32_t ok_button_offset;
- uint32_t selected_ok_button_offset;
- uint32_t digits_instructions_offset;
- uint32_t pin_instructions_offset;
-
- //Display settings
- uint32_t digit_space;
-};
-
struct mdtp_target_efuse {
uint32_t address;
uint32_t start;
};
-struct mdtp_ui_defs mdtp_get_target_ui_defs();
int mdtp_get_target_efuse(struct mdtp_target_efuse* target_efuse);
diff --git a/app/aboot/mdtp_fs.c b/app/aboot/mdtp_fs.c
new file mode 100644
index 0000000..b848c7a
--- /dev/null
+++ b/app/aboot/mdtp_fs.c
@@ -0,0 +1,115 @@
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <debug.h>
+#include <dev/fbcon.h>
+#include <target.h>
+#include <mmc.h>
+#include <partition_parser.h>
+#include <string.h>
+#include "mdtp.h"
+#include "mdtp_fs.h"
+
+/*---------------------------------------------------------
+ * Global Variables
+ *-------------------------------------------------------*/
+static mdtp_image_t mdtp_img;
+
+/*---------------------------------------------------------
+ * External Functions
+ *-------------------------------------------------------*/
+
+uint32_t get_image_offset(mdtp_image_id_t img){
+ return mdtp_img.meta_data.image_params[img].offset;
+}
+
+uint32_t get_image_width(mdtp_image_id_t img){
+ return mdtp_img.meta_data.image_params[img].width;
+}
+
+uint32_t get_image_height(mdtp_image_id_t img){
+ return mdtp_img.meta_data.image_params[img].height;
+}
+
+uint32_t mdtp_fs_get_param(mdtp_parameter_id_t param){
+ return mdtp_img.meta_data.params[param];
+}
+
+
+int mdtp_fs_init(){
+ int index = INVALID_PTN;
+ unsigned long long ptn = 0;
+ int i = 0;
+ uint32_t block_size = mmc_get_device_blocksize();
+
+ index = partition_get_index("mdtp");
+ if (index == 0) {
+ dprintf(CRITICAL, "ERROR: mdtp Partition table not found\n");
+ return 1;
+ }
+
+ ptn = partition_get_offset(index);
+ mmc_set_lun(partition_get_lun(index));
+
+ if (ptn == 0) {
+ dprintf(CRITICAL, "ERROR: mdtp Partition invalid\n");
+ return 1;
+ }
+
+ for(i = 0; i< MAX_PARAMS; i++) {
+ mdtp_img.meta_data.params[i] = -1; //Initiate params for errors check
+ }
+
+ uint8_t *base = memalign(block_size, ROUNDUP(MDTP_HEADER_LEN, block_size));
+ if (!base) {
+ dprintf(CRITICAL, "ERROR: mdtp malloc failed\n");
+ return 1;
+ }
+
+ // read image meta data
+ if (mmc_read(ptn, (void*)base, MDTP_HEADER_LEN)) {
+ dprintf(CRITICAL, "ERROR: mdtp meta data read failed\n");
+ free(base);
+ return 1;
+ }
+
+ uint32_t params_size = MAX_PARAMS * sizeof(uint32_t);
+ uint32_t images_params_size = MAX_IMAGES*sizeof(mdtp_image_params_t);
+ memscpy(mdtp_img.meta_data.params, sizeof(mdtp_img.meta_data.params), base, params_size);
+ memscpy(mdtp_img.meta_data.image_params, META_DATA_PARTITION_LEN,
+ base + sizeof(mdtp_img.meta_data.params), images_params_size);
+
+ dprintf(INFO, "mdtp: mdtp_img loaded\n");
+
+ free(base);
+ return 0;
+}
+
diff --git a/app/aboot/mdtp_fs.h b/app/aboot/mdtp_fs.h
new file mode 100644
index 0000000..33ddf55
--- /dev/null
+++ b/app/aboot/mdtp_fs.h
@@ -0,0 +1,110 @@
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ * * Neither the name of The Linux Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef MDTP_FS_H
+#define MDTP_FS_H
+
+#define MAX_IMAGES (40)
+#define MDTP_HEADER_LEN (4096)
+#define META_DATA_PARTITION_LEN (2048)
+#define MAX_PARAMS (512)
+/*
+MDTP header layout:
+-The mdtp_img header is a fixed length of 4096 Bytes.
+-The mdtp_img header is devided into 2 partitions:
+ 1.MDTP parameters (eFuse, digit-space, etc..)
+ 2.Images meta-data (offset, width, height)
+-Each partition size is 2048 Bytes.
+-Each parameter is 4 Bytes long, 512 params MAX.
+-Each meta-data part (offset/width/height) is 4 Bytes long.
+*/
+
+
+/* Standalone parameters */
+typedef struct mdtp_image_params {
+ uint32_t offset;
+ uint32_t width;
+ uint32_t height;
+} mdtp_image_params_t;
+
+/* Image parameters */
+typedef struct mdtp_meta_data {
+ uint32_t params[MAX_PARAMS];
+ mdtp_image_params_t image_params[MAX_IMAGES];
+} mdtp_meta_data_t;
+
+/*To make sure the header len is exactly MDTP_HEADER */
+typedef union mdtp_image {
+ mdtp_meta_data_t meta_data;
+ uint8_t header[MDTP_HEADER_LEN];
+} mdtp_image_t;
+
+
+typedef enum{ACCEPTEDIT_TEXT = 0, ALERT_MESSAGE = 1, BTN_OK_OFF = 2,
+ BTN_OK_ON = 3, MAINTEXT_5SECONDS = 4, MAINTEXT_ENTERPIN = 5,
+ MAINTEXT_INCORRECTPIN = 6, PINTEXT = 7,
+ PIN_SELECTED_0 = 8, PIN_SELECTED_1 = 9, PIN_SELECTED_2 = 10, PIN_SELECTED_3 = 11,
+ PIN_SELECTED_4 = 12, PIN_SELECTED_5 = 13, PIN_SELECTED_6 = 14,
+ PIN_SELECTED_7 = 15, PIN_SELECTED_8 = 16, PIN_SELECTED_9 = 17,
+ PIN_UNSELECTED_0 = 18, PIN_UNSELECTED_1 = 19, PIN_UNSELECTED_2 = 20,
+ PIN_UNSELECTED_3 = 21, PIN_UNSELECTED_4 = 22, PIN_UNSELECTED_5 = 23,
+ PIN_UNSELECTED_6 = 24, PIN_UNSELECTED_7 = 25,
+ PIN_UNSELECTED_8 = 26, PIN_UNSELECTED_9 = 27} mdtp_image_id_t;
+
+typedef enum {VIRTUAL_FUSE = 0, DIGIT_SPACE = 1} mdtp_parameter_id_t ;
+
+/*---------------------------------------------------------
+ * External Functions
+ *-------------------------------------------------------*/
+
+/**
+ * Returns an image offset
+ */
+uint32_t get_image_offset(mdtp_image_id_t img);
+
+/**
+ * Returns an image width
+ */
+uint32_t get_image_width(mdtp_image_id_t img);
+
+/**
+ * Returns an image height
+ */
+uint32_t get_image_height(mdtp_image_id_t img);
+
+/**
+ * returns a parameter value
+ */
+uint32_t mdtp_fs_get_param(mdtp_parameter_id_t param);
+
+/**
+ * Loads MDTP image meta data from EMMC
+ */
+int mdtp_fs_init();
+
+#endif /* MDTP_FS_H */
diff --git a/app/aboot/mdtp_fuse.c b/app/aboot/mdtp_fuse.c
index 7f67661..439fb73 100644
--- a/app/aboot/mdtp_fuse.c
+++ b/app/aboot/mdtp_fuse.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -28,7 +28,6 @@
#include <debug.h>
#include <target.h>
-#include <mmc.h>
#include <partition_parser.h>
#include <string.h>
#include <stdlib.h>
@@ -36,6 +35,7 @@
#include "mdtp.h"
#include "mdtp_defs.h"
#include "scm.h"
+#include "mdtp_fs.h"
#define MAX_METADATA_SIZE (0x1000)
@@ -105,45 +105,18 @@
/**
* Read the Firmware Lock Metadata from EMMC
- *
* @param metadata - Read a metadata block holding eFuse emulation from MDTP partition.
- *
* @return - negative value for an error, 0 for success.
*/
static int read_metadata(metadata_t *metadata)
{
- unsigned long long ptn = 0;
- uint32_t actual_size;
- int index = INVALID_PTN;
- uint32_t block_size = mmc_get_device_blocksize();
- unsigned char *buf = (unsigned char *)target_get_scratch_address() + MDTP_SCRATCH_OFFSET;
-
- index = partition_get_index("mdtp");
- ptn = partition_get_offset(index);
-
- if(ptn == 0)
- {
+ int eFuse = mdtp_fs_get_param(VIRTUAL_FUSE);
+ if(eFuse == -1){ //Error initiating eFuse
+ dprintf(CRITICAL, "mdtp: eFuse reading error\n");
return -1;
}
-
- actual_size = ROUNDUP(sizeof(metadata_t), block_size);
-
- if (actual_size > MAX_METADATA_SIZE)
- {
- dprintf(CRITICAL, "mdtp: read_metadata: ERROR, meta data size %d too big\n", actual_size);
- return -1;
- }
-
- if(mmc_read(ptn, (void *)buf, actual_size))
- {
- dprintf(CRITICAL, "mdtp: read_metadata: ERROR, cannot read mdtp info\n");
- return -1;
- }
-
- memscpy((uint8_t*)metadata, sizeof(metadata_t), (uint8_t*)(buf), MAX_METADATA_SIZE);
-
- dprintf(INFO, "mdtp: read_metadata: SUCCESS, read %d bytes\n", actual_size);
-
+ metadata->eFuses.mask = (uint8_t)eFuse;
+ dprintf(INFO, "mdtp: read_metadata: SUCCESS \n");
return 0;
}
diff --git a/app/aboot/mdtp_ui.c b/app/aboot/mdtp_ui.c
index 924c4fe..f03b818 100644
--- a/app/aboot/mdtp_ui.c
+++ b/app/aboot/mdtp_ui.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -35,6 +35,8 @@
#include <string.h>
#include "mdtp.h"
#include "mdtp_defs.h"
+#include "mdtp_fs.h"
+#include <display_menu.h>
// Image releative locations
#define ERROR_MESSAGE_RELATIVE_Y_LOCATION (0.18)
@@ -75,7 +77,6 @@
static struct mdtp_fbimage *g_mdtp_header = NULL;
static struct fbcon_config *fb_config = NULL;
-struct mdtp_ui_defs mdtp_ui_defs_data;
/*----------------------------------------------------------------------------
* Local Functions
@@ -257,10 +258,9 @@
if (fb_config)
{
- uint32_t x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.error_msg_width,fb_config->width);
+ uint32_t x = CENTER_IMAGE_ON_X_AXIS(get_image_width(ALERT_MESSAGE),fb_config->width);
uint32_t y = ((fb_config->height)*ERROR_MESSAGE_RELATIVE_Y_LOCATION);
-
- fbimg = mdtp_read_mmc_image(mdtp_ui_defs_data.error_msg_offset, mdtp_ui_defs_data.error_msg_width, mdtp_ui_defs_data.error_msg_height);
+ fbimg = mdtp_read_mmc_image(get_image_offset(ALERT_MESSAGE),get_image_width(ALERT_MESSAGE), get_image_height(ALERT_MESSAGE));
if (NULL == fbimg)
{
dprintf(CRITICAL,"ERROR: failed to read error image from mmc\n");
@@ -309,10 +309,9 @@
*/
static void display_initial_delay()
{
- uint32_t x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.main_text_width,fb_config->width);
+ uint32_t x = CENTER_IMAGE_ON_X_AXIS(get_image_width(MAINTEXT_5SECONDS),fb_config->width);
uint32_t y = (fb_config->height)*MAIN_TEXT_RELATIVE_Y_LOCATION;
-
- display_image(mdtp_ui_defs_data.initial_delay_offset, mdtp_ui_defs_data.main_text_width, mdtp_ui_defs_data.main_text_height, x, y);
+ display_image(get_image_offset(MAINTEXT_5SECONDS), get_image_width(MAINTEXT_5SECONDS), get_image_height(MAINTEXT_5SECONDS), x, y);
}
/**
@@ -320,10 +319,9 @@
*/
static void display_enter_pin()
{
- uint32_t x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.main_text_width,fb_config->width);
+ uint32_t x = CENTER_IMAGE_ON_X_AXIS(get_image_width(MAINTEXT_ENTERPIN),fb_config->width);
uint32_t y = (fb_config->height)*MAIN_TEXT_RELATIVE_Y_LOCATION;
-
- display_image(mdtp_ui_defs_data.enter_pin_offset, mdtp_ui_defs_data.main_text_width, mdtp_ui_defs_data.main_text_height, x, y);
+ display_image(get_image_offset(MAINTEXT_ENTERPIN), get_image_width(MAINTEXT_ENTERPIN), get_image_height(MAINTEXT_ENTERPIN), x, y);
}
/**
@@ -331,10 +329,10 @@
*/
static void display_invalid_pin()
{
- uint32_t x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.main_text_width,fb_config->width);
+ uint32_t x = CENTER_IMAGE_ON_X_AXIS(get_image_width(MAINTEXT_INCORRECTPIN),fb_config->width);
uint32_t y = (fb_config->height)*MAIN_TEXT_RELATIVE_Y_LOCATION;
- display_image(mdtp_ui_defs_data.invalid_pin_offset, mdtp_ui_defs_data.main_text_width, mdtp_ui_defs_data.main_text_height, x, y);
+ display_image(get_image_offset(MAINTEXT_INCORRECTPIN), get_image_width(MAINTEXT_INCORRECTPIN), get_image_height(MAINTEXT_INCORRECTPIN), x, y);
}
/**
@@ -342,10 +340,10 @@
*/
static void display_digits_instructions()
{
- uint32_t x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.digits_instructions_width,fb_config->width);
+ uint32_t x = CENTER_IMAGE_ON_X_AXIS(get_image_width(PINTEXT),fb_config->width);
uint32_t y = (fb_config->height)*PIN_TEXT_RELATIVE_Y_LOCATION;
- display_image(mdtp_ui_defs_data.digits_instructions_offset, mdtp_ui_defs_data.digits_instructions_width, mdtp_ui_defs_data.digits_instructions_height, x, y);
+ display_image(get_image_offset(PINTEXT), get_image_width(PINTEXT), get_image_height(PINTEXT), x, y);
}
/**
@@ -354,8 +352,7 @@
static void clear_digits_instructions()
{
uint32_t y = (fb_config->height)*PIN_TEXT_RELATIVE_Y_LOCATION;
-
- fbcon_clear_section(y, mdtp_ui_defs_data.digits_instructions_height);
+ fbcon_clear_section(y, get_image_height(PINTEXT));
}
/**
@@ -363,8 +360,8 @@
*/
static void display_digit(uint32_t x, uint32_t y, uint32_t digit)
{
- display_image(mdtp_ui_defs_data.pin_digit_0_offset + digit*mdtp_ui_defs_data.pin_digits_offset,
- mdtp_ui_defs_data.pin_digit_width, mdtp_ui_defs_data.pin_digit_height, x, y);
+ display_image(get_image_offset(PIN_UNSELECTED_0 + digit),
+ get_image_width(PIN_UNSELECTED_0 + digit), get_image_height(PIN_UNSELECTED_0 + digit), x, y);
}
/**
@@ -372,8 +369,9 @@
*/
static void display_selected_digit(uint32_t x, uint32_t y, uint32_t digit)
{
- display_image(mdtp_ui_defs_data.pin_selected_digit_0_offset + digit*mdtp_ui_defs_data.pin_digits_offset,
- mdtp_ui_defs_data.pin_digit_width, mdtp_ui_defs_data.pin_digit_height, x, y);
+ display_image(get_image_offset(PIN_SELECTED_0 + digit),
+ get_image_width(PIN_SELECTED_0 + digit),
+ get_image_height(PIN_SELECTED_0 + digit), x, y);
}
/**
@@ -381,10 +379,10 @@
*/
static void display_ok_button()
{
- uint32_t ok_x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.ok_button_width,fb_config->width);
+ uint32_t ok_x = CENTER_IMAGE_ON_X_AXIS(get_image_width(BTN_OK_OFF),fb_config->width);
uint32_t ok_y = (fb_config->height)*OK_BUTTON_RELATIVE_Y_LOCATION;
- display_image(mdtp_ui_defs_data.ok_button_offset, mdtp_ui_defs_data.ok_button_width, mdtp_ui_defs_data.ok_button_height, ok_x, ok_y);
+ display_image(get_image_offset(BTN_OK_OFF), get_image_width(BTN_OK_OFF),get_image_height(BTN_OK_OFF), ok_x, ok_y);
}
/**
@@ -392,21 +390,22 @@
*/
static void display_selected_ok_button()
{
- uint32_t ok_x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.ok_button_width,fb_config->width);
+ uint32_t ok_x = CENTER_IMAGE_ON_X_AXIS(get_image_width(BTN_OK_ON),fb_config->width);
uint32_t ok_y = (fb_config->height)*OK_BUTTON_RELATIVE_Y_LOCATION;
- display_image(mdtp_ui_defs_data.selected_ok_button_offset, mdtp_ui_defs_data.ok_button_width, mdtp_ui_defs_data.ok_button_height, ok_x, ok_y);
+ display_image(get_image_offset(BTN_OK_ON), get_image_width(BTN_OK_ON), get_image_height(BTN_OK_ON), ok_x, ok_y);
}
+
/**
* Display the instructions for the OK button.
*/
static void display_pin_instructions()
{
- uint32_t x = CENTER_IMAGE_ON_X_AXIS(mdtp_ui_defs_data.pin_instructions_width,fb_config->width);
+ uint32_t x = CENTER_IMAGE_ON_X_AXIS(get_image_width(ACCEPTEDIT_TEXT),fb_config->width);
uint32_t y = (fb_config->height)*OK_TEXT_RELATIVE_Y_LOCATION;
- display_image(mdtp_ui_defs_data.pin_instructions_offset, mdtp_ui_defs_data.pin_instructions_width, mdtp_ui_defs_data.pin_instructions_height, x, y);
+ display_image(get_image_offset(ACCEPTEDIT_TEXT), get_image_width(ACCEPTEDIT_TEXT), get_image_height(ACCEPTEDIT_TEXT), x, y);
}
/**
@@ -416,7 +415,7 @@
{
uint32_t y = (fb_config->height)*OK_TEXT_RELATIVE_Y_LOCATION;
- fbcon_clear_section(y, mdtp_ui_defs_data.pin_instructions_height);
+ fbcon_clear_section(y,get_image_height(ACCEPTEDIT_TEXT));
}
/**
@@ -426,7 +425,6 @@
{
fb_config = fbcon_display();
alloc_mdtp_image();
- mdtp_ui_defs_data = mdtp_get_target_ui_defs();
}
/**
@@ -451,12 +449,12 @@
g_pin_frames_y_location = ((fb_config->height)*PIN_RELATIVE_Y_LOCATION);
- uint32_t total_pin_length = pin_length*mdtp_ui_defs_data.pin_digit_width + mdtp_ui_defs_data.digit_space*(pin_length - 1);
+ uint32_t total_pin_length = pin_length*get_image_width(PIN_UNSELECTED_0) + mdtp_fs_get_param(DIGIT_SPACE)*(pin_length - 1);
uint32_t complete_pin_centered = (fb_config->width - total_pin_length)/2;
for (uint32_t i=0; i<pin_length; i++)
{
- g_pin_frames_x_location[i] = complete_pin_centered + i*(mdtp_ui_defs_data.digit_space+mdtp_ui_defs_data.pin_digit_width);
+ g_pin_frames_x_location[i] = complete_pin_centered + i*(mdtp_fs_get_param(DIGIT_SPACE) + get_image_width(PIN_UNSELECTED_0));
}
for (uint32_t i=0; i<pin_length; i++)
@@ -603,3 +601,28 @@
for(;;);
}
+/**
+ * Display error message in case mdtp image is corrupted and stop boot process.
+ */
+void display_error_msg_mdtp()
+{
+ int big_factor = 8; // Font size
+ char* str = "Device unable to boot";
+ char* str2 = "\nError - mdtp image is corrupted\n";
+ fbcon_clear();
+ while(*str != 0) {
+ fbcon_putc_factor(*str++, FBCON_COMMON_MSG, big_factor);
+ }
+ fbcon_draw_line(FBCON_COMMON_MSG);
+ while(*str2 != 0) {
+ fbcon_putc_factor(*str2++, FBCON_COMMON_MSG, big_factor);
+ }
+ fbcon_draw_line(FBCON_COMMON_MSG);
+
+ // Invalid state. Nothing to be done but contacting the OEM.
+ // Stop boot process.
+ dprintf(CRITICAL,"ERROR: blocking boot process - mdtp image corrupted\n");
+ for(;;);
+
+}
+
diff --git a/app/aboot/rules.mk b/app/aboot/rules.mk
index 09a5152..68e1c9b 100644
--- a/app/aboot/rules.mk
+++ b/app/aboot/rules.mk
@@ -21,5 +21,6 @@
$(LOCAL_DIR)/mdtp.o \
$(LOCAL_DIR)/mdtp_ui.o \
$(LOCAL_DIR)/mdtp_fuse.o \
- $(LOCAL_DIR)/mdtp_defs.o
+ $(LOCAL_DIR)/mdtp_defs.o \
+ $(LOCAL_DIR)/mdtp_fs.o
endif