Commit 70f9244d authored by Anas Nashif's avatar Anas Nashif
Browse files

Merge "Merge net branch into master"

parents 1fbabd41 09e6b95a

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ NETWORKING 
M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>

S:	Supported

W:	https://www.zephyrproject.org/doc/subsystems/networking/networking.html

F:	net/ip/

F:	subsys/net/ip/

F:	include/net/

F:	samples/net/

F:	tests/net/
@@ -324,7 +324,7 @@ M: Johan Hedberg <johan.hedberg@intel.com> 
M:	Jukka Rissanen <jukka.rissanen@linux.intel.com>

S:	Supported

W:	https://www.zephyrproject.org/doc/subsystems/networking/buffers.html

F:	net/buf.c

F:	subsys/net/buf.c

F:	include/net/buf.h

F:	tests/net/buf/

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ endif # $(dot-config) 


# kernel objects are built as a static library

libs-y := kernel/unified/

core-y := lib/ misc/ net/ boards/ ext/ subsys/ tests/ arch/

core-y := lib/ misc/ boards/ ext/ subsys/ tests/ arch/

drivers-y := drivers/



ARCH = $(subst $(DQUOTE),,$(CONFIG_ARCH))

boards/x86/quark_se_c1000_devboard/Kconfig.defconfig

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ endif 
config BLUETOOTH_MONITOR_ON_DEV_NAME

	default UART_QMSI_1_NAME if BLUETOOTH_DEBUG_MONITOR



if NETWORKING_WITH_15_4_TI_CC2520

if TI_CC2520_LEGACY || TI_CC2520 || TI_CC2520_RAW



config SPI

	def_bool y
@@ -85,6 +85,6 @@ config TI_CC2520_GPIO_1_NAME 
	default GPIO_QMSI_1_NAME

endif



endif # NETWORKING_WITH_15_4_TI_CC2520

endif # TI_CC2520_LEGACY || TI_CC2520 || TI_CC2520_RAW



endif # BOARD_QUARK_SE_C1000_DEVBOARD

boards/x86/quark_se_c1000_devboard/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -3,14 +3,5 @@ ccflags-y += -I$(srctree)/drivers 
ccflags-y += -I$(srctree)/drivers/pinmux

asflags-y := ${ccflags-y}



ccflags-$(CONFIG_NETWORKING_WITH_15_4_TI_CC2520) +=	\

				-I${srctree}/net/ip/contiki

ccflags-$(CONFIG_NETWORKING_WITH_15_4_TI_CC2520) +=	\

				-I${srctree}/net/ip/contiki/os/lib

ccflags-$(CONFIG_NETWORKING_WITH_15_4_TI_CC2520) +=	\

				-I${srctree}/net/ip/contiki/os

ccflags-$(CONFIG_NETWORKING_WITH_15_4_TI_CC2520) +=	\

				-I${srctree}/net/ip



obj-$(CONFIG_PINMUX) += pinmux.o

obj-y += board.o

boards/x86/quark_se_c1000_devboard/board.c

+34 −19
Original line number Diff line number Diff line
@@ -20,40 +20,55 @@ 
#include <device.h>

#include <init.h>



#if defined(CONFIG_NETWORKING_WITH_15_4_TI_CC2520)

#if defined(CONFIG_TI_CC2520_LEGACY) || \

	defined(CONFIG_TI_CC2520) || \

	defined(CONFIG_TI_CC2520_RAW)



#include <ieee802154/cc2520.h>

#include <gpio.h>



static struct device *cc2520_gpio_config[CC2520_GPIO_IDX_LAST_ENTRY];

static struct cc2520_gpio_configuration cc2520_gpios[CC2520_GPIO_IDX_MAX] = {

	{ .dev = NULL, .pin = CC2520_GPIO_VREG_EN, },

	{ .dev = NULL, .pin = CC2520_GPIO_RESET, },

	{ .dev = NULL, .pin = CC2520_GPIO_FIFO, },

	{ .dev = NULL, .pin = CC2520_GPIO_CCA, },

	{ .dev = NULL, .pin = CC2520_GPIO_SFD, },

	{ .dev = NULL, .pin = CC2520_GPIO_FIFOP, },

};



struct device **cc2520_configure_gpios(void)

struct cc2520_gpio_configuration *cc2520_configure_gpios(void)

{

	struct device *gpio;



	const int flags_noint_out = GPIO_DIR_OUT;

	const int flags_noint_in = GPIO_DIR_IN;

	const int flags_int_in = (GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE |

				  GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE);

	struct device *gpio;



	gpio = device_get_binding(CONFIG_TI_CC2520_GPIO_1_NAME);

	gpio_pin_configure(gpio, CONFIG_CC2520_GPIO_VREG_EN, flags_noint_out);

	gpio_pin_configure(gpio, CONFIG_CC2520_GPIO_RESET, flags_noint_out);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].pin,

			   flags_noint_out);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_RESET].pin,

			   flags_noint_out);



	cc2520_gpio_config[CC2520_GPIO_IDX_VREG_EN] = gpio;

	cc2520_gpio_config[CC2520_GPIO_IDX_RESET] = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].dev = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_RESET].dev = gpio;



	gpio = device_get_binding(CONFIG_TI_CC2520_GPIO_0_NAME);

	gpio_pin_configure(gpio, CONFIG_CC2520_GPIO_SFD, flags_int_in);

	gpio_pin_configure(gpio, CONFIG_CC2520_GPIO_FIFOP, flags_int_in);

	gpio_pin_configure(gpio, CONFIG_CC2520_GPIO_FIFO, flags_noint_in);

	gpio_pin_configure(gpio, CONFIG_CC2520_GPIO_CCA, flags_noint_in);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_SFD].pin,

			   flags_int_in);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_FIFOP].pin,

			   flags_int_in);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_FIFO].pin,

			   flags_noint_in);

	gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_CCA].pin,

			   flags_noint_in);



	cc2520_gpio_config[CC2520_GPIO_IDX_FIFOP] = gpio;

	cc2520_gpio_config[CC2520_GPIO_IDX_FIFO] = gpio;

	cc2520_gpio_config[CC2520_GPIO_IDX_SFD] = gpio;

	cc2520_gpio_config[CC2520_GPIO_IDX_CCA] = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_FIFOP].dev = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_FIFO].dev = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_SFD].dev = gpio;

	cc2520_gpios[CC2520_GPIO_IDX_CCA].dev = gpio;



	return cc2520_gpio_config;

	return cc2520_gpios;

}



#endif /* CONFIG_NETWORKING_WITH_15_4_TI_CC2520 */
 
#endif /* CONFIG_TI_CC2520_LEGACY || CONFIG_TI_CC2520 || CONFIG_TI_CC2520_RAW */

CRA Git | Maintained and supported by SUSTech CRA and CCSE