[riot-commits] [RIOT-OS/RIOT] edb34b: fixes for the wsn430

Oliver Hahm oleg at hobbykeller.org
Tue Jun 25 15:35:07 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: edb34b73c0aaed0bca022580f92f9ff01473bc64
      https://github.com/RIOT-OS/RIOT/commit/edb34b73c0aaed0bca022580f92f9ff01473bc64
  Author: Milan Babel <babel at inf.fu-berlin.de>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M core/include/queue.h
    M core/queue.c
    M cpu/msp430-common/hwtimer_cpu.c
    M cpu/msp430-common/include/hwtimer_cpu.h
    M cpu/msp430x16x/hwtimer_msp430.c
    M drivers/cc110x_ng/Makefile
    M sys/lib/hashtable.c
    M sys/shell/commands/sc_cc110x_ng.c
    M sys/vtimer/vtimer.c

  Log Message:
  -----------
  fixes for the wsn430
fixed vtimer for the msp430
added spi module for the wsn430 v1.3b
changed some variables to uintXX_t, fixes overflow on msp430


  Commit: 2f5ed66756e55076e636735e9081e3c8a7fe763f
      https://github.com/RIOT-OS/RIOT/commit/2f5ed66756e55076e636735e9081e3c8a7fe763f
  Author: Milan Babel <babel at inf.fu-berlin.de>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M sys/Makefile
    A sys/net/ieee802154/Makefile
    A sys/net/ieee802154/ieee802154_frame.c
    A sys/net/ieee802154/ieee802154_frame.h
    R sys/net/sixlowpan/ieee802154_frame.c
    R sys/net/sixlowpan/ieee802154_frame.h

  Log Message:
  -----------
  created own module for ieee802154
this is needed to include the ieee802154 in drivers without the hole sixlowpan


  Commit: db1fc96ffe977e071c7f8d3f9e2e45a41491a1ac
      https://github.com/RIOT-OS/RIOT/commit/db1fc96ffe977e071c7f8d3f9e2e45a41491a1ac
  Author: Milan Babel <babel at inf.fu-berlin.de>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M drivers/Makefile
    A drivers/cc2420/Makefile
    A drivers/cc2420/cc2420.c
    A drivers/cc2420/cc2420_rx.c
    A drivers/cc2420/cc2420_spi.c
    A drivers/cc2420/cc2420_tx.c
    A drivers/cc2420/include/cc2420.h
    A drivers/cc2420/include/cc2420_arch.h
    A drivers/cc2420/include/cc2420_settings.h
    A drivers/cc2420/include/cc2420_spi.h
    M sys/include/transceiver.h
    M sys/net/ieee802154/ieee802154_frame.c
    M sys/shell/commands/Makefile
    A sys/shell/commands/sc_cc2420.c
    M sys/shell/commands/shell_commands.c
    M sys/transceiver/Makefile
    M sys/transceiver/transceiver.c

  Log Message:
  -----------
  added driver for cc2420
also added cc2420 to transceiver and added cc2420 shell commands


  Commit: df13d9e0fcd529741a612928348a2e8f6bd6f21b
      https://github.com/RIOT-OS/RIOT/commit/df13d9e0fcd529741a612928348a2e8f6bd6f21b
  Author: Milan Babel <babel at inf.fu-berlin.de>
  Date:   2013-06-05 (Wed, 05 Jun 2013)

  Changed paths:
    M Makefile
    M Makefile.base
    M Makefile.include
    M core/include/thread.h
    M cpu/native/Makefile
    A cpu/native/cc110x_ng/Makefile
    A cpu/native/cc110x_ng/cc110x_ng_cpu.c
    M cpu/native/hwtimer_cpu.c
    M cpu/native/include/cpu-conf.h
    M cpu/native/include/cpu.h
    M cpu/native/irq_cpu.c
    M cpu/native/lpm_cpu.c
    M cpu/native/native_cpu.c
    A cpu/native/tramp.S
    M drivers/cc110x_ng/Makefile
    M sys/chardev_thread.c
    M sys/include/transceiver.h
    M sys/lib/ringbuffer.c

  Log Message:
  -----------
  Merge branch 'master' of github.com:overflowed/RIOT

Conflicts:
	drivers/cc110x_ng/Makefile


  Commit: 545c7863754b908c7cdbbe997616bfde8a1f3d03
      https://github.com/RIOT-OS/RIOT/commit/545c7863754b908c7cdbbe997616bfde8a1f3d03
  Author: Oleg Hahm <oleg at hobbykeller.org>
  Date:   2013-06-07 (Fri, 07 Jun 2013)

  Changed paths:
    M core/include/queue.h
    M core/queue.c
    M cpu/msp430-common/hwtimer_cpu.c
    M cpu/msp430-common/include/hwtimer_cpu.h
    M cpu/msp430x16x/hwtimer_msp430.c
    M drivers/Makefile
    M drivers/cc110x_ng/Makefile
    A drivers/cc2420/Makefile
    A drivers/cc2420/cc2420.c
    A drivers/cc2420/cc2420_rx.c
    A drivers/cc2420/cc2420_spi.c
    A drivers/cc2420/cc2420_tx.c
    A drivers/cc2420/include/cc2420.h
    A drivers/cc2420/include/cc2420_arch.h
    A drivers/cc2420/include/cc2420_settings.h
    A drivers/cc2420/include/cc2420_spi.h
    M sys/Makefile
    M sys/include/transceiver.h
    M sys/lib/hashtable.c
    A sys/net/ieee802154/Makefile
    A sys/net/ieee802154/ieee802154_frame.c
    A sys/net/ieee802154/ieee802154_frame.h
    R sys/net/sixlowpan/ieee802154_frame.c
    R sys/net/sixlowpan/ieee802154_frame.h
    M sys/shell/commands/Makefile
    M sys/shell/commands/sc_cc110x_ng.c
    A sys/shell/commands/sc_cc2420.c
    M sys/shell/commands/shell_commands.c
    M sys/transceiver/Makefile
    M sys/transceiver/transceiver.c
    M sys/vtimer/vtimer.c

  Log Message:
  -----------
  Merge branch 'master' of git://github.com/overflowed/RIOT into overflowed-master


  Commit: fdd1d21e8dc160f4804a85eb61fdf45e94a4e72f
      https://github.com/RIOT-OS/RIOT/commit/fdd1d21e8dc160f4804a85eb61fdf45e94a4e72f
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M Makefile.base
    M Makefile.include
    M core/include/debug.h
    M core/kernel_init.c
    M core/sched.c
    M cpu/lpc214x/Makefile
    M cpu/native/lpm_cpu.c
    M drivers/cc110x/cc1100-csmaca-mac.c
    M drivers/cc110x/cc1100_phy.c
    M sys/auto_init/auto_init.c
    M sys/include/transceiver.h
    M sys/include/vtimer.h
    M sys/net/destiny/destiny.c
    M sys/net/destiny/socket.c
    M sys/net/destiny/tcp_timer.c
    M sys/net/sixlowpan/flowcontrol.c
    M sys/net/sixlowpan/flowcontrol.h
    M sys/net/sixlowpan/rpl/objective_functions.c
    M sys/net/sixlowpan/rpl/objective_functions.h
    M sys/net/sixlowpan/rpl/of0.c
    M sys/net/sixlowpan/rpl/of0.h
    M sys/net/sixlowpan/rpl/rpl.c
    M sys/net/sixlowpan/rpl/rpl.h
    M sys/net/sixlowpan/rpl/rpl_dodag.h
    M sys/net/sixlowpan/sixlowborder.h
    M sys/net/sixlowpan/sixlowip.c
    M sys/net/sixlowpan/sixlownd.c
    M sys/net/sixlowpan/sixlowpan.c
    M sys/net/sixlowpan/sixlowpan.h
    M sys/ping/ping.c
    M sys/shell/Makefile
    M sys/shell/commands/Makefile
    M sys/vtimer/vtimer.c

  Log Message:
  -----------
  Merge branch 'master' into wsn430


  Commit: d640cf4298da04947f24371819a060bc47c0dbfb
      https://github.com/RIOT-OS/RIOT/commit/d640cf4298da04947f24371819a060bc47c0dbfb
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M core/include/queue.h

  Log Message:
  -----------
  fixed missing include


  Commit: 4eb05e24fe9d94f9a25f9f3a4df572c7c0b4f081
      https://github.com/RIOT-OS/RIOT/commit/4eb05e24fe9d94f9a25f9f3a4df572c7c0b4f081
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M sys/vtimer/vtimer.c

  Log Message:
  -----------
  fixed debug line


  Commit: 57cc002c67254b07bf796a2bc312676a3e6e30e4
      https://github.com/RIOT-OS/RIOT/commit/57cc002c67254b07bf796a2bc312676a3e6e30e4
  Author: Oliver Hahm <oleg at hobbykeller.org>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M Makefile.dep
    M core/include/queue.h
    M core/queue.c
    M cpu/msp430-common/hwtimer_cpu.c
    M cpu/msp430-common/include/hwtimer_cpu.h
    M cpu/msp430x16x/hwtimer_msp430.c
    M drivers/Makefile
    M drivers/cc110x_ng/Makefile
    A drivers/cc2420/Makefile
    A drivers/cc2420/cc2420.c
    A drivers/cc2420/cc2420_rx.c
    A drivers/cc2420/cc2420_spi.c
    A drivers/cc2420/cc2420_tx.c
    A drivers/cc2420/include/cc2420.h
    A drivers/cc2420/include/cc2420_arch.h
    A drivers/cc2420/include/cc2420_settings.h
    A drivers/cc2420/include/cc2420_spi.h
    M sys/Makefile
    M sys/lib/hashtable.c
    A sys/net/ieee802154/Makefile
    A sys/net/ieee802154/ieee802154_frame.c
    A sys/net/ieee802154/ieee802154_frame.h
    R sys/net/sixlowpan/ieee802154_frame.c
    R sys/net/sixlowpan/ieee802154_frame.h
    M sys/net/sixlowpan/sixlowborder.c
    M sys/net/sixlowpan/sixlowmac.c
    M sys/net/sixlowpan/sixlowpan.c
    M sys/shell/commands/Makefile
    M sys/shell/commands/sc_cc110x_ng.c
    A sys/shell/commands/sc_cc2420.c
    M sys/shell/commands/shell_commands.c
    M sys/transceiver/Makefile
    M sys/transceiver/transceiver.c
    M sys/vtimer/vtimer.c

  Log Message:
  -----------
  Merge branch 'wsn430'

Conflicts:
	core/include/queue.h
	core/queue.c
	cpu/msp430-common/hwtimer_cpu.c
	cpu/msp430x16x/hwtimer_msp430.c
	sys/lib/hashtable.c
	sys/net/ieee802154/ieee802154_frame.c
	sys/shell/commands/sc_cc110x_ng.c
	sys/transceiver/transceiver.c
	sys/vtimer/vtimer.c


Compare: https://github.com/RIOT-OS/RIOT/compare/c8bee9e554f5...57cc002c6725


More information about the commits mailing list