RIOT-OS · kbumsik · Oct 8, 2017 · Oct 9, 2017 · Oct 9, 2017 · Oct 9, 2017
diff --git a/boards/arduino-mkr1000/Makefile.dep b/boards/arduino-mkr1000/Makefile.dep
@@ -1 +1,5 @@
+ifneq (,$(filter gnrc_netdev_default netdev_default,$(USEMODULE)))
+  USEPKG += winc1500
+endif
+
 include $(RIOTBOARD)/common/arduino-mkr/Makefile.dep
diff --git a/boards/arduino-mkr1000/include/board.h b/boards/arduino-mkr1000/include/board.h
@@ -29,6 +29,17 @@
 extern "C" {
 #endif
 
+/**
+ * @brief    winc1500 configuration
+ */
+#define WINC1500_PARAMS    {.spi = SPI_DEV(1), \
+    .cs_pin =    GPIO_PIN(PA, 14), \
+    .int_pin =   GPIO_PIN(PB, 9), \
+    .reset_pin = GPIO_PIN(PA, 27), /* Internally pulled-down */ \
+    .en_pin =    GPIO_PIN(PA, 28), /* Internally pulled-down */ \
+    .wake_pin =  GPIO_PIN(PB, 8), \
+    .spi_clk =   WINC1500_SPI_CLOCK}
+
 /**
  * @brief   The on-board LED is connected to pin 6 on this board
  */

@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 Bumsik Kim <[email protected]>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License v2.1. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup     boards_samd21-xpro
+ * @{
+ *
+ * @file
+ * @brief       WINC1500 Xplained Pro configuration for SAMD21-XPRO board
+ * @author      Bumsik Kim <[email protected]>
+*/
+
+#ifndef WINC1500_PARAMS_H
+#define WINC1500_PARAMS_H
+
+#include "winc1500.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief   Board specific WINC1500 configuration
+ */
+static const winc1500_params_t winc1500_params[] =
+{
+    {
+        .spi        = SPI_DEV(0),
+        .cs_pin     = GPIO_PIN(PA, 5),
+        .int_pin    = GPIO_PIN(PB, 4),
+        .reset_pin  = GPIO_PIN(PB, 6),
+        .en_pin     = GPIO_PIN(PB, 5),
+        .wake_pin   = GPIO_PIN(PB, 7),
+        .spi_clk    = SPI_CLK_10MHZ
+    }
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WINC1500_PARAMS_H */
+/** @} */
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 Bumsik Kim <[email protected]>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License v2.1. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup     boards_samr21-xpro
+ * @{
+ *
+ * @file
+ * @brief       WINC1500 Xplained Pro configuration for SAMR21-XPRO board
+ * @author      Bumsik Kim <[email protected]>
+*/
+
+#ifndef WINC1500_PARAMS_H
+#define WINC1500_PARAMS_H
+
+#include "winc1500.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief   Board specific WINC1500 configuration
+ */
+static const winc1500_params_t winc1500_params[] =
+{
+    {
+        .spi        = SPI_DEV(1),
+        .cs_pin     = GPIO_PIN(PB, 3),
+        .int_pin    = GPIO_PIN(PA, 22),
+        .reset_pin  = GPIO_PIN(PA, 13),
+        .en_pin     = GPIO_PIN(PA, 23),
+        .wake_pin   = GPIO_PIN(PA, 28),
+        .spi_clk    = SPI_CLK_10MHZ
+    }
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WINC1500_PARAMS_H */
+/** @} */
diff --git a/pkg/winc1500/Makefile b/pkg/winc1500/Makefile
@@ -0,0 +1,23 @@
+PKG_NAME=winc1500
+PKG_URL=https://github.com/kbumsik/winc1500-projects
+PKG_VERSION=396ea0cb3d10ef7099a15f352a3a6d792b16b48b
+PKG_LICENSE=BSD-3-Clause-Atmel
+
+VCS_DIR=$(PKG_BUILDDIR)/winc1500
+MODULE_MAKEFILE := $(CURDIR)/Makefile.module
+
+.PHONY: all
+
+all: git-download
+	# Copy Makefiles for each modules
+	@cp Makefile.common $(VCS_DIR)/common/source/Makefile
+	@cp Makefile.bsp $(VCS_DIR)/bsp/source/Makefile
+	@cp Makefile.bus_wrapper $(VCS_DIR)/bus_wrapper/source/Makefile
+	@cp Makefile.driver $(VCS_DIR)/driver/source/Makefile
+	@cp Makefile.socket $(VCS_DIR)/socket/source/Makefile
+	@cp Makefile.spi_flash $(VCS_DIR)/spi_flash/source/Makefile
+
+	# Lastly, call Makefile
+	"$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.winc1500
+
+include $(RIOTBASE)/pkg/pkg.mk
diff --git a/pkg/winc1500/Makefile.bsp b/pkg/winc1500/Makefile.bsp
@@ -0,0 +1,3 @@
+MODULE = winc1500_pkg_bsp
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.bus_wrapper b/pkg/winc1500/Makefile.bus_wrapper
@@ -0,0 +1,3 @@
+MODULE = winc1500_pkg_bus_wrapper
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.common b/pkg/winc1500/Makefile.common
@@ -0,0 +1,3 @@
+MODULE = winc1500_pkg_common
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.dep b/pkg/winc1500/Makefile.dep
@@ -0,0 +1,22 @@
+ifneq (,$(filter winc1500,$(USEPKG)))
+  # Modules inside of this package
+  USEMODULE += winc1500_driver
+  USEMODULE += winc1500_pkg_common
+  USEMODULE += winc1500_pkg_bsp
+  USEMODULE += winc1500_pkg_bus_wrapper
+  USEMODULE += winc1500_pkg_driver
+  USEMODULE += winc1500_pkg_socket
+  USEMODULE += winc1500_pkg_spi_flash
+
+  # Dependancies
+  FEATURES_REQUIRED += periph_gpio
+  FEATURES_REQUIRED += periph_spi
+  USEMODULE += xtimer
+  USEMODULE += core_mbox
+  # This Wi-Fi driver can be used without GNRC, so NETDEV_ETH is optional
+  ifneq (,$(filter gnrc,$(USEMODULE)))
+    # TODO: Test if it works without luid
+    USEMODULE += luid
+    USEMODULE += netdev_eth
+  endif
+endif
diff --git a/pkg/winc1500/Makefile.driver b/pkg/winc1500/Makefile.driver
@@ -0,0 +1,3 @@
+MODULE = winc1500_pkg_driver
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.include b/pkg/winc1500/Makefile.include
@@ -0,0 +1,3 @@
+INCLUDES += -I$(PKGDIRBASE)/winc1500/winc1500
+INCLUDES += -I$(RIOTBASE)/pkg/winc1500/include
+INCLUDES += -I$(RIOTBASE)/pkg/winc1500/driver/include
diff --git a/pkg/winc1500/Makefile.module b/pkg/winc1500/Makefile.module
@@ -0,0 +1 @@
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.socket b/pkg/winc1500/Makefile.socket
@@ -0,0 +1,3 @@
+MODULE = winc1500_pkg_socket
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.spi_flash b/pkg/winc1500/Makefile.spi_flash
@@ -0,0 +1,3 @@
+MODULE = winc1500_pkg_spi_flash
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/Makefile.winc1500 b/pkg/winc1500/Makefile.winc1500
@@ -0,0 +1,15 @@
+WINC1500_SUBDIR = common bsp bus_wrapper driver socket spi_flash
+
+# Include source files from VCS
+DIRS += $(addprefix winc1500/, $(addsuffix /source, $(WINC1500_SUBDIR)))
+# Driver
+DIRS += $(RIOTBASE)/pkg/winc1500/driver
+
+CFLAGS += -I$(CURDIR)/winc1500
+
+ifneq (,$(filter netdev_eth,$(USEMODULE)))
+  # In case we use GNRC the ethernet bypass mode should be enabled.
+  CFLAGS += -DETH_MODE
+endif
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/doc.txt b/pkg/winc1500/doc.txt
@@ -0,0 +1,8 @@
+/**
+ * @defgroup pkg_winc1500 Atmel WINC1500 Wi-Fi module API and adapter layer
+ * @ingroup  pkg
+ * @ingroup  net
+ * @brief    This package includes original driver API from Atmel, along with
+             patches for adapter layer to @ref drivers_winc1500 . 
+ * @see      https://github.com/kbumsik/winc1500-projects
+ */
diff --git a/pkg/winc1500/driver/Makefile b/pkg/winc1500/driver/Makefile
@@ -0,0 +1,3 @@
+MODULE = winc1500_driver
+
+include $(RIOTBASE)/Makefile.base
diff --git a/pkg/winc1500/driver/auto_init_winc1500.c b/pkg/winc1500/driver/auto_init_winc1500.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 Bumsik Kim <[email protected]>
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ *
+ */
+
+/**
+ * @ingroup auto_init_gnrc_netif
+ * @{
+ *
+ * @file
+ * @brief   Auto initialization for WINC1500 Wi-Fi devices
+ *
+ * @author  Bumsik Kim <[email protected]>
+ */
+
+#if defined(MODULE_WINC1500) && defined(MODULE_NETDEV_ETH)
+
+#include "log.h"
+#include "debug.h"
+#include "winc1500.h"
+#include "winc1500_params.h"
+#include "net/gnrc/netif/ethernet.h"
+
+/**
+* @name   Define stack parameters for the MAC layer thread
+* @{
+*/
+#define WINC1500_MAC_STACKSIZE    (THREAD_STACKSIZE_DEFAULT + \
+                                   DEBUG_EXTRA_STACKSIZE + 2048 * 2)
+#ifndef WINC1500_MAC_PRIO
+#define WINC1500_MAC_PRIO         (GNRC_NETIF_PRIO)
+#endif
+/** @} */
+
+#define WINC1500_NUM (sizeof(winc1500_params) / sizeof(winc1500_params[0]))
+
+winc1500_t winc1500_devs[WINC1500_NUM];
+static char _netdev_eth_stack[WINC1500_NUM][WINC1500_MAC_STACKSIZE];
+
+void auto_init_winc1500(void)
+{
+    for (unsigned i = 0; i < WINC1500_NUM; i++) {
+        LOG_DEBUG("[auto_init_netif] initializing winc1500 #0\n");
+
+        /* setup netdev device */
+        winc1500_setup(&winc1500_devs[i], &winc1500_params[i]);
+
+        /* start gnrc netdev thread */
+        gnrc_netif_ethernet_create(_netdev_eth_stack[i],
+                                  WINC1500_MAC_STACKSIZE,
+                                  WINC1500_MAC_PRIO, "winc1500",
+                                  (netdev_t*)&winc1500_devs[i]);
+    }
+}
+
+#else
+typedef int dont_be_pedantic;
+#endif /* defined(MODULE_WINC1500) && defined(MODULE_NETDEV_ETH) */
+/** @} */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_pkg_bsp

		include $(RIOTBASE)/Makefile.base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_pkg_bus_wrapper

		include $(RIOTBASE)/Makefile.base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_pkg_common

		include $(RIOTBASE)/Makefile.base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_pkg_driver

		include $(RIOTBASE)/Makefile.base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_pkg_socket

		include $(RIOTBASE)/Makefile.base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_pkg_spi_flash

		include $(RIOTBASE)/Makefile.base
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		MODULE = winc1500_driver

		include $(RIOTBASE)/Makefile.base