target: msm8226: Use panel name conversion API from GCDB
Remove duplicate implementation of panel name to id conversion
API from MSM8226 target. Use generic API supported from
GCDB.
Change-Id: I2712d1b1376b7cf2eb41236e0832566520979229
diff --git a/target/msm8226/oem_panel.c b/target/msm8226/oem_panel.c
index b1e0f90..258f77c 100755
--- a/target/msm8226/oem_panel.c
+++ b/target/msm8226/oem_panel.c
@@ -79,11 +79,6 @@
HW_PLATFORM_SUBTYPE_SKUG = 5,
};
-struct panel_list {
- char name[MAX_PANEL_ID_LEN];
- uint32_t id;
-};
-
/*
* The list of panels that are supported on this target.
* Any panel in this list can be selected using fastboot oem command.
@@ -101,39 +96,6 @@
static uint32_t panel_id;
-static uint32_t panel_name_to_id(const char *panel_name)
-{
- uint32_t i;
- uint32_t panel_id = UNKNOWN_PANEL;
-
- /* Remove any leading whitespaces */
- panel_name += strspn(panel_name, " ");
- for (i = 0; i < ARRAY_SIZE(supp_panels); i++) {
- if (!strncmp(panel_name, supp_panels[i].name,
- MAX_PANEL_ID_LEN)) {
- panel_id = supp_panels[i].id;
- break;
- }
- }
-
- return panel_id;
-}
-
-static const char *panel_id_to_name(uint32_t panel_id)
-{
- uint32_t i;
- char *panel_name = "???";
-
- for (i = 0; i < ARRAY_SIZE(supp_panels); i++) {
- if (supp_panels[i].id == panel_id) {
- panel_name = supp_panels[i].name;
- break;
- }
- }
-
- return panel_name;
-}
-
int oem_panel_rotation()
{
int ret = NO_ERROR;
@@ -369,21 +331,23 @@
uint32_t nt35590_panel_id = NT35590_720P_VIDEO_PANEL;
uint32_t hw_subtype = board_hardware_subtype();
bool ret = true;
- uint32_t panel_override_id = UNKNOWN_PANEL;
+ int32_t panel_override_id;
if (panel_name) {
- panel_override_id = panel_name_to_id(panel_name);
- dprintf(INFO, "%s: OEM panel override=%s\n", __func__,
- panel_id_to_name(panel_override_id));
- }
+ panel_override_id = panel_name_to_id(supp_panels,
+ ARRAY_SIZE(supp_panels), panel_name);
- if (panel_override_id != UNKNOWN_PANEL) {
- /* panel override using fastboot oem command */
- panel_id = panel_override_id;
- goto panel_init;
- } else {
- dprintf(INFO, "%s: Invalid panel override. Initializing default panel\n",
- __func__);
+ if (panel_override_id < 0) {
+ dprintf(CRITICAL, "Not able to search the panel:%s\n",
+ panel_name + strspn(panel_name, " "));
+ } else if (panel_override_id < UNKNOWN_PANEL) {
+ /* panel override using fastboot oem command */
+ panel_id = panel_override_id;
+
+ dprintf(INFO, "OEM panel override:%s\n",
+ panel_name + strspn(panel_name, " "));
+ goto panel_init;
+ }
}
switch (hw_id) {