artik053: remove artik053_nvram.c

artik053_nvram.c contains functions that access NVRAM configuration data
for WiFi. For consistency, move the contents of s5jt200_nvram.c to
s5jt200_wlan.c which is for wireless stuff.

Change-Id: I51cd1fc8cbae6e9cfc250998a549e373a42b1e52
Signed-off-by: Heesub Shin <heesub.shin@samsung.com>

diff --git a/os/arch/arm/src/artik053/src/Makefile b/os/arch/arm/src/artik053/src/Makefile
index a6ec6be..f771e56 100644 (file)
--- a/os/arch/arm/src/artik053/src/Makefile
+++ b/os/arch/arm/src/artik053/src/Makefile
@@ -64,8 +64,7 @@ CSRCS += artik053_progmem.c
 endif
 
 ifeq ($(CONFIG_SCSC_WLAN),y)
-CSRCS += artik053_nvram.c \
-        artik053_wlan.c
+CSRCS += artik053_wlan.c
 endif
 
 COBJS = $(CSRCS:.c=$(OBJEXT))

diff --git a/os/arch/arm/src/artik053/src/artik053_nvram.c b/os/arch/arm/src/artik053/src/artik053_nvram.c
deleted file mode 100644 (file)
index 570f4a7..0000000
--- a/os/arch/arm/src/artik053/src/artik053_nvram.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
- *
- * Copyright 2017 Samsung Electronics Co., LTD. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- ****************************************************************************/
-/****************************************************************************
- * arch/arm/src/artik053/artik053_nvram.c
- *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name tinyara 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 BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE 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 <tinyara/config.h>
-
-#include <fcntl.h>
-#include <stdbool.h>
-#include <debug.h>
-
-#include <tinyara/configdata.h>
-
-#include "artik053.h"
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-unsigned int up_wlan_write_config(void *buf, unsigned int bufsize)
-{
-#if defined(CONFIG_MTD_CONFIG)
-       int fd;
-       struct config_data_s config;
-
-       fd = open("/dev/config", O_RDOK);
-       if (fd < 0) {
-               lldbg("Failed to open /dev/config\n");
-               return false;
-       }
-
-       config.id = ARTIK053_CONFIGDATA_WIFI_NVRAM;
-       config.instance = 0;
-       config.configdata = (unsigned char *)buf;
-       config.len = bufsize;
-
-       ioctl(fd, CFGDIOC_SETCONFIG, &config);
-       close(fd);
-
-       return true;
-#else
-       return false;
-#endif
-}
-
-unsigned int up_wlan_read_config(void *buf, unsigned int bufsize)
-{
-#if defined(CONFIG_MTD_CONFIG)
-       int fd;
-       struct config_data_s config;
-
-       fd = open("/dev/config", O_RDOK);
-       if (fd < 0) {
-               lldbg("Failed to open /dev/config\n");
-               return false;
-       }
-
-       config.id = ARTIK053_CONFIGDATA_WIFI_NVRAM;
-       config.instance = 0;
-       config.configdata = (unsigned char *)buf;
-       config.len = bufsize;
-
-       ioctl(fd, CFGDIOC_GETCONFIG, &config);
-       close(fd);
-
-       return true;
-#else
-       return false;
-#endif
-}
-
-unsigned int up_wlan_erase_config(void)
-{
-#if defined(CONFIG_MTD_CONFIG)
-       return true;
-#else
-       return false;
-#endif
-}

diff --git a/os/arch/arm/src/artik053/src/artik053_wlan.c b/os/arch/arm/src/artik053/src/artik053_wlan.c
index e065da8..63e6928 100644 (file)
--- a/os/arch/arm/src/artik053/src/artik053_wlan.c
+++ b/os/arch/arm/src/artik053/src/artik053_wlan.c
@@ -18,12 +18,19 @@
 #include <tinyara/config.h>
 
 #include <stdio.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <debug.h>
 
 #include <net/if.h>
 #include <net/lwip/opt.h>
 #include <net/lwip/netif.h>
 #include <net/lwip/tcpip.h>
 
+#include <tinyara/configdata.h>
+
+#include "artik053.h"
+
 struct netif *wlan_netif;
 
 /**
@@ -49,6 +56,69 @@ static err_t wlan_init(struct netif *netif)
        return ERR_OK;
 }
 
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+unsigned int up_wlan_write_config(void *buf, unsigned int bufsize)
+{
+#if defined(CONFIG_MTD_CONFIG)
+       int fd;
+       struct config_data_s config;
+
+       fd = open("/dev/config", O_RDOK);
+       if (fd < 0) {
+               lldbg("Failed to open /dev/config\n");
+               return false;
+       }
+
+       config.id = ARTIK053_CONFIGDATA_WIFI_NVRAM;
+       config.instance = 0;
+       config.configdata = (unsigned char *)buf;
+       config.len = bufsize;
+
+       ioctl(fd, CFGDIOC_SETCONFIG, &config);
+       close(fd);
+
+       return true;
+#else
+       return false;
+#endif
+}
+
+unsigned int up_wlan_read_config(void *buf, unsigned int bufsize)
+{
+#if defined(CONFIG_MTD_CONFIG)
+       int fd;
+       struct config_data_s config;
+
+       fd = open("/dev/config", O_RDOK);
+       if (fd < 0) {
+               lldbg("Failed to open /dev/config\n");
+               return false;
+       }
+
+       config.id = ARTIK053_CONFIGDATA_WIFI_NVRAM;
+       config.instance = 0;
+       config.configdata = (unsigned char *)buf;
+       config.len = bufsize;
+
+       ioctl(fd, CFGDIOC_GETCONFIG, &config);
+       close(fd);
+
+       return true;
+#else
+       return false;
+#endif
+}
+
+unsigned int up_wlan_erase_config(void)
+{
+#if defined(CONFIG_MTD_CONFIG)
+       return true;
+#else
+       return false;
+#endif
+}
 void up_wlan_init(struct netif *dev)
 {
        struct ip_addr ipaddr;