From 2043e1a114f09f211d39d49f42d5aab6e586cf1a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 9 May 2017 07:34:59 -0600 Subject: [PATCH] IOBs: Move from driver/iob to a better location in mm/iob --- arch/arm/src/common/up_initialize.c | 4 ++-- arch/avr/src/common/up_initialize.c | 4 ++-- arch/hc/src/common/up_initialize.c | 4 ++-- arch/mips/src/common/up_initialize.c | 4 ++-- arch/misoc/src/lm32/lm32_initialize.c | 4 ++-- arch/renesas/src/common/up_initialize.c | 4 ++-- arch/risc-v/src/common/up_initialize.c | 4 ++-- arch/sim/src/up_initialize.c | 4 ++-- arch/x86/src/common/up_initialize.c | 4 ++-- arch/xtensa/src/common/xtensa_initialize.c | 4 ++-- arch/z16/src/common/up_initialize.c | 4 ++-- arch/z80/src/common/up_initialize.c | 4 ++-- configs/bambino-200e/netnsh/defconfig | 2 +- configs/c5471evm/httpd/defconfig | 2 +- configs/c5471evm/nettest/defconfig | 2 +- configs/c5471evm/nsh/defconfig | 2 +- configs/clicker2-stm32/knsh/defconfig | 2 +- configs/cloudctrl/nsh/defconfig | 2 +- configs/dk-tm4c129x/ipv6/defconfig | 2 +- configs/dk-tm4c129x/nsh/defconfig | 2 +- configs/eagle100/httpd/defconfig | 2 +- configs/eagle100/nettest/defconfig | 2 +- configs/eagle100/nsh/defconfig | 2 +- configs/eagle100/thttpd/defconfig | 2 +- configs/ekk-lm3s9b96/nsh/defconfig | 2 +- configs/ez80f910200zco/dhcpd/defconfig | 2 +- configs/ez80f910200zco/httpd/defconfig | 2 +- configs/ez80f910200zco/nettest/defconfig | 2 +- configs/ez80f910200zco/nsh/defconfig | 2 +- configs/ez80f910200zco/poll/defconfig | 2 +- configs/fire-stm32v2/nsh/defconfig | 2 +- configs/freedom-k64f/netnsh/defconfig | 2 +- configs/freedom-k66f/netnsh/defconfig | 2 +- configs/lincoln60/netnsh/defconfig | 2 +- configs/lincoln60/thttpd-binfs/defconfig | 2 +- configs/lm3s6432-s2e/nsh/defconfig | 2 +- configs/lm3s6965-ek/discover/defconfig | 2 +- configs/lm3s6965-ek/nsh/defconfig | 2 +- configs/lm3s6965-ek/tcpecho/defconfig | 2 +- configs/lm3s8962-ek/nsh/defconfig | 2 +- configs/lpcxpresso-lpc1768/dhcpd/defconfig | 2 +- configs/lpcxpresso-lpc1768/nsh/defconfig | 2 +- configs/lpcxpresso-lpc1768/thttpd/defconfig | 2 +- configs/misoc/hello/defconfig | 2 +- configs/moxa/nsh/defconfig | 2 +- configs/ntosd-dm320/nettest/defconfig | 2 +- configs/ntosd-dm320/nsh/defconfig | 2 +- configs/ntosd-dm320/poll/defconfig | 2 +- configs/ntosd-dm320/thttpd/defconfig | 2 +- configs/ntosd-dm320/udp/defconfig | 2 +- configs/ntosd-dm320/webserver/defconfig | 2 +- configs/nucleo-f091rc/nsh/defconfig | 2 +- configs/nucleo-l452re/nsh/defconfig | 2 +- configs/nucleo-l496zg/nsh/defconfig | 2 +- configs/olimex-lpc1766stk/ftpc/defconfig | 2 +- configs/olimex-lpc1766stk/hidmouse/defconfig | 2 +- configs/olimex-lpc1766stk/nettest/defconfig | 2 +- configs/olimex-lpc1766stk/nsh/defconfig | 2 +- configs/olimex-lpc1766stk/slip-httpd/defconfig | 2 +- configs/olimex-lpc1766stk/thttpd-binfs/defconfig | 2 +- configs/olimex-lpc1766stk/thttpd-nxflat/defconfig | 2 +- configs/olimex-lpc1766stk/zmodem/defconfig | 2 +- configs/olimex-stm32-e407/discover/defconfig | 2 +- configs/olimex-stm32-e407/netnsh/defconfig | 2 +- configs/olimex-stm32-e407/telnetd/defconfig | 2 +- configs/olimex-stm32-e407/webserver/defconfig | 2 +- configs/olimex-stm32-p107/nsh/defconfig | 2 +- configs/olimex-stm32-p207/nsh/defconfig | 2 +- configs/olimex-strp711/nettest/defconfig | 2 +- configs/photon/wlan/defconfig | 10 +++++++++- configs/pic32mx-starterkit/nsh2/defconfig | 2 +- configs/pic32mx7mmb/nsh/defconfig | 2 +- configs/sam4e-ek/nsh/defconfig | 2 +- configs/sam4e-ek/nxwm/defconfig | 2 +- configs/sam4e-ek/usbnsh/defconfig | 2 +- configs/sama5d3-xplained/bridge/defconfig | 2 +- configs/sama5d4-ek/bridge/defconfig | 2 +- configs/sama5d4-ek/ipv6/defconfig | 2 +- configs/sama5d4-ek/nsh/defconfig | 2 +- configs/sama5d4-ek/nxwm/defconfig | 2 +- configs/same70-xplained/netnsh/defconfig | 2 +- configs/samv71-xult/netnsh/defconfig | 2 +- configs/samv71-xult/vnc/defconfig | 2 +- configs/samv71-xult/vnxwm/defconfig | 2 +- configs/shenzhou/nsh/defconfig | 2 +- configs/shenzhou/nxwm/defconfig | 2 +- configs/shenzhou/thttpd/defconfig | 2 +- configs/sim/nettest/defconfig | 2 +- configs/sim/sixlowpan/defconfig | 2 +- configs/sim/udgram/defconfig | 2 +- configs/sim/ustream/defconfig | 2 +- configs/stm3220g-eval/dhcpd/defconfig | 2 +- configs/stm3220g-eval/nettest/defconfig | 2 +- configs/stm3220g-eval/nsh/defconfig | 2 +- configs/stm3220g-eval/nsh2/defconfig | 2 +- configs/stm3220g-eval/nxwm/defconfig | 2 +- configs/stm3220g-eval/telnetd/defconfig | 2 +- configs/stm3240g-eval/dhcpd/defconfig | 2 +- configs/stm3240g-eval/discover/defconfig | 2 +- configs/stm3240g-eval/nettest/defconfig | 2 +- configs/stm3240g-eval/nsh/defconfig | 2 +- configs/stm3240g-eval/nsh2/defconfig | 2 +- configs/stm3240g-eval/nxterm/defconfig | 2 +- configs/stm3240g-eval/nxwm/defconfig | 2 +- configs/stm3240g-eval/telnetd/defconfig | 2 +- configs/stm3240g-eval/webserver/defconfig | 2 +- configs/stm3240g-eval/xmlrpc/defconfig | 2 +- configs/stm32butterfly2/nshnet/defconfig | 2 +- configs/stm32f4discovery/ipv6/defconfig | 2 +- configs/stm32f4discovery/netnsh/defconfig | 2 +- configs/tm4c1294-launchpad/ipv6/defconfig | 2 +- configs/tm4c1294-launchpad/nsh/defconfig | 2 +- configs/twr-k64f120m/netnsh/defconfig | 2 +- configs/u-blox-c027/nsh/defconfig | 2 +- configs/viewtool-stm32f107/netnsh/defconfig | 2 +- configs/zkit-arm-1769/hello/defconfig | 2 +- configs/zkit-arm-1769/nsh/defconfig | 2 +- configs/zkit-arm-1769/nxhello/defconfig | 2 +- configs/zkit-arm-1769/thttpd/defconfig | 2 +- drivers/Kconfig | 2 -- drivers/Makefile | 1 - drivers/README.txt | 4 ---- drivers/wireless/ieee802154/mrf24j40.c | 2 +- include/nuttx/{drivers => mm}/iob.h | 12 ++++++------ include/nuttx/net/sixlowpan.h | 2 +- mm/Kconfig | 2 +- mm/Makefile | 1 + mm/README.txt | 12 ++++++++++++ {drivers => mm}/iob/Kconfig | 8 ++++---- {drivers => mm}/iob/Make.defs | 6 +++--- {drivers => mm}/iob/iob.h | 15 ++++++++------- {drivers => mm}/iob/iob_add_queue.c | 4 ++-- {drivers => mm}/iob/iob_alloc.c | 4 ++-- {drivers => mm}/iob/iob_alloc_qentry.c | 4 ++-- {drivers => mm}/iob/iob_clone.c | 4 ++-- {drivers => mm}/iob/iob_concat.c | 4 ++-- {drivers => mm}/iob/iob_contig.c | 4 ++-- {drivers => mm}/iob/iob_copyin.c | 4 ++-- {drivers => mm}/iob/iob_copyout.c | 4 ++-- {drivers => mm}/iob/iob_dump.c | 4 ++-- {drivers => mm}/iob/iob_free.c | 4 ++-- {drivers => mm}/iob/iob_free_chain.c | 4 ++-- {drivers => mm}/iob/iob_free_qentry.c | 4 ++-- {drivers => mm}/iob/iob_free_queue.c | 4 ++-- {drivers => mm}/iob/iob_initialize.c | 4 ++-- {drivers => mm}/iob/iob_pack.c | 4 ++-- {drivers => mm}/iob/iob_peek_queue.c | 4 ++-- {drivers => mm}/iob/iob_remove_queue.c | 4 ++-- {drivers => mm}/iob/iob_test.c | 2 +- {drivers => mm}/iob/iob_trimhead.c | 4 ++-- {drivers => mm}/iob/iob_trimhead_queue.c | 4 ++-- {drivers => mm}/iob/iob_trimtail.c | 4 ++-- net/devif/Make.defs | 2 +- net/devif/devif.h | 2 +- net/devif/devif_iobsend.c | 6 +++--- net/sixlowpan/sixlowpan_framer.c | 2 +- net/socket/recvfrom.c | 2 +- net/tcp/Kconfig | 4 ++-- net/tcp/tcp.h | 2 +- net/tcp/tcp_callback.c | 2 +- net/tcp/tcp_send_buffered.c | 2 +- net/tcp/tcp_wrbuffer.c | 2 +- net/tcp/tcp_wrbuffer_dump.c | 2 +- net/udp/Kconfig | 2 +- net/udp/udp.h | 2 +- wireless/ieee802154/Kconfig | 2 +- wireless/ieee802154/mac802154.c | 2 +- wireless/ieee802154/mac802154_device.c | 2 +- wireless/ieee802154/mac802154_indalloc.c | 2 +- wireless/ieee802154/mac802154_netdev.c | 2 +- 170 files changed, 238 insertions(+), 223 deletions(-) rename include/nuttx/{drivers => mm}/iob.h (98%) rename {drivers => mm}/iob/Kconfig (96%) rename {drivers => mm}/iob/Make.defs (96%) rename {drivers => mm}/iob/iob.h (96%) rename {drivers => mm}/iob/iob_add_queue.c (98%) rename {drivers => mm}/iob/iob_alloc.c (99%) rename {drivers => mm}/iob/iob_alloc_qentry.c (99%) rename {drivers => mm}/iob/iob_clone.c (98%) rename {drivers => mm}/iob/iob_concat.c (97%) rename {drivers => mm}/iob/iob_contig.c (98%) rename {drivers => mm}/iob/iob_copyin.c (99%) rename {drivers => mm}/iob/iob_copyout.c (98%) rename {drivers => mm}/iob/iob_dump.c (98%) rename {drivers => mm}/iob/iob_free.c (98%) rename {drivers => mm}/iob/iob_free_chain.c (97%) rename {drivers => mm}/iob/iob_free_qentry.c (98%) rename {drivers => mm}/iob/iob_free_queue.c (98%) rename {drivers => mm}/iob/iob_initialize.c (98%) rename {drivers => mm}/iob/iob_pack.c (98%) rename {drivers => mm}/iob/iob_peek_queue.c (98%) rename {drivers => mm}/iob/iob_remove_queue.c (98%) rename {drivers => mm}/iob/iob_test.c (99%) rename {drivers => mm}/iob/iob_trimhead.c (98%) rename {drivers => mm}/iob/iob_trimhead_queue.c (98%) rename {drivers => mm}/iob/iob_trimtail.c (98%) diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c index ecf6400d33..4b6cfe00df 100644 --- a/arch/arm/src/common/up_initialize.c +++ b/arch/arm/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -191,7 +191,7 @@ void up_initialize(void) arm_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c index 738f9b27d6..ee9e471fba 100644 --- a/arch/avr/src/common/up_initialize.c +++ b/arch/avr/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include @@ -232,7 +232,7 @@ void up_initialize(void) avr_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c index 0484c8ffc3..b976bf1f52 100644 --- a/arch/hc/src/common/up_initialize.c +++ b/arch/hc/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -158,7 +158,7 @@ void up_initialize(void) hc_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c index 7e301be7b0..c99fb50742 100644 --- a/arch/mips/src/common/up_initialize.c +++ b/arch/mips/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -160,7 +160,7 @@ void up_initialize(void) mips_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/misoc/src/lm32/lm32_initialize.c b/arch/misoc/src/lm32/lm32_initialize.c index 8371a9a39f..1c4aeb9eed 100644 --- a/arch/misoc/src/lm32/lm32_initialize.c +++ b/arch/misoc/src/lm32/lm32_initialize.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include @@ -79,7 +79,7 @@ void up_initialize(void) misoc_timer_initialize(); -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c index ad8756e48e..77dd322ca4 100644 --- a/arch/renesas/src/common/up_initialize.c +++ b/arch/renesas/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -149,7 +149,7 @@ void up_initialize(void) renesas_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c index f0a86dfd45..acf400f826 100644 --- a/arch/risc-v/src/common/up_initialize.c +++ b/arch/risc-v/src/common/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include @@ -151,7 +151,7 @@ void up_initialize(void) riscv_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c index d618ebac70..f18767ba96 100644 --- a/arch/sim/src/up_initialize.c +++ b/arch/sim/src/up_initialize.c @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include @@ -201,7 +201,7 @@ void up_initialize(void) up_pminitialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c index f5f6f7a0e0..7c0f3065af 100644 --- a/arch/x86/src/common/up_initialize.c +++ b/arch/x86/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -160,7 +160,7 @@ void up_initialize(void) x86_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c index f3ad78392a..9be32e3a17 100644 --- a/arch/xtensa/src/common/xtensa_initialize.c +++ b/arch/xtensa/src/common/xtensa_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -168,7 +168,7 @@ void up_initialize(void) xtensa_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c index c04e342ab9..1d936d241e 100644 --- a/arch/z16/src/common/up_initialize.c +++ b/arch/z16/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -160,7 +160,7 @@ void up_initialize(void) z16_timer_initialize(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c index bedf28b0b0..53a539326d 100644 --- a/arch/z80/src/common/up_initialize.c +++ b/arch/z80/src/common/up_initialize.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -157,7 +157,7 @@ void up_initialize(void) (void)up_mmuinit(); #endif -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /* Initialize IO buffering */ iob_initialize(); diff --git a/configs/bambino-200e/netnsh/defconfig b/configs/bambino-200e/netnsh/defconfig index 83ae5fe9a8..7b3e53b6cc 100644 --- a/configs/bambino-200e/netnsh/defconfig +++ b/configs/bambino-200e/netnsh/defconfig @@ -488,7 +488,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/c5471evm/httpd/defconfig b/configs/c5471evm/httpd/defconfig index b844eb004a..763da2a5bd 100644 --- a/configs/c5471evm/httpd/defconfig +++ b/configs/c5471evm/httpd/defconfig @@ -370,7 +370,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/c5471evm/nettest/defconfig b/configs/c5471evm/nettest/defconfig index d371baf706..72dc20b6f1 100644 --- a/configs/c5471evm/nettest/defconfig +++ b/configs/c5471evm/nettest/defconfig @@ -358,7 +358,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/c5471evm/nsh/defconfig b/configs/c5471evm/nsh/defconfig index 9c26f594e8..bb9f485700 100644 --- a/configs/c5471evm/nsh/defconfig +++ b/configs/c5471evm/nsh/defconfig @@ -370,7 +370,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/clicker2-stm32/knsh/defconfig b/configs/clicker2-stm32/knsh/defconfig index ed981e5a97..f25787284d 100644 --- a/configs/clicker2-stm32/knsh/defconfig +++ b/configs/clicker2-stm32/knsh/defconfig @@ -758,7 +758,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/cloudctrl/nsh/defconfig b/configs/cloudctrl/nsh/defconfig index 54f875306e..f14809e3f8 100644 --- a/configs/cloudctrl/nsh/defconfig +++ b/configs/cloudctrl/nsh/defconfig @@ -761,7 +761,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/dk-tm4c129x/ipv6/defconfig b/configs/dk-tm4c129x/ipv6/defconfig index 3eaecb19c5..86189d524b 100644 --- a/configs/dk-tm4c129x/ipv6/defconfig +++ b/configs/dk-tm4c129x/ipv6/defconfig @@ -506,7 +506,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/dk-tm4c129x/nsh/defconfig b/configs/dk-tm4c129x/nsh/defconfig index 6fb8a008ea..92a8d79c74 100644 --- a/configs/dk-tm4c129x/nsh/defconfig +++ b/configs/dk-tm4c129x/nsh/defconfig @@ -506,7 +506,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig index 3af19d1584..d18b5ce513 100644 --- a/configs/eagle100/httpd/defconfig +++ b/configs/eagle100/httpd/defconfig @@ -474,7 +474,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig index 06adb40d7b..91197d61e3 100644 --- a/configs/eagle100/nettest/defconfig +++ b/configs/eagle100/nettest/defconfig @@ -462,7 +462,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig index 22bed91050..34b86ded78 100644 --- a/configs/eagle100/nsh/defconfig +++ b/configs/eagle100/nsh/defconfig @@ -485,7 +485,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig index cdd4eecb3f..fc7aef9061 100644 --- a/configs/eagle100/thttpd/defconfig +++ b/configs/eagle100/thttpd/defconfig @@ -453,7 +453,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ekk-lm3s9b96/nsh/defconfig b/configs/ekk-lm3s9b96/nsh/defconfig index c26cb06d91..a9fb835bb8 100644 --- a/configs/ekk-lm3s9b96/nsh/defconfig +++ b/configs/ekk-lm3s9b96/nsh/defconfig @@ -472,7 +472,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig index 0b61941b7a..d5168aa4b1 100644 --- a/configs/ez80f910200zco/dhcpd/defconfig +++ b/configs/ez80f910200zco/dhcpd/defconfig @@ -341,7 +341,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=8 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig index 77a0e30b06..b26f794918 100644 --- a/configs/ez80f910200zco/httpd/defconfig +++ b/configs/ez80f910200zco/httpd/defconfig @@ -353,7 +353,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig index 15cbb1da5d..2430277422 100644 --- a/configs/ez80f910200zco/nettest/defconfig +++ b/configs/ez80f910200zco/nettest/defconfig @@ -341,7 +341,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig index 3db4c5cc00..e40d7e64d8 100644 --- a/configs/ez80f910200zco/nsh/defconfig +++ b/configs/ez80f910200zco/nsh/defconfig @@ -353,7 +353,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig index 53541fe0fb..c48857b889 100644 --- a/configs/ez80f910200zco/poll/defconfig +++ b/configs/ez80f910200zco/poll/defconfig @@ -353,7 +353,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/fire-stm32v2/nsh/defconfig b/configs/fire-stm32v2/nsh/defconfig index a2f7defdf1..1255771f4a 100644 --- a/configs/fire-stm32v2/nsh/defconfig +++ b/configs/fire-stm32v2/nsh/defconfig @@ -770,7 +770,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/freedom-k64f/netnsh/defconfig b/configs/freedom-k64f/netnsh/defconfig index ac209b3a8b..bcac9353a2 100644 --- a/configs/freedom-k64f/netnsh/defconfig +++ b/configs/freedom-k64f/netnsh/defconfig @@ -501,7 +501,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/freedom-k66f/netnsh/defconfig b/configs/freedom-k66f/netnsh/defconfig index dbb26035ea..71f0cd33b2 100644 --- a/configs/freedom-k66f/netnsh/defconfig +++ b/configs/freedom-k66f/netnsh/defconfig @@ -510,7 +510,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lincoln60/netnsh/defconfig b/configs/lincoln60/netnsh/defconfig index ca17f4e7b4..40dfb528ef 100644 --- a/configs/lincoln60/netnsh/defconfig +++ b/configs/lincoln60/netnsh/defconfig @@ -463,7 +463,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lincoln60/thttpd-binfs/defconfig b/configs/lincoln60/thttpd-binfs/defconfig index c659979d94..4f4316e9c7 100644 --- a/configs/lincoln60/thttpd-binfs/defconfig +++ b/configs/lincoln60/thttpd-binfs/defconfig @@ -440,7 +440,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lm3s6432-s2e/nsh/defconfig b/configs/lm3s6432-s2e/nsh/defconfig index 675a7b6c17..fe849d782c 100644 --- a/configs/lm3s6432-s2e/nsh/defconfig +++ b/configs/lm3s6432-s2e/nsh/defconfig @@ -467,7 +467,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lm3s6965-ek/discover/defconfig b/configs/lm3s6965-ek/discover/defconfig index 838fbeac02..305695abfb 100644 --- a/configs/lm3s6965-ek/discover/defconfig +++ b/configs/lm3s6965-ek/discover/defconfig @@ -477,7 +477,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig index 838fbeac02..305695abfb 100644 --- a/configs/lm3s6965-ek/nsh/defconfig +++ b/configs/lm3s6965-ek/nsh/defconfig @@ -477,7 +477,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lm3s6965-ek/tcpecho/defconfig b/configs/lm3s6965-ek/tcpecho/defconfig index ac6fd9a2bd..ff3212eaae 100644 --- a/configs/lm3s6965-ek/tcpecho/defconfig +++ b/configs/lm3s6965-ek/tcpecho/defconfig @@ -466,7 +466,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig index de5e95e743..86971dec84 100644 --- a/configs/lm3s8962-ek/nsh/defconfig +++ b/configs/lm3s8962-ek/nsh/defconfig @@ -489,7 +489,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/configs/lpcxpresso-lpc1768/dhcpd/defconfig index d18c05e9e4..6e8638e71d 100644 --- a/configs/lpcxpresso-lpc1768/dhcpd/defconfig +++ b/configs/lpcxpresso-lpc1768/dhcpd/defconfig @@ -430,7 +430,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=8 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lpcxpresso-lpc1768/nsh/defconfig b/configs/lpcxpresso-lpc1768/nsh/defconfig index 0a2f6da13d..1246035ad3 100644 --- a/configs/lpcxpresso-lpc1768/nsh/defconfig +++ b/configs/lpcxpresso-lpc1768/nsh/defconfig @@ -453,7 +453,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/lpcxpresso-lpc1768/thttpd/defconfig b/configs/lpcxpresso-lpc1768/thttpd/defconfig index ac12426f49..60845d6a63 100644 --- a/configs/lpcxpresso-lpc1768/thttpd/defconfig +++ b/configs/lpcxpresso-lpc1768/thttpd/defconfig @@ -430,7 +430,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/misoc/hello/defconfig b/configs/misoc/hello/defconfig index bb25f3c366..19f64a538d 100644 --- a/configs/misoc/hello/defconfig +++ b/configs/misoc/hello/defconfig @@ -322,7 +322,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/moxa/nsh/defconfig b/configs/moxa/nsh/defconfig index 6a45427b5c..76da9497d6 100644 --- a/configs/moxa/nsh/defconfig +++ b/configs/moxa/nsh/defconfig @@ -358,7 +358,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig index 638279f138..e088110948 100644 --- a/configs/ntosd-dm320/nettest/defconfig +++ b/configs/ntosd-dm320/nettest/defconfig @@ -340,7 +340,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig index 1283565c72..12b46adc25 100644 --- a/configs/ntosd-dm320/nsh/defconfig +++ b/configs/ntosd-dm320/nsh/defconfig @@ -352,7 +352,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig index 8f179e8ce8..16874144a1 100644 --- a/configs/ntosd-dm320/poll/defconfig +++ b/configs/ntosd-dm320/poll/defconfig @@ -352,7 +352,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig index d146c17293..77f922ff67 100644 --- a/configs/ntosd-dm320/thttpd/defconfig +++ b/configs/ntosd-dm320/thttpd/defconfig @@ -340,7 +340,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig index 24ea1fe49f..1f0c2d5c07 100644 --- a/configs/ntosd-dm320/udp/defconfig +++ b/configs/ntosd-dm320/udp/defconfig @@ -340,7 +340,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=8 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/ntosd-dm320/webserver/defconfig b/configs/ntosd-dm320/webserver/defconfig index 4f1b363d1c..a41eb42fdc 100644 --- a/configs/ntosd-dm320/webserver/defconfig +++ b/configs/ntosd-dm320/webserver/defconfig @@ -352,7 +352,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/nucleo-f091rc/nsh/defconfig b/configs/nucleo-f091rc/nsh/defconfig index 54bf325dca..e3c9cadefb 100644 --- a/configs/nucleo-f091rc/nsh/defconfig +++ b/configs/nucleo-f091rc/nsh/defconfig @@ -571,7 +571,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/nucleo-l452re/nsh/defconfig b/configs/nucleo-l452re/nsh/defconfig index 5030287da0..c09ddaf382 100644 --- a/configs/nucleo-l452re/nsh/defconfig +++ b/configs/nucleo-l452re/nsh/defconfig @@ -627,7 +627,7 @@ CONFIG_DEV_RANDOM=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/nucleo-l496zg/nsh/defconfig b/configs/nucleo-l496zg/nsh/defconfig index 4bc74debaf..a048b1c048 100644 --- a/configs/nucleo-l496zg/nsh/defconfig +++ b/configs/nucleo-l496zg/nsh/defconfig @@ -652,7 +652,7 @@ CONFIG_DEV_RANDOM=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/olimex-lpc1766stk/ftpc/defconfig b/configs/olimex-lpc1766stk/ftpc/defconfig index ed46ca4e7f..a39d8ceacc 100644 --- a/configs/olimex-lpc1766stk/ftpc/defconfig +++ b/configs/olimex-lpc1766stk/ftpc/defconfig @@ -453,7 +453,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/hidmouse/defconfig b/configs/olimex-lpc1766stk/hidmouse/defconfig index 0dec1bcdc8..da29b55e98 100644 --- a/configs/olimex-lpc1766stk/hidmouse/defconfig +++ b/configs/olimex-lpc1766stk/hidmouse/defconfig @@ -467,7 +467,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig index 15d885ba0e..20e9abafa1 100644 --- a/configs/olimex-lpc1766stk/nettest/defconfig +++ b/configs/olimex-lpc1766stk/nettest/defconfig @@ -431,7 +431,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig index 60f4e87f7c..44a0c97d2e 100644 --- a/configs/olimex-lpc1766stk/nsh/defconfig +++ b/configs/olimex-lpc1766stk/nsh/defconfig @@ -454,7 +454,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig index e9a9fcd7f4..04137cab7a 100644 --- a/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig @@ -415,7 +415,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig index ec9ade8e7d..714ed7e341 100644 --- a/configs/olimex-lpc1766stk/thttpd-binfs/defconfig +++ b/configs/olimex-lpc1766stk/thttpd-binfs/defconfig @@ -440,7 +440,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig index 74a3e55d2b..bf1693614c 100644 --- a/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig +++ b/configs/olimex-lpc1766stk/thttpd-nxflat/defconfig @@ -431,7 +431,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-lpc1766stk/zmodem/defconfig b/configs/olimex-lpc1766stk/zmodem/defconfig index 51526dd8b5..4fdff449c1 100644 --- a/configs/olimex-lpc1766stk/zmodem/defconfig +++ b/configs/olimex-lpc1766stk/zmodem/defconfig @@ -455,7 +455,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-stm32-e407/discover/defconfig b/configs/olimex-stm32-e407/discover/defconfig index 9a2f223de3..23760ac7b9 100644 --- a/configs/olimex-stm32-e407/discover/defconfig +++ b/configs/olimex-stm32-e407/discover/defconfig @@ -764,7 +764,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-stm32-e407/netnsh/defconfig b/configs/olimex-stm32-e407/netnsh/defconfig index 1969e3f313..17ffb5f783 100644 --- a/configs/olimex-stm32-e407/netnsh/defconfig +++ b/configs/olimex-stm32-e407/netnsh/defconfig @@ -764,7 +764,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-stm32-e407/telnetd/defconfig b/configs/olimex-stm32-e407/telnetd/defconfig index 349bf77be8..6ce58a9247 100644 --- a/configs/olimex-stm32-e407/telnetd/defconfig +++ b/configs/olimex-stm32-e407/telnetd/defconfig @@ -764,7 +764,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-stm32-e407/webserver/defconfig b/configs/olimex-stm32-e407/webserver/defconfig index fa179cb794..c6a7e03b37 100644 --- a/configs/olimex-stm32-e407/webserver/defconfig +++ b/configs/olimex-stm32-e407/webserver/defconfig @@ -764,7 +764,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-stm32-p107/nsh/defconfig b/configs/olimex-stm32-p107/nsh/defconfig index 78dcb93ed4..d6fdc7e496 100644 --- a/configs/olimex-stm32-p107/nsh/defconfig +++ b/configs/olimex-stm32-p107/nsh/defconfig @@ -731,7 +731,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig index 55de4e0d37..2f1c5e6149 100644 --- a/configs/olimex-stm32-p207/nsh/defconfig +++ b/configs/olimex-stm32-p207/nsh/defconfig @@ -794,7 +794,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig index 50d63c8170..4a23d44266 100644 --- a/configs/olimex-strp711/nettest/defconfig +++ b/configs/olimex-strp711/nettest/defconfig @@ -386,7 +386,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/photon/wlan/defconfig b/configs/photon/wlan/defconfig index 1892e56c10..0f5060e846 100644 --- a/configs/photon/wlan/defconfig +++ b/configs/photon/wlan/defconfig @@ -799,7 +799,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 @@ -1601,6 +1601,14 @@ CONFIG_READLINE_ECHO=y # # Wireless Libraries and NSH Add-Ons # + +# +# IEEE 802.15.4 applications +# +# CONFIG_IEEE802154_LIBMAC is not set +# CONFIG_IEEE802154_LIBUTILS is not set +# CONFIG_IEEE802154_I8SAK is not set +# CONFIG_WIRELESS_IWPAN is not set CONFIG_WIRELESS_WAPI=y CONFIG_WIRELESS_WAPI_CMDTOOL=y CONFIG_WIRELESS_WAPI_STACKSIZE=2048 diff --git a/configs/pic32mx-starterkit/nsh2/defconfig b/configs/pic32mx-starterkit/nsh2/defconfig index de8c688ac5..78d7f41287 100644 --- a/configs/pic32mx-starterkit/nsh2/defconfig +++ b/configs/pic32mx-starterkit/nsh2/defconfig @@ -483,7 +483,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/pic32mx7mmb/nsh/defconfig b/configs/pic32mx7mmb/nsh/defconfig index c1a7d79a6f..4951d6041e 100644 --- a/configs/pic32mx7mmb/nsh/defconfig +++ b/configs/pic32mx7mmb/nsh/defconfig @@ -492,7 +492,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sam4e-ek/nsh/defconfig b/configs/sam4e-ek/nsh/defconfig index 1ac7fb3118..7bbdf3723b 100644 --- a/configs/sam4e-ek/nsh/defconfig +++ b/configs/sam4e-ek/nsh/defconfig @@ -521,7 +521,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sam4e-ek/nxwm/defconfig b/configs/sam4e-ek/nxwm/defconfig index 3ab09117e1..2b86e3a1c8 100644 --- a/configs/sam4e-ek/nxwm/defconfig +++ b/configs/sam4e-ek/nxwm/defconfig @@ -531,7 +531,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sam4e-ek/usbnsh/defconfig b/configs/sam4e-ek/usbnsh/defconfig index eebe76056b..e8292655ca 100644 --- a/configs/sam4e-ek/usbnsh/defconfig +++ b/configs/sam4e-ek/usbnsh/defconfig @@ -527,7 +527,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig index 01e56ae986..bad6c2f17f 100644 --- a/configs/sama5d3-xplained/bridge/defconfig +++ b/configs/sama5d3-xplained/bridge/defconfig @@ -548,7 +548,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig index ae4d3b8160..565cd8c324 100644 --- a/configs/sama5d4-ek/bridge/defconfig +++ b/configs/sama5d4-ek/bridge/defconfig @@ -566,7 +566,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig index 06791816be..60d4077d20 100644 --- a/configs/sama5d4-ek/ipv6/defconfig +++ b/configs/sama5d4-ek/ipv6/defconfig @@ -667,7 +667,7 @@ CONFIG_DEV_RANDOM=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig index 4c72b5f9b9..fa51ddcf86 100644 --- a/configs/sama5d4-ek/nsh/defconfig +++ b/configs/sama5d4-ek/nsh/defconfig @@ -667,7 +667,7 @@ CONFIG_DEV_RANDOM=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig index 17907ad732..a47b489608 100644 --- a/configs/sama5d4-ek/nxwm/defconfig +++ b/configs/sama5d4-ek/nxwm/defconfig @@ -641,7 +641,7 @@ CONFIG_DEV_RANDOM=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/same70-xplained/netnsh/defconfig b/configs/same70-xplained/netnsh/defconfig index 2b3cca401d..45b670fc14 100644 --- a/configs/same70-xplained/netnsh/defconfig +++ b/configs/same70-xplained/netnsh/defconfig @@ -540,7 +540,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/samv71-xult/netnsh/defconfig b/configs/samv71-xult/netnsh/defconfig index ca281528ad..2e59f382ba 100644 --- a/configs/samv71-xult/netnsh/defconfig +++ b/configs/samv71-xult/netnsh/defconfig @@ -543,7 +543,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/samv71-xult/vnc/defconfig b/configs/samv71-xult/vnc/defconfig index a413da950f..58de7ce621 100644 --- a/configs/samv71-xult/vnc/defconfig +++ b/configs/samv71-xult/vnc/defconfig @@ -542,7 +542,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=72 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/samv71-xult/vnxwm/defconfig b/configs/samv71-xult/vnxwm/defconfig index 4632730355..1a2738b66b 100644 --- a/configs/samv71-xult/vnxwm/defconfig +++ b/configs/samv71-xult/vnxwm/defconfig @@ -545,7 +545,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=72 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/shenzhou/nsh/defconfig b/configs/shenzhou/nsh/defconfig index 6e20d65f44..8bd378dc89 100644 --- a/configs/shenzhou/nsh/defconfig +++ b/configs/shenzhou/nsh/defconfig @@ -751,7 +751,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/shenzhou/nxwm/defconfig b/configs/shenzhou/nxwm/defconfig index 2370d5377a..e64dfed648 100644 --- a/configs/shenzhou/nxwm/defconfig +++ b/configs/shenzhou/nxwm/defconfig @@ -775,7 +775,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/shenzhou/thttpd/defconfig b/configs/shenzhou/thttpd/defconfig index ce40c66cca..cb5aaf0458 100644 --- a/configs/shenzhou/thttpd/defconfig +++ b/configs/shenzhou/thttpd/defconfig @@ -752,7 +752,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig index c1e7c78898..491923f77e 100644 --- a/configs/sim/nettest/defconfig +++ b/configs/sim/nettest/defconfig @@ -283,7 +283,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sim/sixlowpan/defconfig b/configs/sim/sixlowpan/defconfig index f46639d003..713c8b1f50 100644 --- a/configs/sim/sixlowpan/defconfig +++ b/configs/sim/sixlowpan/defconfig @@ -298,7 +298,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/sim/udgram/defconfig b/configs/sim/udgram/defconfig index 8586c0b34d..1274550b49 100644 --- a/configs/sim/udgram/defconfig +++ b/configs/sim/udgram/defconfig @@ -292,7 +292,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/sim/ustream/defconfig b/configs/sim/ustream/defconfig index 034f8b83c1..8721169286 100644 --- a/configs/sim/ustream/defconfig +++ b/configs/sim/ustream/defconfig @@ -292,7 +292,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -# CONFIG_DRIVERS_IOB is not set +# CONFIG_MM_IOB is not set # CONFIG_DRVR_WRITEBUFFER is not set # CONFIG_DRVR_READAHEAD is not set # CONFIG_RAMDISK is not set diff --git a/configs/stm3220g-eval/dhcpd/defconfig b/configs/stm3220g-eval/dhcpd/defconfig index c46030d14b..9168df6ad7 100644 --- a/configs/stm3220g-eval/dhcpd/defconfig +++ b/configs/stm3220g-eval/dhcpd/defconfig @@ -746,7 +746,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=8 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3220g-eval/nettest/defconfig b/configs/stm3220g-eval/nettest/defconfig index f69886646f..7067e766aa 100644 --- a/configs/stm3220g-eval/nettest/defconfig +++ b/configs/stm3220g-eval/nettest/defconfig @@ -746,7 +746,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3220g-eval/nsh/defconfig b/configs/stm3220g-eval/nsh/defconfig index 253c075c8d..a37ca34d75 100644 --- a/configs/stm3220g-eval/nsh/defconfig +++ b/configs/stm3220g-eval/nsh/defconfig @@ -771,7 +771,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3220g-eval/nsh2/defconfig b/configs/stm3220g-eval/nsh2/defconfig index c437849e01..c0d61540dc 100644 --- a/configs/stm3220g-eval/nsh2/defconfig +++ b/configs/stm3220g-eval/nsh2/defconfig @@ -772,7 +772,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3220g-eval/nxwm/defconfig b/configs/stm3220g-eval/nxwm/defconfig index 55c3649cb2..68a215312e 100644 --- a/configs/stm3220g-eval/nxwm/defconfig +++ b/configs/stm3220g-eval/nxwm/defconfig @@ -792,7 +792,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3220g-eval/telnetd/defconfig b/configs/stm3220g-eval/telnetd/defconfig index 5a842d7721..e1531299a4 100644 --- a/configs/stm3220g-eval/telnetd/defconfig +++ b/configs/stm3220g-eval/telnetd/defconfig @@ -746,7 +746,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/dhcpd/defconfig b/configs/stm3240g-eval/dhcpd/defconfig index e972d6303c..d14a03b0bf 100644 --- a/configs/stm3240g-eval/dhcpd/defconfig +++ b/configs/stm3240g-eval/dhcpd/defconfig @@ -750,7 +750,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=8 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/discover/defconfig b/configs/stm3240g-eval/discover/defconfig index e104292ed2..e55ee92107 100644 --- a/configs/stm3240g-eval/discover/defconfig +++ b/configs/stm3240g-eval/discover/defconfig @@ -769,7 +769,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/nettest/defconfig b/configs/stm3240g-eval/nettest/defconfig index ac3a56be38..c4f9f51a6c 100644 --- a/configs/stm3240g-eval/nettest/defconfig +++ b/configs/stm3240g-eval/nettest/defconfig @@ -750,7 +750,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/nsh/defconfig b/configs/stm3240g-eval/nsh/defconfig index 4557ee9797..d9f65117d5 100644 --- a/configs/stm3240g-eval/nsh/defconfig +++ b/configs/stm3240g-eval/nsh/defconfig @@ -787,7 +787,7 @@ CONFIG_DEV_RANDOM=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/nsh2/defconfig b/configs/stm3240g-eval/nsh2/defconfig index fc1ab20840..63aa6a234b 100644 --- a/configs/stm3240g-eval/nsh2/defconfig +++ b/configs/stm3240g-eval/nsh2/defconfig @@ -776,7 +776,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/nxterm/defconfig b/configs/stm3240g-eval/nxterm/defconfig index 77847443b9..c68bc68be6 100644 --- a/configs/stm3240g-eval/nxterm/defconfig +++ b/configs/stm3240g-eval/nxterm/defconfig @@ -795,7 +795,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/nxwm/defconfig b/configs/stm3240g-eval/nxwm/defconfig index 5e9f7a1306..980d63b0c5 100644 --- a/configs/stm3240g-eval/nxwm/defconfig +++ b/configs/stm3240g-eval/nxwm/defconfig @@ -796,7 +796,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/telnetd/defconfig b/configs/stm3240g-eval/telnetd/defconfig index 742c3f6e6e..d3ea732595 100644 --- a/configs/stm3240g-eval/telnetd/defconfig +++ b/configs/stm3240g-eval/telnetd/defconfig @@ -750,7 +750,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/webserver/defconfig b/configs/stm3240g-eval/webserver/defconfig index 3dc8fbb926..910033f2d9 100644 --- a/configs/stm3240g-eval/webserver/defconfig +++ b/configs/stm3240g-eval/webserver/defconfig @@ -775,7 +775,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm3240g-eval/xmlrpc/defconfig b/configs/stm3240g-eval/xmlrpc/defconfig index 90bd6a6ee4..aa0f34e696 100644 --- a/configs/stm3240g-eval/xmlrpc/defconfig +++ b/configs/stm3240g-eval/xmlrpc/defconfig @@ -764,7 +764,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm32butterfly2/nshnet/defconfig b/configs/stm32butterfly2/nshnet/defconfig index fb61f3a9f6..08cc2425c4 100644 --- a/configs/stm32butterfly2/nshnet/defconfig +++ b/configs/stm32butterfly2/nshnet/defconfig @@ -747,7 +747,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm32f4discovery/ipv6/defconfig b/configs/stm32f4discovery/ipv6/defconfig index 25d5886bbd..7e027d640c 100644 --- a/configs/stm32f4discovery/ipv6/defconfig +++ b/configs/stm32f4discovery/ipv6/defconfig @@ -795,7 +795,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/stm32f4discovery/netnsh/defconfig b/configs/stm32f4discovery/netnsh/defconfig index f11c99eb6a..57050f7dae 100644 --- a/configs/stm32f4discovery/netnsh/defconfig +++ b/configs/stm32f4discovery/netnsh/defconfig @@ -795,7 +795,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/tm4c1294-launchpad/ipv6/defconfig b/configs/tm4c1294-launchpad/ipv6/defconfig index e77c8b7e32..422e5b40be 100644 --- a/configs/tm4c1294-launchpad/ipv6/defconfig +++ b/configs/tm4c1294-launchpad/ipv6/defconfig @@ -494,7 +494,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/tm4c1294-launchpad/nsh/defconfig b/configs/tm4c1294-launchpad/nsh/defconfig index 7ccb18b26c..7ce75c3e86 100644 --- a/configs/tm4c1294-launchpad/nsh/defconfig +++ b/configs/tm4c1294-launchpad/nsh/defconfig @@ -494,7 +494,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/twr-k64f120m/netnsh/defconfig b/configs/twr-k64f120m/netnsh/defconfig index 1bd65b87c2..ead54aade6 100644 --- a/configs/twr-k64f120m/netnsh/defconfig +++ b/configs/twr-k64f120m/netnsh/defconfig @@ -509,7 +509,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=36 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/u-blox-c027/nsh/defconfig b/configs/u-blox-c027/nsh/defconfig index da3f3a030c..68b549e9f6 100644 --- a/configs/u-blox-c027/nsh/defconfig +++ b/configs/u-blox-c027/nsh/defconfig @@ -461,7 +461,7 @@ CONFIG_DEV_ZERO=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/viewtool-stm32f107/netnsh/defconfig b/configs/viewtool-stm32f107/netnsh/defconfig index 4b16b79f03..e422e035c8 100644 --- a/configs/viewtool-stm32f107/netnsh/defconfig +++ b/configs/viewtool-stm32f107/netnsh/defconfig @@ -743,7 +743,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/zkit-arm-1769/hello/defconfig b/configs/zkit-arm-1769/hello/defconfig index b8e92733f7..aee6780233 100644 --- a/configs/zkit-arm-1769/hello/defconfig +++ b/configs/zkit-arm-1769/hello/defconfig @@ -431,7 +431,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/zkit-arm-1769/nsh/defconfig b/configs/zkit-arm-1769/nsh/defconfig index 7d896929d8..7f6021ea8e 100644 --- a/configs/zkit-arm-1769/nsh/defconfig +++ b/configs/zkit-arm-1769/nsh/defconfig @@ -454,7 +454,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/zkit-arm-1769/nxhello/defconfig b/configs/zkit-arm-1769/nxhello/defconfig index b0c578902c..372619e563 100644 --- a/configs/zkit-arm-1769/nxhello/defconfig +++ b/configs/zkit-arm-1769/nxhello/defconfig @@ -454,7 +454,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/configs/zkit-arm-1769/thttpd/defconfig b/configs/zkit-arm-1769/thttpd/defconfig index 2846f29834..0866830194 100644 --- a/configs/zkit-arm-1769/thttpd/defconfig +++ b/configs/zkit-arm-1769/thttpd/defconfig @@ -431,7 +431,7 @@ CONFIG_DEV_NULL=y # # Common I/O Buffer Support # -CONFIG_DRIVERS_IOB=y +CONFIG_MM_IOB=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_BUFSIZE=196 CONFIG_IOB_NCHAINS=8 diff --git a/drivers/Kconfig b/drivers/Kconfig index fa200e17d4..d7bc265374 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -98,8 +98,6 @@ source drivers/loop/Kconfig menu "Buffering" -source "drivers/iob/Kconfig" - config DRVR_WRITEBUFFER bool "Enable write buffer support" default n diff --git a/drivers/Makefile b/drivers/Makefile index 1de5f4d133..5946cc123a 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -54,7 +54,6 @@ include audio$(DELIM)Make.defs include bch$(DELIM)Make.defs include i2c$(DELIM)Make.defs include input$(DELIM)Make.defs -include iob$(DELIM)Make.defs include ioexpander$(DELIM)Make.defs include lcd$(DELIM)Make.defs include leds$(DELIM)Make.defs diff --git a/drivers/README.txt b/drivers/README.txt index ad4e25f642..f9f23af06f 100644 --- a/drivers/README.txt +++ b/drivers/README.txt @@ -74,10 +74,6 @@ eeprom/ interface but instead use the simple character interface provided by the EEPROM drivers. -iob/ - Common driver I/O buffer support. Used primarily by networking and - network-related drivers but available for any usage. - i2c/ I2C drivers and support logic. See include/nuttx/i2c/i2c_master.h diff --git a/drivers/wireless/ieee802154/mrf24j40.c b/drivers/wireless/ieee802154/mrf24j40.c index 8283278d3c..e4553a3b8c 100644 --- a/drivers/wireless/ieee802154/mrf24j40.c +++ b/drivers/wireless/ieee802154/mrf24j40.c @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include diff --git a/include/nuttx/drivers/iob.h b/include/nuttx/mm/iob.h similarity index 98% rename from include/nuttx/drivers/iob.h rename to include/nuttx/mm/iob.h index 486c56761b..75e5186c7e 100644 --- a/include/nuttx/drivers/iob.h +++ b/include/nuttx/mm/iob.h @@ -1,5 +1,5 @@ /**************************************************************************** - * include/nuttx/drivers/iob.h + * include/nuttx/mm/iob.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef _INCLUDE_NUTTX_DRIVERS_IOB_H -#define _INCLUDE_NUTTX_DRIVERS_IOB_H +#ifndef _INCLUDE_NUTTX_MM_IOB_H +#define _INCLUDE_NUTTX_MM_IOB_H /**************************************************************************** * Included Files @@ -45,7 +45,7 @@ #include #include -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /**************************************************************************** * Pre-processor Definitions @@ -420,6 +420,6 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len, # define iob_dump(wrb) #endif -#endif /* CONFIG_DRIVERS_IOB */ -#endif /* _INCLUDE_NUTTX_DRIVERS_IOB_H */ +#endif /* CONFIG_MM_IOB */ +#endif /* _INCLUDE_NUTTX_MM_IOB_H */ diff --git a/include/nuttx/net/sixlowpan.h b/include/nuttx/net/sixlowpan.h index a99f0e5e67..45395d1c29 100644 --- a/include/nuttx/net/sixlowpan.h +++ b/include/nuttx/net/sixlowpan.h @@ -55,7 +55,7 @@ #include #include -#include +#include #include #include diff --git a/mm/Kconfig b/mm/Kconfig index 8cba9265ea..4c386022c4 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -158,4 +158,4 @@ config MM_SHM Build in support for the shared memory interfaces shmget(), shmat(), shmctl(), and shmdt(). - +source "mm/iob/Kconfig" diff --git a/mm/Makefile b/mm/Makefile index 752a6c0f49..6126ea1c64 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -61,6 +61,7 @@ include umm_heap/Make.defs include kmm_heap/Make.defs include mm_gran/Make.defs include shm/Make.defs +include iob/Make.defs BINDIR ?= bin diff --git a/mm/README.txt b/mm/README.txt index f33cf49c80..52e6c3cd3a 100644 --- a/mm/README.txt +++ b/mm/README.txt @@ -153,3 +153,15 @@ This directory contains the NuttX memory management logic. This include: The shared memory management logic has its own README file that can be found at nuttx/mm/shm/README.txt. + +5) I/O Buffers + + The iob subdirectory contains a simple allocator of I/O buffers. These + I/O buffers, IOBs, are used extensively for networking but are generally + available for usage by drivers. The I/O buffers have these properties: + + 1. Uses a pool of a fixed number of fixed fixed size buffers. + 2. Free buffers are retained in free list: When a buffer is allocated + it is removed from the free list; when a buffer is freed it is + returned to the free list. + 3. The calling application will wait if there are not free buffers. diff --git a/drivers/iob/Kconfig b/mm/iob/Kconfig similarity index 96% rename from drivers/iob/Kconfig rename to mm/iob/Kconfig index e5368681d5..3d603fde38 100644 --- a/drivers/iob/Kconfig +++ b/mm/iob/Kconfig @@ -3,16 +3,16 @@ # see the file kconfig-language.txt in the NuttX tools repository. # -menu "Common I/O Buffer Support" +menu "Common I/O Buffer Support" -config DRIVERS_IOB +config MM_IOB bool "Enable generic I/O buffer support" default n ---help--- This setting will build the common I/O buffer (IOB) support library. -if DRIVERS_IOB +if MM_IOB config IOB_NBUFFERS int "Number of pre-allocated I/O buffers" @@ -70,5 +70,5 @@ config IOB_DEBUG if you are debugging the I/O buffer logic and do not want to get overloaded with other un-related debug output. -endif # DRIVERS_IOB +endif # MM_IOB endmenu # Common I/O buffer support diff --git a/drivers/iob/Make.defs b/mm/iob/Make.defs similarity index 96% rename from drivers/iob/Make.defs rename to mm/iob/Make.defs index ba74e8e578..7c08edd7fb 100644 --- a/drivers/iob/Make.defs +++ b/mm/iob/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# drivers/iob/Make.defs +# mm/iob/Make.defs # # Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -33,7 +33,7 @@ # ############################################################################ -ifeq ($(CONFIG_DRIVERS_IOB),y) +ifeq ($(CONFIG_MM_IOB),y) # Include IOB source files @@ -51,6 +51,6 @@ endif DEPPATH += --dep-path iob VPATH += :iob -CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)iob} +CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)mm$(DELIM)iob} endif diff --git a/drivers/iob/iob.h b/mm/iob/iob.h similarity index 96% rename from drivers/iob/iob.h rename to mm/iob/iob.h index 30f2310272..5f4436980c 100644 --- a/drivers/iob/iob.h +++ b/mm/iob/iob.h @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob.h + * mm/iob/iob.h * * Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __DRIVERS_IOB_IOB_H -#define __DRIVERS_IOB_IOB_H 1 +#ifndef __MM_IOB_IOB_H +#define __MM_IOB_IOB_H 1 /**************************************************************************** * Included Files @@ -45,9 +45,9 @@ #include #include -#include +#include -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /**************************************************************************** * Pre-processor Definitions @@ -146,5 +146,6 @@ FAR struct iob_qentry_s *iob_tryalloc_qentry(void); FAR struct iob_qentry_s *iob_free_qentry(FAR struct iob_qentry_s *iobq); -#endif /* CONFIG_DRIVERS_IOB */ -#endif /* __DRIVERS_IOB_IOB_H */ +#endif /* CONFIG_MM_IOB */ +#endif /* __MM_IOB_IOB_H */ + diff --git a/drivers/iob/iob_add_queue.c b/mm/iob/iob_add_queue.c similarity index 98% rename from drivers/iob/iob_add_queue.c rename to mm/iob/iob_add_queue.c index a2f3376208..d2c40cc6b7 100644 --- a/drivers/iob/iob_add_queue.c +++ b/mm/iob/iob_add_queue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_add_queue.c + * mm/iob/iob_add_queue.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -43,7 +43,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_alloc.c b/mm/iob/iob_alloc.c similarity index 99% rename from drivers/iob/iob_alloc.c rename to mm/iob/iob_alloc.c index 9fc938d7ed..a1c4d6de97 100644 --- a/drivers/iob/iob_alloc.c +++ b/mm/iob/iob_alloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_alloc.c + * mm/iob/iob_alloc.c * * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_alloc_qentry.c b/mm/iob/iob_alloc_qentry.c similarity index 99% rename from drivers/iob/iob_alloc_qentry.c rename to mm/iob/iob_alloc_qentry.c index 147f1f8328..a1d4044bc4 100644 --- a/drivers/iob/iob_alloc_qentry.c +++ b/mm/iob/iob_alloc_qentry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_alloc_qentry.c + * mm/iob/iob_alloc_qentry.c * * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_clone.c b/mm/iob/iob_clone.c similarity index 98% rename from drivers/iob/iob_clone.c rename to mm/iob/iob_clone.c index bbd2450280..8b3754b482 100644 --- a/drivers/iob/iob_clone.c +++ b/mm/iob/iob_clone.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_copy.c + * mm/iob/iob_copy.c * * Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_concat.c b/mm/iob/iob_concat.c similarity index 97% rename from drivers/iob/iob_concat.c rename to mm/iob/iob_concat.c index 8c9325ee53..4829c3b072 100644 --- a/drivers/iob/iob_concat.c +++ b/mm/iob/iob_concat.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_concat.c + * mm/iob/iob_concat.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_contig.c b/mm/iob/iob_contig.c similarity index 98% rename from drivers/iob/iob_contig.c rename to mm/iob/iob_contig.c index af2bc40db7..ee71ec05fc 100644 --- a/drivers/iob/iob_contig.c +++ b/mm/iob/iob_contig.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_contig.c + * mm/iob/iob_contig.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_copyin.c b/mm/iob/iob_copyin.c similarity index 99% rename from drivers/iob/iob_copyin.c rename to mm/iob/iob_copyin.c index 8a5732cb94..5c1b8894e3 100644 --- a/drivers/iob/iob_copyin.c +++ b/mm/iob/iob_copyin.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_copyin.c + * mm/iob/iob_copyin.c * * Copyright (C) 2014, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_copyout.c b/mm/iob/iob_copyout.c similarity index 98% rename from drivers/iob/iob_copyout.c rename to mm/iob/iob_copyout.c index 4b8c4e243c..c805a02657 100644 --- a/drivers/iob/iob_copyout.c +++ b/mm/iob/iob_copyout.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_copyout.c + * mm/iob/iob_copyout.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -43,7 +43,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_dump.c b/mm/iob/iob_dump.c similarity index 98% rename from drivers/iob/iob_dump.c rename to mm/iob/iob_dump.c index e2f72edb8d..c84dd4b110 100644 --- a/drivers/iob/iob_dump.c +++ b/mm/iob/iob_dump.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_dump.c + * mm/iob/iob_dump.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_free.c b/mm/iob/iob_free.c similarity index 98% rename from drivers/iob/iob_free.c rename to mm/iob/iob_free.c index d2a67d9758..75a01cf89b 100644 --- a/drivers/iob/iob_free.c +++ b/mm/iob/iob_free.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_free.c + * mm/iob/iob_free.c * * Copyright (C) 2014, 2016-2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -45,7 +45,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_free_chain.c b/mm/iob/iob_free_chain.c similarity index 97% rename from drivers/iob/iob_free_chain.c rename to mm/iob/iob_free_chain.c index 75c69a3f13..d27a64dc15 100644 --- a/drivers/iob/iob_free_chain.c +++ b/mm/iob/iob_free_chain.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_free_chain.c + * mm/iob/iob_free_chain.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -40,7 +40,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_free_qentry.c b/mm/iob/iob_free_qentry.c similarity index 98% rename from drivers/iob/iob_free_qentry.c rename to mm/iob/iob_free_qentry.c index 402d4e76ac..393f0ee47b 100644 --- a/drivers/iob/iob_free_qentry.c +++ b/mm/iob/iob_free_qentry.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_free_qentry.c + * mm/iob/iob_free_qentry.c * * Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -44,7 +44,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_free_queue.c b/mm/iob/iob_free_queue.c similarity index 98% rename from drivers/iob/iob_free_queue.c rename to mm/iob/iob_free_queue.c index 953182b5c6..dc436230e8 100644 --- a/drivers/iob/iob_free_queue.c +++ b/mm/iob/iob_free_queue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_free_queue.c + * mm/iob/iob_free_queue.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_initialize.c b/mm/iob/iob_initialize.c similarity index 98% rename from drivers/iob/iob_initialize.c rename to mm/iob/iob_initialize.c index 423f90898c..1662fe4772 100644 --- a/drivers/iob/iob_initialize.c +++ b/mm/iob/iob_initialize.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_initialize.c + * mm/iob/iob_initialize.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_pack.c b/mm/iob/iob_pack.c similarity index 98% rename from drivers/iob/iob_pack.c rename to mm/iob/iob_pack.c index 0a2b0f66c5..62799b2238 100644 --- a/drivers/iob/iob_pack.c +++ b/mm/iob/iob_pack.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_pack.c + * mm/iob/iob_pack.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_peek_queue.c b/mm/iob/iob_peek_queue.c similarity index 98% rename from drivers/iob/iob_peek_queue.c rename to mm/iob/iob_peek_queue.c index 7bc81bfa12..b1151be121 100644 --- a/drivers/iob/iob_peek_queue.c +++ b/mm/iob/iob_peek_queue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_peek_queue.c + * mm/iob/iob_peek_queue.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_remove_queue.c b/mm/iob/iob_remove_queue.c similarity index 98% rename from drivers/iob/iob_remove_queue.c rename to mm/iob/iob_remove_queue.c index 4bfbca3056..49e93d765d 100644 --- a/drivers/iob/iob_remove_queue.c +++ b/mm/iob/iob_remove_queue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_remove_queue.c + * mm/iob/iob_remove_queue.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -41,7 +41,7 @@ #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_test.c b/mm/iob/iob_test.c similarity index 99% rename from drivers/iob/iob_test.c rename to mm/iob/iob_test.c index ee6b90d886..b3b2ff9a45 100644 --- a/drivers/iob/iob_test.c +++ b/mm/iob/iob_test.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_test.c + * mm/iob/iob_test.c * Unit test driver. This is of historical interest only since it requires * and custom build setup and modifications to the iob source and header * files. diff --git a/drivers/iob/iob_trimhead.c b/mm/iob/iob_trimhead.c similarity index 98% rename from drivers/iob/iob_trimhead.c rename to mm/iob/iob_trimhead.c index 938c040711..0373c5dd8f 100644 --- a/drivers/iob/iob_trimhead.c +++ b/mm/iob/iob_trimhead.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_trimhead.c + * mm/iob/iob_trimhead.c * * Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_trimhead_queue.c b/mm/iob/iob_trimhead_queue.c similarity index 98% rename from drivers/iob/iob_trimhead_queue.c rename to mm/iob/iob_trimhead_queue.c index 7ba393366f..2177720da7 100644 --- a/drivers/iob/iob_trimhead_queue.c +++ b/mm/iob/iob_trimhead_queue.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_trimhead_queue.c + * mm/iob/iob_trimhead_queue.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/drivers/iob/iob_trimtail.c b/mm/iob/iob_trimtail.c similarity index 98% rename from drivers/iob/iob_trimtail.c rename to mm/iob/iob_trimtail.c index b876de1552..1e2804f4c5 100644 --- a/drivers/iob/iob_trimtail.c +++ b/mm/iob/iob_trimtail.c @@ -1,5 +1,5 @@ /**************************************************************************** - * drivers/iob/iob_trimtail.c + * mm/iob/iob_trimtail.c * * Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -42,7 +42,7 @@ #include #include -#include +#include #include "iob.h" diff --git a/net/devif/Make.defs b/net/devif/Make.defs index fb16f653ba..f46aa5c26a 100644 --- a/net/devif/Make.defs +++ b/net/devif/Make.defs @@ -50,7 +50,7 @@ endif # I/O buffer chain support required? -ifeq ($(CONFIG_DRIVERS_IOB),y) +ifeq ($(CONFIG_MM_IOB),y) NET_CSRCS += devif_iobsend.c endif diff --git a/net/devif/devif.h b/net/devif/devif.h index baa1644c63..df45f7d8be 100644 --- a/net/devif/devif.h +++ b/net/devif/devif.h @@ -466,7 +466,7 @@ void devif_send(FAR struct net_driver_s *dev, FAR const void *buf, int len); * ****************************************************************************/ -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB struct iob_s; void devif_iob_send(FAR struct net_driver_s *dev, FAR struct iob_s *buf, unsigned int len, unsigned int offset); diff --git a/net/devif/devif_iobsend.c b/net/devif/devif_iobsend.c index ff4b4e8433..5575a2b60c 100644 --- a/net/devif/devif_iobsend.c +++ b/net/devif/devif_iobsend.c @@ -43,10 +43,10 @@ #include #include -#include +#include #include -#ifdef CONFIG_DRIVERS_IOB +#ifdef CONFIG_MM_IOB /**************************************************************************** * Pre-processor Definitions @@ -113,5 +113,5 @@ void devif_iob_send(FAR struct net_driver_s *dev, FAR struct iob_s *iob, #endif } -#endif /* CONFIG_DRIVERS_IOB */ +#endif /* CONFIG_MM_IOB */ diff --git a/net/sixlowpan/sixlowpan_framer.c b/net/sixlowpan/sixlowpan_framer.c index d52a5cd30c..eef8583dd3 100644 --- a/net/sixlowpan/sixlowpan_framer.c +++ b/net/sixlowpan/sixlowpan_framer.c @@ -72,7 +72,7 @@ * ****************************************************************************/ -static bool sixlowpan_anyaddrnull(FAR uint8_t *addr, uint8_t addrlen) +static bool sixlowpan_anyaddrnull(FAR const uint8_t *addr, uint8_t addrlen) { while (addrlen-- > 0) { diff --git a/net/socket/recvfrom.c b/net/socket/recvfrom.c index 4a3ad32234..ab16ee9c66 100644 --- a/net/socket/recvfrom.c +++ b/net/socket/recvfrom.c @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/tcp/Kconfig b/net/tcp/Kconfig index 00f2519c3c..fac41794dc 100644 --- a/net/tcp/Kconfig +++ b/net/tcp/Kconfig @@ -70,7 +70,7 @@ config NET_MAX_LISTENPORTS config NET_TCP_READAHEAD bool "Enable TCP/IP read-ahead buffering" default y - select DRIVERS_IOB + select MM_IOB ---help--- Read-ahead buffers allows buffering of TCP/IP packets when there is no receive in place to catch the TCP packet. In that case, the packet @@ -91,7 +91,7 @@ endif # NET_TCP_READAHEAD config NET_TCP_WRITE_BUFFERS bool "Enable TCP/IP write buffering" default n - select DRIVERS_IOB + select MM_IOB ---help--- Write buffers allows buffering of ongoing TCP/IP packets, providing for higher performance, streamed output. diff --git a/net/tcp/tcp.h b/net/tcp/tcp.h index 54808a3075..8d25bf6ff0 100644 --- a/net/tcp/tcp.h +++ b/net/tcp/tcp.h @@ -45,7 +45,7 @@ #include #include -#include +#include #include #if defined(CONFIG_NET_TCP) && !defined(CONFIG_NET_TCP_NO_STACK) diff --git a/net/tcp/tcp_callback.c b/net/tcp/tcp_callback.c index 5c467bae29..3a16c86d03 100644 --- a/net/tcp/tcp_callback.c +++ b/net/tcp/tcp_callback.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include diff --git a/net/tcp/tcp_send_buffered.c b/net/tcp/tcp_send_buffered.c index 4000d694df..f88b9d5f2b 100644 --- a/net/tcp/tcp_send_buffered.c +++ b/net/tcp/tcp_send_buffered.c @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/net/tcp/tcp_wrbuffer.c b/net/tcp/tcp_wrbuffer.c index a74ee6f3a1..2a4b7c65ca 100644 --- a/net/tcp/tcp_wrbuffer.c +++ b/net/tcp/tcp_wrbuffer.c @@ -55,7 +55,7 @@ #include #include -#include +#include #include "tcp/tcp.h" diff --git a/net/tcp/tcp_wrbuffer_dump.c b/net/tcp/tcp_wrbuffer_dump.c index 7e961278d1..ad92bfb904 100644 --- a/net/tcp/tcp_wrbuffer_dump.c +++ b/net/tcp/tcp_wrbuffer_dump.c @@ -42,7 +42,7 @@ #include #include -#include +#include #include "tcp/tcp.h" diff --git a/net/udp/Kconfig b/net/udp/Kconfig index e8c5d53b2f..a4a16fde08 100644 --- a/net/udp/Kconfig +++ b/net/udp/Kconfig @@ -60,7 +60,7 @@ config NET_RXAVAIL config NET_UDP_READAHEAD bool "Enable UDP/IP read-ahead buffering" default y - select DRIVERS_IOB + select MM_IOB endif # NET_UDP && !NET_UDP_NO_STACK endmenu # UDP Networking diff --git a/net/udp/udp.h b/net/udp/udp.h index 73ac15fbaf..83197afae3 100644 --- a/net/udp/udp.h +++ b/net/udp/udp.h @@ -48,7 +48,7 @@ #include #ifdef CONFIG_NET_UDP_READAHEAD -# include +# include #endif #if defined(CONFIG_NET_UDP) && !defined(CONFIG_NET_UDP_NO_STACK) diff --git a/wireless/ieee802154/Kconfig b/wireless/ieee802154/Kconfig index ff64c06d84..670ea474f3 100644 --- a/wireless/ieee802154/Kconfig +++ b/wireless/ieee802154/Kconfig @@ -6,7 +6,7 @@ config WIRELESS_IEEE802154 bool "IEEE 802.15.4 Wireless Support" default n - select DRIVERS_IOB + select MM_IOB ---help--- Enables support for the IEEE 802.14.5 Wireless library. diff --git a/wireless/ieee802154/mac802154.c b/wireless/ieee802154/mac802154.c index 1da758082c..738eb47f30 100644 --- a/wireless/ieee802154/mac802154.c +++ b/wireless/ieee802154/mac802154.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/wireless/ieee802154/mac802154_device.c b/wireless/ieee802154/mac802154_device.c index a4eb93b656..21aae1c50f 100644 --- a/wireless/ieee802154/mac802154_device.c +++ b/wireless/ieee802154/mac802154_device.c @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include diff --git a/wireless/ieee802154/mac802154_indalloc.c b/wireless/ieee802154/mac802154_indalloc.c index 5e05c5c09e..375cda69aa 100644 --- a/wireless/ieee802154/mac802154_indalloc.c +++ b/wireless/ieee802154/mac802154_indalloc.c @@ -44,7 +44,7 @@ #include -#include +#include #include diff --git a/wireless/ieee802154/mac802154_netdev.c b/wireless/ieee802154/mac802154_netdev.c index f510cf7f5d..b09ea4493c 100644 --- a/wireless/ieee802154/mac802154_netdev.c +++ b/wireless/ieee802154/mac802154_netdev.c @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include