riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gnrc: rename ng_netbase to gnrc

Browse Source
This commit is contained in:
Martine Lenders 2015-08-10 02:41:08 +02:00
parent 4c2af1e341
commit b969eeb217
44 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.dep
View File

@ -1,13 +1,17 @@
ifneq (,$(filter gnrc_%,$(filter-out gnrc_netapi gnrc_netreg gnrc_netif% gnrc_pktbuf,$(USEMODULE))))
USEMODULE += gnrc
endif
ifneq (,$(filter ng_netif_default,$(USEMODULE))) ifneq (,$(filter ng_netif_default,$(USEMODULE)))
USEMODULE += ng_netif USEMODULE += ng_netif
endif endif
ifneq (,$(filter ng_netif,$(USEMODULE))) ifneq (,$(filter ng_netif,$(USEMODULE)))
USEMODULE += ng_netbase USEMODULE += gnrc
endif endif
ifneq (,$(filter ng_nomac,$(USEMODULE))) ifneq (,$(filter ng_nomac,$(USEMODULE)))
USEMODULE += ng_netbase USEMODULE += gnrc
endif endif
ifneq (,$(filter at86rf2%,$(USEMODULE))) ifneq (,$(filter at86rf2%,$(USEMODULE)))
@ -66,7 +70,7 @@ endif
ifneq (,$(filter ng_sixlowpan,$(USEMODULE))) ifneq (,$(filter ng_sixlowpan,$(USEMODULE)))
USEMODULE += ng_ipv6 USEMODULE += ng_ipv6
USEMODULE += ng_sixlowpan_netif USEMODULE += ng_sixlowpan_netif
USEMODULE += ng_netbase USEMODULE += gnrc
endif endif
ifneq (,$(filter ng_sixlowpan_ctx,$(USEMODULE))) ifneq (,$(filter ng_sixlowpan_ctx,$(USEMODULE)))
@ -99,7 +103,7 @@ endif
ifneq (,$(filter ng_icmpv6_echo,$(USEMODULE))) ifneq (,$(filter ng_icmpv6_echo,$(USEMODULE)))
USEMODULE += ng_icmpv6 USEMODULE += ng_icmpv6
USEMODULE += ng_netbase USEMODULE += gnrc
endif endif
ifneq (,$(filter ng_icmpv6,$(USEMODULE))) ifneq (,$(filter ng_icmpv6,$(USEMODULE)))
@ -130,7 +134,7 @@ ifneq (,$(filter ng_ipv6,$(USEMODULE)))
USEMODULE += ng_ipv6_hdr USEMODULE += ng_ipv6_hdr
USEMODULE += ng_ipv6_nc USEMODULE += ng_ipv6_nc
USEMODULE += ng_ipv6_netif USEMODULE += ng_ipv6_netif
USEMODULE += ng_netbase USEMODULE += gnrc
endif endif
ifneq (,$(filter ng_ipv6_hdr,$(USEMODULE))) ifneq (,$(filter ng_ipv6_hdr,$(USEMODULE)))
@ -152,7 +156,7 @@ ifneq (,$(filter ng_ipv6_netif,$(USEMODULE)))
endif endif
ifneq (,$(filter ng_udp,$(USEMODULE))) ifneq (,$(filter ng_udp,$(USEMODULE)))
USEMODULE += ng_netbase USEMODULE += gnrc
USEMODULE += inet_csum USEMODULE += inet_csum
USEMODULE += udp USEMODULE += udp
endif endif
@ -165,7 +169,7 @@ ifneq (,$(filter ng_nettest,$(USEMODULE)))
USEMODULE += vtimer USEMODULE += vtimer
endif endif
ifneq (,$(filter ng_netbase,$(USEMODULE))) ifneq (,$(filter gnrc,$(USEMODULE)))
USEMODULE += ng_netapi USEMODULE += ng_netapi
USEMODULE += ng_netreg USEMODULE += ng_netreg
USEMODULE += ng_netif USEMODULE += ng_netif
@ -189,7 +193,7 @@ ifneq (,$(filter ng_pktbuf_%, $(USEMODULE)))
endif endif
ifneq (,$(filter ng_slip,$(USEMODULE))) ifneq (,$(filter ng_slip,$(USEMODULE)))
USEMODULE += ng_netbase USEMODULE += gnrc
endif endif
ifneq (,$(filter uart0,$(USEMODULE))) ifneq (,$(filter uart0,$(USEMODULE)))

1
Makefile.pseudomodules
View File

@ -4,7 +4,6 @@ PSEUDOMODULES += ng_ipv6_default
PSEUDOMODULES += ng_ipv6_router PSEUDOMODULES += ng_ipv6_router
PSEUDOMODULES += ng_ipv6_router_default PSEUDOMODULES += ng_ipv6_router_default
PSEUDOMODULES += pktqueue PSEUDOMODULES += pktqueue
PSEUDOMODULES += ng_netbase
PSEUDOMODULES += ng_pktbuf PSEUDOMODULES += ng_pktbuf
PSEUDOMODULES += newlib PSEUDOMODULES += newlib
PSEUDOMODULES += ng_sixlowpan_default PSEUDOMODULES += ng_sixlowpan_default

2
cpu/nrf51/radio/nrfmin/nrfmin.c
View File

@ -26,7 +26,7 @@
#include "periph_conf.h" #include "periph_conf.h"
#include "periph/cpuid.h" #include "periph/cpuid.h"
#include "nrfmin.h" #include "nrfmin.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
#include "debug.h" #include "debug.h"

2
drivers/at86rf2xx/at86rf2xx.c
View File

@ -27,7 +27,7 @@
#include "periph/cpuid.h" #include "periph/cpuid.h"
#include "byteorder.h" #include "byteorder.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "at86rf2xx_registers.h" #include "at86rf2xx_registers.h"
#include "at86rf2xx_internal.h" #include "at86rf2xx_internal.h"
#include "at86rf2xx_netdev.h" #include "at86rf2xx_netdev.h"

2
drivers/at86rf2xx/at86rf2xx_netdev.c
View File

@ -21,7 +21,7 @@
#include "net/eui64.h" #include "net/eui64.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "at86rf2xx.h" #include "at86rf2xx.h"
#include "at86rf2xx_netdev.h" #include "at86rf2xx_netdev.h"
#include "at86rf2xx_internal.h" #include "at86rf2xx_internal.h"

2
drivers/include/xbee.h
View File

@ -29,7 +29,7 @@
#include "mutex.h" #include "mutex.h"
#include "periph/uart.h" #include "periph/uart.h"
#include "periph/gpio.h" #include "periph/gpio.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
#ifdef __cplusplus #ifdef __cplusplus

2
drivers/kw2xrf/kw2xrf.c
View File

@ -24,7 +24,7 @@
#include "msg.h" #include "msg.h"
#include "periph/gpio.h" #include "periph/gpio.h"
#include "periph/cpuid.h" #include "periph/cpuid.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)

2
examples/gnrc_networking/udp.c
View File

@ -22,7 +22,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "kernel.h" #include "kernel.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_ipv6.h" #include "net/ng_ipv6.h"
#include "net/ng_udp.h" #include "net/ng_udp.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"

3
sys/Makefile
View File

@ -28,6 +28,9 @@ endif
ifneq (,$(filter ipv6_hdr,$(USEMODULE))) ifneq (,$(filter ipv6_hdr,$(USEMODULE)))
DIRS += net/network_layer/ipv6/hdr DIRS += net/network_layer/ipv6/hdr
endif endif
ifneq (,$(filter gnrc gnrc_%,$(USEMODULE)))
DIRS += net/gnrc
endif
ifneq (,$(filter ng_icmpv6,$(USEMODULE))) ifneq (,$(filter ng_icmpv6,$(USEMODULE)))
DIRS += net/network_layer/ng_icmpv6 DIRS += net/network_layer/ng_icmpv6
endif endif

2
sys/auto_init/netif/auto_init_at86rf2xx.c
View File

@ -21,7 +21,7 @@
#include "board.h" #include "board.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "at86rf2xx.h" #include "at86rf2xx.h"
#include "at86rf2xx_params.h" #include "at86rf2xx_params.h"

2
sys/auto_init/netif/auto_init_kw2xrf.c
View File

@ -23,7 +23,7 @@
#include "board.h" #include "board.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "kw2xrf.h" #include "kw2xrf.h"
#include "kw2xrf_params.h" #include "kw2xrf_params.h"

2
sys/auto_init/netif/auto_init_ng_netdev_eth.c
View File

@ -22,7 +22,7 @@
#include "board.h" #include "board.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_netdev_eth.h" #include "net/ng_netdev_eth.h"
#include "net/dev_eth.h" #include "net/dev_eth.h"

2
sys/auto_init/netif/auto_init_slip.c
View File

@ -21,7 +21,7 @@
#include "board.h" #include "board.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "slip.h" #include "slip.h"
#include "slip_params.h" #include "slip_params.h"

2
sys/auto_init/netif/auto_init_xbee.c
View File

@ -21,7 +21,7 @@
#include "board.h" #include "board.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "xbee.h" #include "xbee.h"
#include "xbee_params.h" #include "xbee_params.h"

5
sys/include/net/ng_netbase.h → sys/include/net/gnrc.h
View File

@ -7,12 +7,13 @@
*/ */
/** /**
* @defgroup net_ng_netbase Network Stack Pseudo Header * @defgroup net_gnrc Generic (gnrc) network stack.
* @ingroup net * @ingroup net
* @brief RIOT's modular default IP network stack.
* @{ * @{
* *
* @file * @file
* @brief Pseudo header that includes all network stack base modules * @brief Pseudo header that includes all gnrc network stack base modules
* *
* @author Hauke Petersen <hauke.petersen@fu-berlin.de> * @author Hauke Petersen <hauke.petersen@fu-berlin.de>
*/ */

2
sys/include/net/ng_ipv6.h
View File

@ -29,7 +29,7 @@
#define NG_IPV6_H_ #define NG_IPV6_H_
#include "kernel_types.h" #include "kernel_types.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "thread.h" #include "thread.h"
#include "net/ipv6.h" #include "net/ipv6.h"

2
sys/include/net/ng_slip.h
View File

@ -26,7 +26,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "periph/uart.h" #include "periph/uart.h"
#include "ringbuffer.h" #include "ringbuffer.h"

2
sys/include/net/ng_udp.h
View File

@ -25,7 +25,7 @@
#include <stdint.h> #include <stdint.h>
#include "byteorder.h" #include "byteorder.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/udp.h" #include "net/udp.h"
#ifdef __cplusplus #ifdef __cplusplus

2
sys/net/application_layer/ng_zep/ng_zep.c
View File

@ -26,7 +26,7 @@
#include "net/ieee802154.h" #include "net/ieee802154.h"
#include "net/ipv6/addr.h" #include "net/ipv6/addr.h"
#include "net/ng_ipv6/hdr.h" #include "net/ng_ipv6/hdr.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_udp.h" #include "net/ng_udp.h"
#include "periph/cpuid.h" #include "periph/cpuid.h"
#include "random.h" #include "random.h"

2
sys/net/crosslayer/ng_pktdump/ng_pktdump.c
View File

@ -27,7 +27,7 @@
#include "msg.h" #include "msg.h"
#include "kernel.h" #include "kernel.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ipv6/addr.h" #include "net/ipv6/addr.h"
#include "net/ipv6/hdr.h" #include "net/ipv6/hdr.h"
#include "net/ng_sixlowpan.h" #include "net/ng_sixlowpan.h"

1
sys/net/gnrc/Makefile Normal file
View File

@ -0,0 +1 @@
include $(RIOTBASE)/Makefile.base

2
sys/net/link_layer/ng_nomac/ng_nomac.c
View File

@ -22,7 +22,7 @@
#include "msg.h" #include "msg.h"
#include "thread.h" #include "thread.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#define ENABLE_DEBUG (0) #define ENABLE_DEBUG (0)
#include "debug.h" #include "debug.h"

2
sys/net/link_layer/ng_slip/ng_slip.c
View File

@ -27,7 +27,7 @@
#include "kernel.h" #include "kernel.h"
#include "kernel_types.h" #include "kernel_types.h"
#include "msg.h" #include "msg.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "periph/uart.h" #include "periph/uart.h"
#include "ringbuffer.h" #include "ringbuffer.h"
#include "thread.h" #include "thread.h"

2
sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
View File

@ -12,7 +12,7 @@
* @file * @file
*/ */
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "od.h" #include "od.h"
#include "net/ng_icmpv6.h" #include "net/ng_icmpv6.h"

2
sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
View File

@ -22,7 +22,7 @@
#include "byteorder.h" #include "byteorder.h"
#include "kernel_types.h" #include "kernel_types.h"
#include "net/ipv6/hdr.h" #include "net/ipv6/hdr.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_ndp.h" #include "net/ng_ndp.h"
#include "net/protnum.h" #include "net/protnum.h"
#include "od.h" #include "od.h"

2
sys/net/network_layer/ng_ipv6/ng_ipv6.c
View File

@ -19,7 +19,7 @@
#include "cpu_conf.h" #include "cpu_conf.h"
#include "kernel_types.h" #include "kernel_types.h"
#include "net/ng_icmpv6.h" #include "net/ng_icmpv6.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_ndp.h" #include "net/ng_ndp.h"
#include "net/protnum.h" #include "net/protnum.h"
#include "thread.h" #include "thread.h"

2
sys/net/network_layer/ng_ndp/ng_ndp.c
View File

@ -23,7 +23,7 @@
#include "net/ipv6/ext/rh.h" #include "net/ipv6/ext/rh.h"
#include "net/ng_icmpv6.h" #include "net/ng_icmpv6.h"
#include "net/ng_ipv6.h" #include "net/ng_ipv6.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "random.h" #include "random.h"
#include "utlist.h" #include "utlist.h"
#include "thread.h" #include "thread.h"

2
sys/net/network_layer/ng_sixlowpan/frag/rbuf.c
View File

@ -16,7 +16,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "rbuf.h" #include "rbuf.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_ipv6/hdr.h" #include "net/ng_ipv6/hdr.h"
#include "net/ng_ipv6/netif.h" #include "net/ng_ipv6/netif.h"
#include "net/ng_sixlowpan.h" #include "net/ng_sixlowpan.h"

2
sys/net/network_layer/ng_sixlowpan/iphc/ng_sixlowpan_iphc.c
View File

@ -17,7 +17,7 @@
#include "byteorder.h" #include "byteorder.h"
#include "net/ieee802154.h" #include "net/ieee802154.h"
#include "net/ipv6/hdr.h" #include "net/ipv6/hdr.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_sixlowpan/ctx.h" #include "net/ng_sixlowpan/ctx.h"
#include "utlist.h" #include "utlist.h"

2
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
View File

@ -13,7 +13,7 @@
*/ */
#include "kernel_types.h" #include "kernel_types.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "thread.h" #include "thread.h"
#include "utlist.h" #include "utlist.h"

2
sys/net/transport_layer/ng_udp/ng_udp.c
View File

@ -27,7 +27,7 @@
#include "utlist.h" #include "utlist.h"
#include "net/ipv6/hdr.h" #include "net/ipv6/hdr.h"
#include "net/ng_udp.h" #include "net/ng_udp.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/inet_csum.h" #include "net/inet_csum.h"

2
sys/shell/commands/sc_icmpv6_echo.c
View File

@ -26,7 +26,7 @@
#include "net/ipv6/addr.h" #include "net/ipv6/addr.h"
#include "net/ng_ipv6/nc.h" #include "net/ng_ipv6/nc.h"
#include "net/ng_ipv6/hdr.h" #include "net/ng_ipv6/hdr.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "thread.h" #include "thread.h"
#include "utlist.h" #include "utlist.h"
#include "vtimer.h" #include "vtimer.h"

2
tests/driver_at86rf2xx/auto_init_ng_netif/netif_app.c
View File

@ -23,7 +23,7 @@
#include "kernel.h" #include "kernel.h"
#include "at86rf2xx.h" #include "at86rf2xx.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
/* make sure the SPI port and the needed GPIO pins are defined */ /* make sure the SPI port and the needed GPIO pins are defined */
#ifndef ATRF_SPI #ifndef ATRF_SPI

2
tests/driver_at86rf2xx/main.c
View File

@ -25,7 +25,7 @@
#include "posix_io.h" #include "posix_io.h"
#include "board_uart0.h" #include "board_uart0.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
/** /**
* @brief Buffer size used by the shell * @brief Buffer size used by the shell

2
tests/driver_kw2xrf/auto_init_ng_netif/netif_app.c
View File

@ -25,7 +25,7 @@
#include "kernel.h" #include "kernel.h"
#include "kw2xrf.h" #include "kw2xrf.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
/* make sure the SPI port and the needed GPIO pins are defined */ /* make sure the SPI port and the needed GPIO pins are defined */
#ifndef KWRF_SPI #ifndef KWRF_SPI

2
tests/driver_kw2xrf/main.c
View File

@ -23,7 +23,7 @@
#include "shell_commands.h" #include "shell_commands.h"
#include "posix_io.h" #include "posix_io.h"
#include "board_uart0.h" #include "board_uart0.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
/** /**

2
tests/driver_netdev_eth/Makefile
View File

@ -4,7 +4,7 @@ include ../Makefile.tests_common
BOARD_WHITELIST := native BOARD_WHITELIST := native
USEMODULE += dev_eth_tap USEMODULE += dev_eth_tap
USEMODULE += ng_netbase USEMODULE += gnrc
USEMODULE += ng_nomac USEMODULE += ng_nomac
USEMODULE += ng_pktdump USEMODULE += ng_pktdump
USEMODULE += ng_netdev_eth USEMODULE += ng_netdev_eth

2
tests/driver_netdev_eth/main.c
View File

@ -26,7 +26,7 @@
#include "kernel.h" #include "kernel.h"
#include "shell.h" #include "shell.h"
#include "shell_commands.h" #include "shell_commands.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
#include "net/ng_netdev_eth.h" #include "net/ng_netdev_eth.h"

2
tests/driver_nrfmin/Makefile
View File

@ -8,7 +8,7 @@ USEMODULE += shell_commands
USEMODULE += ps USEMODULE += ps
USEMODULE += uart0 USEMODULE += uart0
USEMODULE += radio_nrfmin USEMODULE += radio_nrfmin
USEMODULE += ng_netbase USEMODULE += gnrc
USEMODULE += ng_nomac USEMODULE += ng_nomac
USEMODULE += ng_pktdump USEMODULE += ng_pktdump

2
tests/driver_nrfmin/main.c
View File

@ -24,7 +24,7 @@
#include "posix_io.h" #include "posix_io.h"
#include "board_uart0.h" #include "board_uart0.h"
#include "nrfmin.h" #include "nrfmin.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_nomac.h" #include "net/ng_nomac.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"

2
tests/driver_xbee/main.c
View File

@ -22,7 +22,7 @@
#include "shell.h" #include "shell.h"
#include "shell_commands.h" #include "shell_commands.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
/** /**

2
tests/slip/Makefile
View File

@ -3,7 +3,7 @@ include ../Makefile.tests_common
BOARD_INSUFFICIENT_RAM := stm32f0discovery BOARD_INSUFFICIENT_RAM := stm32f0discovery
USEMODULE += ng_netbase USEMODULE += gnrc
USEMODULE += ng_pktdump USEMODULE += ng_pktdump
USEMODULE += ng_slip USEMODULE += ng_slip
USEMODULE += shell USEMODULE += shell

2
tests/slip/main.c
View File

@ -22,7 +22,7 @@
#include "shell.h" #include "shell.h"
#include "shell_commands.h" #include "shell_commands.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
/** /**

2
tests/zep/main.c
View File

@ -22,7 +22,7 @@
#include "shell.h" #include "shell.h"
#include "shell_commands.h" #include "shell_commands.h"
#include "net/ng_netbase.h" #include "net/gnrc.h"
#include "net/ng_pktdump.h" #include "net/ng_pktdump.h"
/** /**