Fix model name of RPI3

As model name in dtb of RPI3 has been changed, there is a issue that
peripheral-bus failed to recognize the RPI3 board. This patch removes
"Rev 1.2" from lookup string for RPI3 to solve the issue.

Change-Id: If7e2c9b5f83a6bf29c743d19ae7eae3095761934
Signed-off-by: Hyeongsik Min <hyeongsik.min@samsung.com>

diff --git a/data/pio_board_rp3_b_12.ini b/data/pio_board_rp3_b.ini
similarity index 100%
rename from data/pio_board_rp3_b_12.ini
rename to data/pio_board_rp3_b.ini

diff --git a/src/daemon/include/peripheral_bus_board.h b/src/daemon/include/peripheral_bus_board.h
index 85ae2b4..fc517cd 100644 (file)
--- a/src/daemon/include/peripheral_bus_board.h
+++ b/src/daemon/include/peripheral_bus_board.h
@@ -24,7 +24,7 @@
 typedef enum {
        PB_BOARD_ARTIK710 = 0,
        PB_BOARD_ARTIK530,
-       PB_BOARD_RP3_B_12,
+       PB_BOARD_RP3_B,
        PB_BOARD_UNKOWN,
 } pb_board_type_e;
 

diff --git a/src/daemon/peripheral_bus_board.c b/src/daemon/peripheral_bus_board.c
index 6520204..291ac2e 100644 (file)
--- a/src/daemon/peripheral_bus_board.c
+++ b/src/daemon/peripheral_bus_board.c
@@ -29,13 +29,13 @@
 #define STR_BUF_MAX                    255
 
 #define BOARD_INI_ARTIK710_PATH        SYSCONFDIR"/peripheral-bus/pio_board_artik710.ini"
-#define BOARD_INI_RP3_B_12_PATH        SYSCONFDIR"/peripheral-bus/pio_board_rp3_b_12.ini"
+#define BOARD_INI_RP3_B_PATH   SYSCONFDIR"/peripheral-bus/pio_board_rp3_b.ini"
 #define BOARD_INI_UNKNOWN_PATH SYSCONFDIR"/peripheral-bus/pio_board_unknown.ini"
 
 static const pb_board_type_s pb_board_type[] = {
        {PB_BOARD_ARTIK710, "artik710 raptor", BOARD_INI_ARTIK710_PATH},
        {PB_BOARD_ARTIK530, "artik530 raptor", BOARD_INI_ARTIK710_PATH},
-       {PB_BOARD_RP3_B_12, "Raspberry Pi 3 Model B Rev 1.2", BOARD_INI_RP3_B_12_PATH},
+       {PB_BOARD_RP3_B, "Raspberry Pi 3 Model B", BOARD_INI_RP3_B_PATH},
        {PB_BOARD_UNKOWN, "unkown board", BOARD_INI_UNKNOWN_PATH},
 };