From: Heesub Shin Date: Thu, 16 Mar 2017 10:39:44 +0000 (+0900) Subject: sidk_s5jt200: tidy up a bit X-Git-Tag: 1.1_Public_Release~614^2~304 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80c846445c43e0845d250b3bc9a47ef8e7a2bf47;p=rtos%2Ftinyara.git sidk_s5jt200: tidy up a bit This commit cleans up s5jt200_tash.c, removing unnecessary code lines. It seems to alter quite a lot, but does not introduce any functional differences. Change-Id: I2e23d10979e619d4aa76ea11251f9b81cf1230bf Signed-off-by: Heesub Shin --- diff --git a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_boot.c b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_boot.c index 67ea943..6e2e7eb 100644 --- a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_boot.c +++ b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_boot.c @@ -442,7 +442,6 @@ void board_initialize(void) up_coredump_init(); #endif - /* sflash_partitionmap_dump(); */ /* temoprally disable watchdog reset */ #define WDT_EN (1 << 5) #define WDT_INT_EN (1 << 2) diff --git a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c index 7f24672..e2b5db3 100644 --- a/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c +++ b/os/arch/arm/src/sidk_s5jt200/src/s5jt200_tash.c @@ -61,12 +61,9 @@ #include #include -#include -#include #include #include #include -#include #include "s5j_rtc.h" #include "up_internal.h" @@ -75,27 +72,11 @@ * Pre-processor Definitions ****************************************************************************/ -/* Configuration ************************************************************/ - /**************************************************************************** * Public Functions ****************************************************************************/ - -/**************************************************************************** - * Name: board_app_initialize - * - * Description: - * Perform architecture specific initialization - * - ****************************************************************************/ -extern void qspi_register(void); -extern void sdio_drv_register(void); extern void pwmdrv_register(void); -extern void chipid_register(void); extern void s5j_i2c_register(int bus); -extern uint32_t _vector_start; -extern void wlbt_if_booting(void); -extern void pdma_init(void); char *s5j_get_binary_version(uint32_t baddr) { @@ -106,32 +87,30 @@ char *s5j_get_binary_version(uint32_t baddr) } -#ifdef CONFIG_SCSC_WLAN static void scsc_wpa_ctrl_iface_init(void) { +#ifdef CONFIG_SCSC_WLAN int ret; ret = mkfifo("/dev/wpa_ctrl_req", 666); - if(ret != 0 && ret != -EEXIST) { + if (ret != 0 && ret != -EEXIST) { lldbg("mkfifo error ret:%d\n", ret); return; } ret = mkfifo("/dev/wpa_ctrl_cfm", 666); - if(ret != 0 && ret != -EEXIST) { + if (ret != 0 && ret != -EEXIST) { lldbg("mkfifo error ret:%d\n", ret); return; } ret = mkfifo("/dev/wpa_monitor", 666); - if(ret != 0 && ret != -EEXIST) { + if (ret != 0 && ret != -EEXIST) { lldbg("mkfifo error ret:%d\n", ret); return; } - - return; -} #endif +} /**************************************************************************** * Name: board_app_initialize @@ -142,20 +121,9 @@ static void scsc_wpa_ctrl_iface_init(void) * (non-standard) boardctl() interface using the command BOARDIOC_INIT. * ****************************************************************************/ - int board_app_initialize(void) { -#ifdef S5J_DISPLAY_MAC_ADDR - char mac_buf[6]; -#endif -#ifdef S5J_PERFORMANCE_TEST - uint32_t src; - uint32_t dst; - uint32_t t1; - uint32_t t2; -#endif #if defined(CONFIG_RTC) && defined(CONFIG_RTC_DRIVER) && defined(CONFIG_S5J_RTC) - /* FAR struct rtc_lowerhalf_s *lower; */ FAR struct tm tp; #endif @@ -163,18 +131,6 @@ int board_app_initialize(void) s5j_qspi_init(); #endif -#ifdef CONFIG_S5J_ADC - adcdrv_register(); -#endif - -#ifdef CONFIG_S5J_EFUSE - efusedrv_register(); -#endif - -#ifdef CONFIG_S5J_CHIPID - chipid_register(); -#endif - #ifdef CONFIG_S5J_I2C s5j_i2c_register(0); s5j_i2c_register(1); @@ -182,20 +138,10 @@ int board_app_initialize(void) up_timer_initialize(); - /* clk_print_info_all(-1); */ - #ifdef CONFIG_S5J_PWM pwmdrv_register(); #endif -#ifdef CONFIG_S5J_SDIO_SLAVE - sdio_drv_register(); -#endif - -#ifdef CONFIG_S5J_LEDCTRLBLK - ledctrlblk_drv_init(); -#endif - #ifdef CONFIG_S5J_WATCHDOG up_wdginitialize(); #ifdef CONFIG_S5J_WATCHDOG_RESET @@ -205,31 +151,14 @@ int board_app_initialize(void) #if defined(CONFIG_RTC) && defined(CONFIG_RTC_DRIVER) && defined(CONFIG_S5J_RTC) up_rtc_getdatetime(&tp); - lldbg("RTC getdatetime %d/%d/%d/%d/%d/%d\n", tp.tm_year + CONFIG_RTC_BASE_YEAR, tp.tm_mon + 1, tp.tm_mday, tp.tm_hour, tp.tm_min, tp.tm_sec); + lldbg("RTC getdatetime %d/%d/%d/%d/%d/%d\n", + tp.tm_year + CONFIG_RTC_BASE_YEAR, tp.tm_mon + 1, + tp.tm_mday, tp.tm_hour, tp.tm_min, tp.tm_sec); lldbg("Version Info :\n"); lldbg("tinyARA %s\n", __TIMESTAMP__); #endif -#ifdef CONFIG_S5J_WLBTBLK - wlbt_if_booting(); -#endif - -#ifdef CONFIG_EXAMPLES_LDO_TEST - register_ldo_drver(); -#endif - -#ifdef CONFIG_S5J_TICK_COUNTER - s5j_tickcnt_initialize(); -#endif - -#ifdef CONFIG_S5J_DMA - pdma_init(); -#endif - -#ifdef CONFIG_SCSC_WLAN scsc_wpa_ctrl_iface_init(); -#endif - lldbg("SIDK S5JT200 boot from 0x%x\n", &_vector_start); return OK; }