Skip to content

Commit

Permalink
Merge pull request Samsung#1265 from sunghan-chang/iotbus
Browse files Browse the repository at this point in the history
framework/iotbus: clean up
  • Loading branch information
sangwon03 authored Feb 12, 2018
2 parents 4303a9a + cfd91eb commit 27cd8ee
Show file tree
Hide file tree
Showing 13 changed files with 427 additions and 102 deletions.
2 changes: 2 additions & 0 deletions apps/examples/st_things/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
config EXAMPLES_ST_THINGS
bool "SmartThings Things example"
default n
select IOTBUS
select IOTBUS_GPIO
---help---
Enable the SmartThings Things example

Expand Down
47 changes: 43 additions & 4 deletions build/configs/artik053/extra/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,7 @@ CONFIG_ARCH_BOARD="artik05x"
CONFIG_LIB_BOARDCTL=y
CONFIG_BOARDCTL_RESET=y
# CONFIG_BOARDCTL_UNIQUEID is not set
# CONFIG_BOARD_COREDUMP_FLASH is not set
# CONFIG_BOARD_FOTA_SUPPORT is not set
# CONFIG_BOARD_RAMDUMP_FLASH is not set
# CONFIG_BOARD_RAMDUMP_UART is not set

#
# Board-Specific Options
Expand Down Expand Up @@ -758,6 +755,9 @@ CONFIG_NETUTILS_NTPCLIENT=y
CONFIG_NETUTILS_NTPCLIENT_STACKSIZE=2048
CONFIG_NETUTILS_NTPCLIENT_SERVERPRIO=100
CONFIG_NETUTILS_NTPCLIENT_SIGWAKEUP=18
CONFIG_NETUTILS_NTPCLIENT_DEFAULT_SERVER="time.google.com"
CONFIG_NETUTILS_NTPCLIENT_DEFAULT_SERVER_PORT=123
CONFIG_NETUTILS_NTPCLIENT_DEFAULT_INTERVAL_SECONDS=60
CONFIG_NETUTILS_NTPCLIENT_DEBUG=y
CONFIG_NETUTILS_WEBSERVER=y
CONFIG_NETUTILS_WEBSERVER_MAX_CLIENT_HANDLER=1
Expand All @@ -771,6 +771,10 @@ CONFIG_NETUTILS_MDNS_XMDNS=y
CONFIG_NETUTILS_MDNS_XMDNS_MULTICAST_ADDR="224.0.0.251"
CONFIG_NETUTILS_MDNS_XMDNS_PORT_NUM=5353
CONFIG_NETUTILS_WEBCLIENT=y
CONFIG_WEBCLIENT_MAXHTTPLINE=200
CONFIG_WEBCLIENT_MAXMIMESIZE=32
CONFIG_WEBCLIENT_MAXHOSTNAME=128
CONFIG_WEBCLIENT_MAXFILENAME=128
CONFIG_WGET_USERAGENT="TinyARA"
CONFIG_NETUTILS_FTPD=y
CONFIG_NETUTILS_DHCPC=y
Expand Down Expand Up @@ -800,6 +804,10 @@ CONFIG_HW_RSA_ENC=y
# Wireless
#
CONFIG_WIFI_MANAGER=y
CONFIG_SELECT_WPA_SUPPLICANT=y
# CONFIG_SELECT_PROPIETARY_SUPPLICANT is not set
CONFIG_SELECT_SCSC_WLAN=y
# CONFIG_SELECT_PROPIETARY_WLAN is not set
CONFIG_NETUTILS_WIFI=y
CONFIG_SLSI_WIFI_DEFAULT_WLAN_COUNTRY_CODE="00"
CONFIG_SLSI_WIFI_DEFAULT_WLAN_TX_POWER=30
Expand All @@ -823,6 +831,8 @@ CONFIG_WPA_CTRL_FIFO_MK_MODE=666
CONFIG_ELOOP_POLL=y
# CONFIG_WPA_SUPPLICANT_CMD is not set
CONFIG_DRIVER_T20=y
CONFIG_DISABLE_EAP_FOR_SUPPLICANT=y
# CONFIG_WIFI_PROFILE_SECURESTORAGE is not set

#
# Network utilities
Expand Down Expand Up @@ -870,6 +880,11 @@ CONFIG_AUDIO_CUSTOM_DEV_PATH=y
# CONFIG_AUDIO_DEV_ROOT is not set
CONFIG_AUDIO_DEV_PATH="/dev/audio"

#
# Media Support
#
# CONFIG_MEDIA is not set

#
# File Systems
#
Expand Down Expand Up @@ -1027,8 +1042,14 @@ CONFIG_DEBUG_MM_HEAPINFO=y
# CONFIG_DEBUG_RTC is not set
# CONFIG_DEBUG_SPI is not set
# CONFIG_DEBUG_WATCHDOG is not set
# CONFIG_DEBUG_I2S is not set
# CONFIG_DEBUG_TTRACE is not set

#
# System Debug Options
#
# CONFIG_DEBUG_SYSTEM is not set

#
# Stack Debug Options
#
Expand Down Expand Up @@ -1070,6 +1091,8 @@ CONFIG_LIBM=y
CONFIG_LIBC_FLOATINGPOINT=y
# CONFIG_NOPRINTF_LONGLONG_TO_ASCII is not set
CONFIG_LIBC_IOCTL_VARIADIC=y
# CONFIG_LIBC_WCHAR is not set
# CONFIG_LIBC_LOCALE is not set
CONFIG_LIB_RAND_ORDER=1
# CONFIG_EOL_IS_CR is not set
# CONFIG_EOL_IS_LF is not set
Expand Down Expand Up @@ -1176,6 +1199,7 @@ CONFIG_EXAMPLES_HELLO=y
# CONFIG_EXAMPLES_LIBCOAP_SERVER_TEST is not set
# CONFIG_EXAMPLES_LIBTUV is not set
# CONFIG_EXAMPLES_MDNS_TEST is not set
# CONFIG_EXAMPLES_MEDIA_TEST is not set
# CONFIG_EXAMPLES_MQTT_TEST is not set
# CONFIG_EXAMPLES_MTDPART is not set
# CONFIG_EXAMPLES_NETTEST is not set
Expand Down Expand Up @@ -1205,7 +1229,6 @@ CONFIG_EXAMPLES_SLSIWIFI_STACKSIZE=2048
# CONFIG_EXAMPLES_WEBSOCKET is not set
# CONFIG_EXAMPLES_WIFIMANAGER_TEST is not set
# CONFIG_EXAMPLES_WIFI_TEST is not set
# CONFIG_EXAMPLES_WORKQUEUE is not set
# CONFIG_EXAMPLES_XMLRPC is not set

#
Expand Down Expand Up @@ -1302,3 +1325,19 @@ CONFIG_DM_AP_SECURITY="wpa2_aes"
# Things Management
#
CONFIG_ST_THINGS=y

#
# ST_Things Config Parameters
#
# CONFIG_ST_THINGS_ARTIK_HW_CERT_KEY is not set
# CONFIG_ST_THINGS_STG_MODE is not set

#
# IoTBus Framework
#
CONFIG_IOTBUS=y
CONFIG_IOTBUS_GPIO=y
CONFIG_IOTBUS_I2C=y
CONFIG_IOTBUS_PWM=y
CONFIG_IOTBUS_SPI=y
CONFIG_IOTBUS_UART=y
83 changes: 52 additions & 31 deletions build/configs/artik053/iotjs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ CONFIG_S5J_HAVE_PWM2=y
CONFIG_S5J_HAVE_PWM3=y
CONFIG_S5J_HAVE_PWM4=y
CONFIG_S5J_HAVE_PWM5=y
CONFIG_S5J_HAVE_PWR=y
CONFIG_S5J_HAVE_RTC=y
CONFIG_S5J_HAVE_SFLASH=y
CONFIG_S5J_HAVE_SPI=y
Expand All @@ -138,9 +137,7 @@ CONFIG_S5J_TIMER0=y
CONFIG_S5J_UART0=y
CONFIG_S5J_UART1=y
CONFIG_S5J_UART2=y
# CONFIG_S5J_UART2_FLOWCONTROL is not set
CONFIG_S5J_UART3=y
# CONFIG_S5J_UART3_FLOWCONTROL is not set
CONFIG_S5J_UART4=y
CONFIG_S5J_PWM=y
CONFIG_S5J_PWM0=y
Expand All @@ -153,13 +150,6 @@ CONFIG_S5J_SSS=y
CONFIG_S5J_SPI=y
# CONFIG_S5J_WATCHDOG is not set
CONFIG_S5J_SFLASH=y
CONFIG_S5J_PWR=y

#
# PMU Configuration
#
CONFIG_S5J_PWR_DSTOP=y
# CONFIG_S5J_PWR_SLEEP is not set
# CONFIG_S5J_SENSOR_PPD42NS is not set

#
Expand Down Expand Up @@ -221,6 +211,8 @@ CONFIG_RAM_SIZE=968704
# Board Selection
#
CONFIG_ARCH_BOARD_ARTIK053=y
# CONFIG_ARCH_BOARD_ARTIK053S is not set
# CONFIG_ARCH_BOARD_ARTIK055S is not set
# CONFIG_ARCH_BOARD_SIDK_S5JT200 is not set
CONFIG_ARCH_BOARD_ARTIK05X_FAMILY=y
CONFIG_ARCH_BOARD="artik05x"
Expand All @@ -232,10 +224,7 @@ CONFIG_ARCH_BOARD="artik05x"
CONFIG_LIB_BOARDCTL=y
CONFIG_BOARDCTL_RESET=y
# CONFIG_BOARDCTL_UNIQUEID is not set
# CONFIG_BOARD_COREDUMP_FLASH is not set
# CONFIG_BOARD_FOTA_SUPPORT is not set
# CONFIG_BOARD_RAMDUMP_FLASH is not set
# CONFIG_BOARD_RAMDUMP_UART is not set

#
# Board-Specific Options
Expand All @@ -253,6 +242,7 @@ CONFIG_ARTIK05X_AUTOMOUNT=y
CONFIG_ARTIK05X_AUTOMOUNT_USERFS=y
CONFIG_ARTIK05X_AUTOMOUNT_USERFS_DEVNAME="/dev/smart0p8"
CONFIG_ARTIK05X_AUTOMOUNT_USERFS_MOUNTPOINT="/mnt"
# CONFIG_ARTIK05X_AUTOMOUNT_SSSRW is not set
CONFIG_ARTIK05X_AUTOMOUNT_ROMFS=y
CONFIG_ARTIK05X_AUTOMOUNT_ROMFS_DEVNAME="/dev/mtdblock9"
CONFIG_ARTIK05X_AUTOMOUNT_ROMFS_MOUNTPOINT="/rom"
Expand Down Expand Up @@ -307,7 +297,6 @@ CONFIG_NPTHREAD_KEYS=4
# Performance Monitoring
#
# CONFIG_SCHED_CPULOAD is not set
# CONFIG_SCHED_INSTRUMENTATION is not set

#
# Latency optimization
Expand Down Expand Up @@ -420,7 +409,6 @@ CONFIG_ANALOG=y
CONFIG_ADC=y
CONFIG_ADC_FIFOSIZE=8
# CONFIG_DAC is not set
# CONFIG_LCD is not set
CONFIG_NETDEVICES=y

#
Expand All @@ -443,7 +431,6 @@ CONFIG_NETDEV_MULTINIC=y
CONFIG_POWER=y
# CONFIG_BATTERY_CHARGER is not set
# CONFIG_BATTERY_GAUGE is not set
# CONFIG_SERCOMM_CONSOLE is not set
CONFIG_SERIAL=y
# CONFIG_DEV_LOWCONSOLE is not set
# CONFIG_16550_UART is not set
Expand Down Expand Up @@ -548,6 +535,7 @@ CONFIG_UART4_PARITY=0
CONFIG_UART4_2STOP=0
# CONFIG_UART4_IFLOWCONTROL is not set
# CONFIG_UART4_OFLOWCONTROL is not set
# CONFIG_SENSOR is not set
# CONFIG_USBDEV is not set
# CONFIG_FOTA_DRIVER is not set

Expand Down Expand Up @@ -580,7 +568,6 @@ CONFIG_SCSC_CORE=y
CONFIG_SCSC_PLATFORM=y
# CONFIG_SCSC_WLANLITE is not set
# CONFIG_SCSC_DISABLE_WLAN_RESET is not set
# CONFIG_SENSOR is not set

#
# Networking Support
Expand Down Expand Up @@ -683,6 +670,8 @@ CONFIG_NET_DEFAULT_THREAD_STACKSIZE=0
#
# Debug Options for Network
#
# CONFIG_NET_LWIP_ASSERT is not set
# CONFIG_NET_LWIP_ERROR is not set
# CONFIG_NET_LWIP_DEBUG is not set

#
Expand Down Expand Up @@ -754,11 +743,16 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_MQTT is not set
CONFIG_NET_SECURITY_TLS=y
# CONFIG_TLS_WITH_SSS is not set
# CONFIG_SUPPORT_FULL_SECURITY is not set

#
# Wireless
#
CONFIG_WIFI_MANAGER=y
CONFIG_SELECT_WPA_SUPPLICANT=y
# CONFIG_SELECT_PROPIETARY_SUPPLICANT is not set
CONFIG_SELECT_SCSC_WLAN=y
# CONFIG_SELECT_PROPIETARY_WLAN is not set
CONFIG_NETUTILS_WIFI=y
CONFIG_SLSI_WIFI_DEFAULT_WLAN_COUNTRY_CODE="00"
CONFIG_SLSI_WIFI_DEFAULT_WLAN_TX_POWER=30
Expand All @@ -782,6 +776,7 @@ CONFIG_WPA_CTRL_FIFO_MK_MODE=666
CONFIG_ELOOP_POLL=y
# CONFIG_WPA_SUPPLICANT_CMD is not set
CONFIG_DRIVER_T20=y
CONFIG_DISABLE_EAP_FOR_SUPPLICANT=y

#
# Network utilities
Expand All @@ -793,6 +788,10 @@ CONFIG_NETUTILS_NETLIB=y
#
# CONFIG_AUDIO is not set

#
# Media Support
#

#
# File Systems
#
Expand Down Expand Up @@ -889,7 +888,7 @@ CONFIG_MTD_SMART_SECTOR_SIZE=512
# CONFIG_DISABLE_REALLOC_NEIGHBOR_EXTENSION is not set
# CONFIG_MM_SMALL is not set
CONFIG_MM_REGIONS=1
# CONFIG_ARCH_HAVE_HEAP2 is not set
# CONFIG_ARCH_HAVE_HEAPx is not set
# CONFIG_GRAN is not set

#
Expand Down Expand Up @@ -931,6 +930,7 @@ CONFIG_DEBUG_VERBOSE=y
# Subsystem Debug Options
#
# CONFIG_DEBUG_FS is not set
# CONFIG_DEBUG_AUDIO is not set
# CONFIG_DEBUG_LIB is not set
# CONFIG_DEBUG_MM is not set
CONFIG_DEBUG_NET=y
Expand Down Expand Up @@ -982,7 +982,12 @@ CONFIG_DEBUG_MM_HEAPINFO=y
# CONFIG_DEBUG_RTC is not set
# CONFIG_DEBUG_SPI is not set
# CONFIG_DEBUG_WATCHDOG is not set
# CONFIG_DEBUG_TTRACE is not set
# CONFIG_DEBUG_I2S is not set

#
# System Debug Options
#
# CONFIG_DEBUG_SYSTEM is not set

#
# Stack Debug Options
Expand Down Expand Up @@ -1025,6 +1030,8 @@ CONFIG_LIBM=y
CONFIG_LIBC_FLOATINGPOINT=y
# CONFIG_NOPRINTF_LONGLONG_TO_ASCII is not set
CONFIG_LIBC_IOCTL_VARIADIC=y
# CONFIG_LIBC_WCHAR is not set
# CONFIG_LIBC_LOCALE is not set
CONFIG_LIB_RAND_ORDER=1
# CONFIG_EOL_IS_CR is not set
# CONFIG_EOL_IS_LF is not set
Expand Down Expand Up @@ -1082,16 +1089,12 @@ CONFIG_NETDB_DNSSERVER_BY_DHCP=y
#
# External Libraries
#
# CONFIG_LWM2M_WAKAAMA is not set
# CONFIG_ENABLE_IOTIVITY is not set
# CONFIG_LIBTUV is not set
# CONFIG_AWS_SDK is not set
CONFIG_ENABLE_IOTJS=y
CONFIG_IOTJS_PRIORITY=100
CONFIG_IOTJS_STACKSIZE=32768
CONFIG_IOTJS_JERRY_HEAP=128
CONFIG_NETUTILS_JSON=y
# CONFIG_NETUTILS_CODECS is not set
# CONFIG_ENABLE_IOTIVITY is not set
CONFIG_NETUTILS_JSON=y
# CONFIG_LIBTUV is not set
# CONFIG_LWM2M_WAKAAMA is not set

#
# Application Configuration
Expand All @@ -1116,29 +1119,28 @@ CONFIG_BUILTIN_APPS=y
# CONFIG_EXAMPLES_FOTA_SAMPLE is not set
# CONFIG_FILESYSTEM_HELPER_ENABLE is not set
CONFIG_EXAMPLES_HELLO=y
# CONFIG_EXAMPLES_HELLO_TASH is not set
# CONFIG_EXAMPLES_HELLOXX is not set
# CONFIG_EXAMPLES_IOTBUS_TEST is not set
# CONFIG_EXAMPLES_KERNEL_SAMPLE is not set
# CONFIG_EXAMPLES_LIBTUV is not set
# CONFIG_EXAMPLES_MTDPART is not set
# CONFIG_EXAMPLES_NETTEST is not set
# CONFIG_EXAMPLES_PROC_TEST is not set
# CONFIG_EXAMPLES_SELECT_TEST is not set
# CONFIG_EXAMPLES_SENSORBOARD is not set
# CONFIG_EXAMPLES_SETJMP_TEST is not set
CONFIG_EXAMPLES_SLSIWIFI=y
CONFIG_EXAMPLES_SLSIWIFI_PRIORITY=50
CONFIG_EXAMPLES_SLSIWIFI_STACKSIZE=2048
# CONFIG_EXAMPLES_SMART is not set
# CONFIG_EXAMPLES_SMART_TEST is not set
# CONFIG_EXAMPLES_SYSIO_TEST is not set
# CONFIG_EXAMPLES_ST_THINGS is not set
# CONFIG_EXAMPLES_TESTCASE is not set
# CONFIG_EXAMPLES_TLS_BENCHMARK is not set
# CONFIG_EXAMPLES_TLS_CLIENT is not set
# CONFIG_EXAMPLES_TLS_SELFTEST is not set
# CONFIG_EXAMPLES_TLS_SERVER is not set
# CONFIG_EXAMPLES_WIFIMANAGER_TEST is not set
# CONFIG_EXAMPLES_WIFI_TEST is not set
# CONFIG_EXAMPLES_WORKQUEUE is not set

#
# Platform-specific Support
Expand Down Expand Up @@ -1199,8 +1201,27 @@ CONFIG_ENABLE_UPTIME=y
#
# Runtime Environment
#
CONFIG_ENABLE_IOTJS=y
CONFIG_IOTJS_PRIORITY=100
CONFIG_IOTJS_STACKSIZE=32768
CONFIG_IOTJS_JERRY_HEAP=128

#
# Device Management
#
# CONFIG_DM is not set

#
# Things Management
#
# CONFIG_ST_THINGS is not set

#
# IoTBus Framework
#
CONFIG_IOTBUS=y
CONFIG_IOTBUS_GPIO=y
CONFIG_IOTBUS_I2C=y
CONFIG_IOTBUS_PWM=y
CONFIG_IOTBUS_SPI=y
CONFIG_IOTBUS_UART=y
Loading

0 comments on commit 27cd8ee

Please sign in to comment.