[riot-commits] [RIOT-OS/RIOT] 29842b: netdev2: rename to netdev and remove `gnrc_netdev`

Kaspar Schleiser kaspar at schleiser.de
Wed Mar 15 11:35:21 CET 2017


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: 29842bb5e46b75607c3144dc82e05af746ab7a35
      https://github.com/RIOT-OS/RIOT/commit/29842bb5e46b75607c3144dc82e05af746ab7a35
  Author: Martine Lenders <m.lenders at fu-berlin.de>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M Makefile.dep
    M README.md
    M boards/cc2538dk/Makefile.dep
    M boards/native/Makefile.dep
    M boards/openmote-cc2538/Makefile.dep
    M boards/remote-common/Makefile.dep
    M cpu/cc2538/include/cc2538_rf.h
    M cpu/cc2538/include/cc2538_rf_netdev.h
    M cpu/cc2538/radio/cc2538_rf.c
    M cpu/cc2538/radio/cc2538_rf_netdev.c
    M cpu/native/Makefile
    M cpu/native/README.md
    R cpu/native/include/netdev2_tap.h
    R cpu/native/include/netdev2_tap_params.h
    A cpu/native/include/netdev_tap.h
    A cpu/native/include/netdev_tap_params.h
    M cpu/native/native_cpu.c
    R cpu/native/netdev2_tap/Makefile
    R cpu/native/netdev2_tap/netdev2_tap.c
    A cpu/native/netdev_tap/Makefile
    A cpu/native/netdev_tap/netdev_tap.c
    M cpu/native/startup.c
    M cpu/nrf5x_common/include/nrfmin.h
    M cpu/nrf5x_common/include/nrfmin_gnrc.h
    M cpu/nrf5x_common/radio/nrfmin/nrfmin.c
    M cpu/nrf5x_common/radio/nrfmin/nrfmin_gnrc.c
    M dist/tools/ethos/README.md
    M doc/doxygen/src/getting-started.md
    M doc/doxygen/src/riot-gnrc.svg
    M doc/doxygen/src/riot-structure.svg
    M drivers/Makefile.dep
    M drivers/at86rf2xx/at86rf2xx.c
    M drivers/at86rf2xx/at86rf2xx_netdev.c
    M drivers/at86rf2xx/include/at86rf2xx_netdev.h
    A drivers/cc110x/cc110x-netdev.c
    R drivers/cc110x/cc110x-netdev2.c
    R drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c
    A drivers/cc110x/gnrc_cc110x/gnrc_netdev_cc110x.c
    A drivers/cc110x/include/cc110x-netdev.h
    R drivers/cc110x/include/cc110x-netdev2.h
    R drivers/cc110x/include/gnrc_netdev2_cc110x.h
    A drivers/cc110x/include/gnrc_netdev_cc110x.h
    M drivers/cc2420/cc2420.c
    M drivers/cc2420/cc2420_netdev.c
    M drivers/cc2420/include/cc2420_netdev.h
    M drivers/enc28j60/enc28j60.c
    M drivers/encx24j600/encx24j600.c
    M drivers/ethos/ethos.c
    M drivers/include/at86rf2xx.h
    M drivers/include/cc2420.h
    M drivers/include/enc28j60.h
    M drivers/include/encx24j600.h
    M drivers/include/ethos.h
    M drivers/include/kw2xrf.h
    M drivers/include/mrf24j40.h
    A drivers/include/net/netdev.h
    A drivers/include/net/netdev/eth.h
    A drivers/include/net/netdev/ieee802154.h
    R drivers/include/net/netdev2.h
    R drivers/include/net/netdev2/eth.h
    R drivers/include/net/netdev2/ieee802154.h
    M drivers/include/w5100.h
    M drivers/include/xbee.h
    M drivers/kw2xrf/include/kw2xrf_netdev.h
    M drivers/kw2xrf/kw2xrf.c
    M drivers/kw2xrf/kw2xrf_netdev.c
    M drivers/mrf24j40/include/mrf24j40_netdev.h
    M drivers/mrf24j40/mrf24j40.c
    M drivers/mrf24j40/mrf24j40_getset.c
    M drivers/mrf24j40/mrf24j40_netdev.c
    R drivers/netdev2_eth/Makefile
    R drivers/netdev2_eth/netdev2_eth.c
    R drivers/netdev2_ieee802154/Makefile
    R drivers/netdev2_ieee802154/netdev2_ieee802154.c
    A drivers/netdev_eth/Makefile
    A drivers/netdev_eth/netdev_eth.c
    A drivers/netdev_ieee802154/Makefile
    A drivers/netdev_ieee802154/netdev_ieee802154.c
    M drivers/w5100/w5100.c
    M drivers/xbee/xbee.c
    M examples/gnrc_border_router/Makefile
    M examples/gnrc_border_router/README.md
    M pkg/emb6/Makefile.dep
    M pkg/emb6/Makefile.include
    M pkg/emb6/contrib/board_conf.c
    A pkg/emb6/contrib/netdev/Makefile
    A pkg/emb6/contrib/netdev/emb6_netdev.c
    R pkg/emb6/contrib/netdev2/Makefile
    R pkg/emb6/contrib/netdev2/emb6_netdev2.c
    M pkg/emb6/contrib/target.c
    A pkg/emb6/include/emb6/netdev.h
    R pkg/emb6/include/emb6/netdev2.h
    M pkg/lwip/Makefile.include
    M pkg/lwip/contrib/lwip.c
    A pkg/lwip/contrib/netdev/Makefile
    A pkg/lwip/contrib/netdev/lwip_netdev.c
    R pkg/lwip/contrib/netdev2/Makefile
    R pkg/lwip/contrib/netdev2/lwip_netdev2.c
    A pkg/lwip/include/lwip/netif/netdev.h
    R pkg/lwip/include/lwip/netif/netdev2.h
    M pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c
    M release-notes.txt
    M sys/Makefile
    M sys/auto_init/auto_init.c
    M sys/auto_init/netif/auto_init_at86rf2xx.c
    M sys/auto_init/netif/auto_init_cc110x.c
    M sys/auto_init/netif/auto_init_cc2420.c
    M sys/auto_init/netif/auto_init_cc2538_rf.c
    M sys/auto_init/netif/auto_init_enc28j60.c
    M sys/auto_init/netif/auto_init_encx24j600.c
    M sys/auto_init/netif/auto_init_ethos.c
    M sys/auto_init/netif/auto_init_kw2xrf.c
    M sys/auto_init/netif/auto_init_mrf24j40.c
    R sys/auto_init/netif/auto_init_netdev2_tap.c
    A sys/auto_init/netif/auto_init_netdev_tap.c
    M sys/auto_init/netif/auto_init_slip.c
    M sys/auto_init/netif/auto_init_w5100.c
    M sys/auto_init/netif/auto_init_xbee.c
    M sys/include/net/csma_sender.h
    M sys/include/net/gnrc.h
    M sys/include/net/gnrc/mac/internal.h
    M sys/include/net/gnrc/netdev.h
    A sys/include/net/gnrc/netdev/eth.h
    A sys/include/net/gnrc/netdev/ieee802154.h
    A sys/include/net/gnrc/netdev/xbee_adpt.h
    R sys/include/net/gnrc/netdev2.h
    R sys/include/net/gnrc/netdev2/eth.h
    R sys/include/net/gnrc/netdev2/ieee802154.h
    R sys/include/net/gnrc/netdev2/xbee_adpt.h
    R sys/include/net/netdev2_test.h
    A sys/include/net/netdev_test.h
    M sys/include/net/netopt.h
    M sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
    A sys/net/gnrc/link_layer/netdev/Makefile
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev.c
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev_eth.c
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev_ieee802154.c
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev_xbee.c
    R sys/net/gnrc/link_layer/netdev2/Makefile
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_ieee802154.c
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_xbee.c
    M sys/net/link_layer/csma_sender/csma_sender.c
    R sys/net/netdev2_test/Makefile
    R sys/net/netdev2_test/netdev2_test.c
    A sys/net/netdev_test/Makefile
    A sys/net/netdev_test/netdev_test.c
    M tests/driver_at86rf2xx/cmd.c
    M tests/driver_at86rf2xx/common.h
    M tests/driver_at86rf2xx/main.c
    M tests/driver_at86rf2xx/recv.c
    M tests/driver_enc28j60/Makefile
    M tests/driver_encx24j600/Makefile
    M tests/driver_xbee/Makefile
    M tests/emb6/main.c
    M tests/lwip/Makefile
    M tests/lwip_sock_ip/Makefile
    M tests/lwip_sock_ip/README.md
    M tests/lwip_sock_ip/stack.c
    M tests/lwip_sock_tcp/Makefile
    M tests/lwip_sock_tcp/README.md
    M tests/lwip_sock_udp/Makefile
    M tests/lwip_sock_udp/README.md
    M tests/lwip_sock_udp/stack.c
    R tests/netdev2_test/Makefile
    R tests/netdev2_test/main.c
    A tests/netdev_test/Makefile
    A tests/netdev_test/main.c

  Log Message:
  -----------
  netdev2: rename to netdev and remove `gnrc_netdev`

With some minor hand-edits I used the following chain of commands:

```sh
git rm sys/include/net/gnrc/netdev.h
git grep --name-only -i netdev2 | \
  xargs sed -i -e 's/^\(NETDEV\)2\(.*\)\( [("]\)/\1\2 \3/g' \
               -e 's/\(netdev\)2\(.*\)\( \/\*\*<\)/\1\2 \3/I' \
               -e 's/\(netdev\)2/\1/gI'
git add -p
git commit --amend
git ls-tree --full-tree -r HEAD --name-only | \
  grep "netdev2" | xargs -I'{}' dirname '{}' | uniq | \
  grep "netdev2" | while read dir; do
          new_dir="$(echo "$dir" | sed "s/netdev2/netdev/g")"
          git mv -f "$dir" "$new_dir"
  done
git commit --amend
git ls-tree --full-tree -r HEAD --name-only | \
  grep "netdev2" | while read file; do
          new_file="$(echo "$file" | sed "s/netdev2/netdev/g")"
          git mv -f "$file" "$new_file"
  done
git commit --amend
git grep --name-only "\<drivers_netdev_netdev\>" | \
  xargs sed -i "s/\<drivers_netdev_netdev\>/drivers_netdev_api/g"
git add -p
git commit --amend
```


  Commit: 119fc70075c9218615f76bce58be1ec75172b841
      https://github.com/RIOT-OS/RIOT/commit/119fc70075c9218615f76bce58be1ec75172b841
  Author: Kaspar Schleiser <kaspar at schleiser.de>
  Date:   2017-03-15 (Wed, 15 Mar 2017)

  Changed paths:
    M Makefile.dep
    M README.md
    M boards/cc2538dk/Makefile.dep
    M boards/native/Makefile.dep
    M boards/openmote-cc2538/Makefile.dep
    M boards/remote-common/Makefile.dep
    M cpu/cc2538/include/cc2538_rf.h
    M cpu/cc2538/include/cc2538_rf_netdev.h
    M cpu/cc2538/radio/cc2538_rf.c
    M cpu/cc2538/radio/cc2538_rf_netdev.c
    M cpu/native/Makefile
    M cpu/native/README.md
    R cpu/native/include/netdev2_tap.h
    R cpu/native/include/netdev2_tap_params.h
    A cpu/native/include/netdev_tap.h
    A cpu/native/include/netdev_tap_params.h
    M cpu/native/native_cpu.c
    R cpu/native/netdev2_tap/Makefile
    R cpu/native/netdev2_tap/netdev2_tap.c
    A cpu/native/netdev_tap/Makefile
    A cpu/native/netdev_tap/netdev_tap.c
    M cpu/native/startup.c
    M cpu/nrf5x_common/include/nrfmin.h
    M cpu/nrf5x_common/include/nrfmin_gnrc.h
    M cpu/nrf5x_common/radio/nrfmin/nrfmin.c
    M cpu/nrf5x_common/radio/nrfmin/nrfmin_gnrc.c
    M dist/tools/ethos/README.md
    M doc/doxygen/src/getting-started.md
    M doc/doxygen/src/riot-gnrc.svg
    M doc/doxygen/src/riot-structure.svg
    M drivers/Makefile.dep
    M drivers/at86rf2xx/at86rf2xx.c
    M drivers/at86rf2xx/at86rf2xx_netdev.c
    M drivers/at86rf2xx/include/at86rf2xx_netdev.h
    A drivers/cc110x/cc110x-netdev.c
    R drivers/cc110x/cc110x-netdev2.c
    R drivers/cc110x/gnrc_cc110x/gnrc_netdev2_cc110x.c
    A drivers/cc110x/gnrc_cc110x/gnrc_netdev_cc110x.c
    A drivers/cc110x/include/cc110x-netdev.h
    R drivers/cc110x/include/cc110x-netdev2.h
    R drivers/cc110x/include/gnrc_netdev2_cc110x.h
    A drivers/cc110x/include/gnrc_netdev_cc110x.h
    M drivers/cc2420/cc2420.c
    M drivers/cc2420/cc2420_netdev.c
    M drivers/cc2420/include/cc2420_netdev.h
    M drivers/enc28j60/enc28j60.c
    M drivers/encx24j600/encx24j600.c
    M drivers/ethos/ethos.c
    M drivers/include/at86rf2xx.h
    M drivers/include/cc2420.h
    M drivers/include/enc28j60.h
    M drivers/include/encx24j600.h
    M drivers/include/ethos.h
    M drivers/include/kw2xrf.h
    M drivers/include/mrf24j40.h
    A drivers/include/net/netdev.h
    A drivers/include/net/netdev/eth.h
    A drivers/include/net/netdev/ieee802154.h
    R drivers/include/net/netdev2.h
    R drivers/include/net/netdev2/eth.h
    R drivers/include/net/netdev2/ieee802154.h
    M drivers/include/w5100.h
    M drivers/include/xbee.h
    M drivers/kw2xrf/include/kw2xrf_netdev.h
    M drivers/kw2xrf/kw2xrf.c
    M drivers/kw2xrf/kw2xrf_netdev.c
    M drivers/mrf24j40/include/mrf24j40_netdev.h
    M drivers/mrf24j40/mrf24j40.c
    M drivers/mrf24j40/mrf24j40_getset.c
    M drivers/mrf24j40/mrf24j40_netdev.c
    R drivers/netdev2_eth/Makefile
    R drivers/netdev2_eth/netdev2_eth.c
    R drivers/netdev2_ieee802154/Makefile
    R drivers/netdev2_ieee802154/netdev2_ieee802154.c
    A drivers/netdev_eth/Makefile
    A drivers/netdev_eth/netdev_eth.c
    A drivers/netdev_ieee802154/Makefile
    A drivers/netdev_ieee802154/netdev_ieee802154.c
    M drivers/w5100/w5100.c
    M drivers/xbee/xbee.c
    M examples/gnrc_border_router/Makefile
    M examples/gnrc_border_router/README.md
    M pkg/emb6/Makefile.dep
    M pkg/emb6/Makefile.include
    M pkg/emb6/contrib/board_conf.c
    A pkg/emb6/contrib/netdev/Makefile
    A pkg/emb6/contrib/netdev/emb6_netdev.c
    R pkg/emb6/contrib/netdev2/Makefile
    R pkg/emb6/contrib/netdev2/emb6_netdev2.c
    M pkg/emb6/contrib/target.c
    A pkg/emb6/include/emb6/netdev.h
    R pkg/emb6/include/emb6/netdev2.h
    M pkg/lwip/Makefile.include
    M pkg/lwip/contrib/lwip.c
    A pkg/lwip/contrib/netdev/Makefile
    A pkg/lwip/contrib/netdev/lwip_netdev.c
    R pkg/lwip/contrib/netdev2/Makefile
    R pkg/lwip/contrib/netdev2/lwip_netdev2.c
    A pkg/lwip/include/lwip/netif/netdev.h
    R pkg/lwip/include/lwip/netif/netdev2.h
    M pkg/nordic_softdevice_ble/src/gnrc_nordic_ble_6lowpan.c
    M release-notes.txt
    M sys/Makefile
    M sys/auto_init/auto_init.c
    M sys/auto_init/netif/auto_init_at86rf2xx.c
    M sys/auto_init/netif/auto_init_cc110x.c
    M sys/auto_init/netif/auto_init_cc2420.c
    M sys/auto_init/netif/auto_init_cc2538_rf.c
    M sys/auto_init/netif/auto_init_enc28j60.c
    M sys/auto_init/netif/auto_init_encx24j600.c
    M sys/auto_init/netif/auto_init_ethos.c
    M sys/auto_init/netif/auto_init_kw2xrf.c
    M sys/auto_init/netif/auto_init_mrf24j40.c
    R sys/auto_init/netif/auto_init_netdev2_tap.c
    A sys/auto_init/netif/auto_init_netdev_tap.c
    M sys/auto_init/netif/auto_init_slip.c
    M sys/auto_init/netif/auto_init_w5100.c
    M sys/auto_init/netif/auto_init_xbee.c
    M sys/include/net/csma_sender.h
    M sys/include/net/gnrc.h
    M sys/include/net/gnrc/mac/internal.h
    M sys/include/net/gnrc/netdev.h
    A sys/include/net/gnrc/netdev/eth.h
    A sys/include/net/gnrc/netdev/ieee802154.h
    A sys/include/net/gnrc/netdev/xbee_adpt.h
    R sys/include/net/gnrc/netdev2.h
    R sys/include/net/gnrc/netdev2/eth.h
    R sys/include/net/gnrc/netdev2/ieee802154.h
    R sys/include/net/gnrc/netdev2/xbee_adpt.h
    R sys/include/net/netdev2_test.h
    A sys/include/net/netdev_test.h
    M sys/include/net/netopt.h
    M sys/net/gnrc/application_layer/uhcpc/gnrc_uhcpc.c
    A sys/net/gnrc/link_layer/netdev/Makefile
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev.c
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev_eth.c
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev_ieee802154.c
    A sys/net/gnrc/link_layer/netdev/gnrc_netdev_xbee.c
    R sys/net/gnrc/link_layer/netdev2/Makefile
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2.c
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_eth.c
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_ieee802154.c
    R sys/net/gnrc/link_layer/netdev2/gnrc_netdev2_xbee.c
    M sys/net/link_layer/csma_sender/csma_sender.c
    R sys/net/netdev2_test/Makefile
    R sys/net/netdev2_test/netdev2_test.c
    A sys/net/netdev_test/Makefile
    A sys/net/netdev_test/netdev_test.c
    M tests/driver_at86rf2xx/cmd.c
    M tests/driver_at86rf2xx/common.h
    M tests/driver_at86rf2xx/main.c
    M tests/driver_at86rf2xx/recv.c
    M tests/driver_enc28j60/Makefile
    M tests/driver_encx24j600/Makefile
    M tests/driver_xbee/Makefile
    M tests/emb6/main.c
    M tests/lwip/Makefile
    M tests/lwip_sock_ip/Makefile
    M tests/lwip_sock_ip/README.md
    M tests/lwip_sock_ip/stack.c
    M tests/lwip_sock_tcp/Makefile
    M tests/lwip_sock_tcp/README.md
    M tests/lwip_sock_udp/Makefile
    M tests/lwip_sock_udp/README.md
    M tests/lwip_sock_udp/stack.c
    R tests/netdev2_test/Makefile
    R tests/netdev2_test/main.c
    A tests/netdev_test/Makefile
    A tests/netdev_test/main.c

  Log Message:
  -----------
  Merge pull request #6610 from miri64/netdev2/enh/rename-to-netdev

netdev2: rename to netdev and remove `gnrc_netdev`


Compare: https://github.com/RIOT-OS/RIOT/compare/ecd3faf96383...119fc70075c9


More information about the commits mailing list