deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8303 commits 6 branches 13 tags 80 MiB
Commit graph

910 commits

Author SHA1 Message Date
Laurent Deru 56914963ef Reactivate flash protection after maca init 2012-05-09 10:24:38 -04:00
Mariano Alvira a4813d815f use --gc-sections instead of -gc-sections 2012-05-06 12:19:20 -04:00
Mariano Alvira 4acad929f0 add gc-sections, roughly 4kB savings. 2012-05-06 09:24:06 -04:00
David Kopf d6dc216e02 Reorder includes to prefer platform routines. Remove redundant RPL define. 2012-04-27 16:54:09 -04:00
George Oikonomou dd26accc07 We can now use SDCC's __nonbanked feature 
This allows us to reduce CODE footprint of SDCC projects
built with --model-huge. Use carefully!

* Added a facility which allows us to enable/disable the
  feature from the CPU dir (CC_CONF_NON_BANKED_OPTIMIZATION)
* Added the CC_NON_BANKED keyword to some platform files
  (expands to __nonbanked)
* Started using this for some examples
 2012-04-26 15:28:43 +01:00
Adam Dunkels b85bc3379c Bugfix in clock_wait() declaration. Various style fixes. 2012-04-22 20:54:29 +02:00
George Oikonomou e95f94a9a8 Added support for reading MAC from the cc253x flash 
We still use the primary location by default (Info Page) but
this is now configurable. This change is useful for users who
wish to specify their own MAC address. Since the Info Page is
read-only, they need to be able to use the secondary location
 2012-04-20 16:03:38 +01:00
George Oikonomou 29090a3dda The cc253x Makefile specifies SoC flavor 
This will help us slowly add better support for smaller SoCs
instead of just assuming that all cc253x SoCs are F256

- We build for F256 by default but the project Makefile can override this
- We currently ignore this when passing --code-size. This is a ToDo
- The bank allocator always assumes 7 banks. Once we fix --code-size above this will be irrelevant
 2012-04-20 16:03:38 +01:00
George Oikonomou 6fb48174ba Fixed a documentation typo 2012-04-20 16:03:37 +01:00
Niclas Finne 1b13b69814 Added support for mspgcc 4.6+ that no longer supports generic MCU identifiers such as msp430x1611 2012-04-10 16:05:10 +02:00
Niclas Finne 57a166c3db Corrected compiler flags for the IAR compiler 2012-04-10 15:27:44 +02:00
David Kopf cac4e9a222 Add clock_delay_us and clock_set_seconds to clock.h. Modify clock_wait to use clock_time_t. 
Remove the troublesome avr/dev/delay.* files.
Add PLATFORM_NAME and combine the confusing *_REVISION defines into a single PLATFORM_TYPE
 2012-04-09 15:49:53 -04:00
David Kopf 40bd020394 Fix wrong register addresses. 2012-04-09 09:58:12 -04:00
George Oikonomou 57969259ce cc2x3x clock_delay(len) now delays for approx. len usecs 2012-04-03 16:26:11 +01:00
George Oikonomou 3cb26adeda Added an ASM(foo) macro for cc243x 2012-04-03 16:26:11 +01:00
George Oikonomou 242e02658f The cc2530 UART driver was sending a 0 down the line on init 2012-04-03 16:26:10 +01:00
George Oikonomou b3de052e01 Ported the stack-friendly clock ISR code over from cc243x to cc253x 2012-04-03 16:26:10 +01:00
George Oikonomou 11a7f644ac Comment rewording and formatting 2012-04-03 16:26:10 +01:00
George Oikonomou ce17fa131c Stack-friendly cc243x clock ISR enabled by default 
This new approach (CLOCK_CONF_ACCURATE=0) was not as inaccurate
as originally thought. In fact, it has pretty much the same
accuracy as the old, stack-hungry version.

* Renamed the define from CLOCK_CONF_ACCURATE (1: old) to
  CLOCK_CONF_STACK_FRIENDLY (1: new) to stop implying
  that one is more accurate than the other.
* Using CLOCK_CONF_STACK_FRIENDLY by default.
 2012-04-03 16:26:10 +01:00
George Oikonomou 924fe934c1 Deleted obsolete macros. Minor formatting 2012-04-03 16:26:10 +01:00
George Oikonomou ffa3a1c4c3 cc2x3x clock driver cleanup 
* Bit-Addressable SFRs are now accessed as such,
  instead of (N)OR-ing the byte
* A routine was declared as CCIF but not defined as such. Fixed
* Deleted a leftover duplicate define
* Formatting
* Comment updates and clarifications
 2012-04-03 16:26:10 +01:00
simonduq 930c7c25bc fixes in mb851 and stm32w108: erroneous linking with mpu.o, conf file, 
more printouts in main when ipv6 is used, and a target for memory
profiling taking stm's gnu.ld static stack size into account
 2012-04-03 11:47:30 +02:00
George Oikonomou 5240519dd9 Renamed a config define to better match contiki's naming philosophy 2012-04-02 11:38:54 +01:00
George Oikonomou bce34e4b9a For cc2x30, moved CLOCK_CONF_SENCOND to the cpu dir. 
The value is not really configurable by the platform so having it
in contiki-conf.h didn't make huge sense.
 2012-04-02 11:22:19 +01:00
George Oikonomou d958ee3125 Deleted the old Sensinode 'read mac from flash' routine. 
Since the introduction of a purpose-written routine, the old
generic one (which was written in asm) was never being used.
There was a configuration directive which allowed us to switch
between the two. All references to this configuration directive
have also been removed.
 2012-04-02 11:21:32 +01:00
George Oikonomou 5d8f63a61b We've not been using the cc2430 converter for a while now 2012-04-02 11:03:49 +01:00
George Oikonomou 7854ee499a Wrapped cc2x30 SOFT_RESET() macro inside do {...} while(0) 2012-03-29 13:11:04 +01:00
George Oikonomou 5afdd19403 Adjusted check to determine if we are being built with SDCC 
Since rev #7342, SDCC defines __SDCC_mcs51 instead of SDCC_mcs51.
We check for either
 2012-03-29 13:10:25 +01:00
George Oikonomou 4f1e251603 Some uN_t had crept back in cc2530dk and sensinode. 
Changed to uintN_t plus a bit of code formatting
 2012-03-29 13:10:10 +01:00
simonduq 946f00bf7b stm32w: added ability to upload and reset all connected boards, and login using MOTE=x 2012-03-26 23:00:44 +02:00
simonduq 95ae5c5d51 avoid unnecessary symbols.c/h copying 2012-03-26 23:00:43 +02:00
George Oikonomou ad256e5014 New platform: TI cc2530 Development Kit 
This commits adds support for TI's SmartRF05 Eval. Board with cc2530 EMs
Some initial support for cc2531 USB dongles
 2012-03-23 14:41:07 +00:00
George Oikonomou b7674c3636 Reincarnate the sensinode/cc2430 port 2012-03-23 14:41:07 +00:00
simonduq e4fb360262 stm32w platforms: contikimac support in the Rime case, with EUI-64 2012-03-20 17:30:59 +01:00
simonduq 5da4463236 adding ducy cycling support to the stm32w-based platforms (patch by Chi-Anh La) 2012-03-20 17:29:58 +01:00
Niclas Finne ff7a977dc7 Improved support for the IAR compiler for the MSP430 platforms 2012-03-07 23:09:05 +01:00
Niclas Finne 684c3edfa6 Cross compiler interrupt service routine compatibility definitions for MSP430 based platforms based on isr_compat.h by Steve Underwood. 2012-03-07 23:04:52 +01:00
Niclas Finne 2eee14a1d8 Allow compiler flag SMALL to be set to disable SMALL-build. Patch by Andre Frimberger. 2012-03-06 15:35:20 +01:00
Ilya Dmitrichenko 49cd7878e3 Avoid deprecated error on Darwin. 2012-03-02 15:15:47 -05:00
Ilya Dmitrichenko 499d3052ee Fixed TARGET=native compilation issues on Darwin. 2012-03-02 15:15:42 -05:00
David Kopf 2b7ecefce7 Remove unused SPI initializer flag from AVR. Comment out in the msp-430 template. 2012-02-27 17:05:22 -05:00
Ilya Dmitrichenko 9c99d46e24 Simplified host OS platform detection in Makefiles 2012-02-25 10:09:33 -05:00
David Kopf deb75d3d97 Several bugfixes 2012-02-21 11:14:52 -05:00
David Kopf 59e459e0e9 Add missing mtarch_stop function 2012-02-21 11:11:53 -05:00
David Kopf 6e45dfe5ff PROGMEM changes needed for newer avr-gcc compiler 2012-02-21 11:10:57 -05:00
Nicholas J Humfrey 1cda3da17e Converted u8_t to uint8_t and u16_t to uint16_t in the cpu directory. 2012-02-21 08:33:24 -05:00
Mariano Alvira 68591919e6 mc1322x: add -MMD to Makefile.mc1322x to correctly create dependencies 2012-02-16 11:17:15 -05:00
Mariano Alvira 43062b6d74 mc1322x: change how board.h works to allow default board.h (defaults 
to econotag)
 2012-02-13 10:01:36 -05:00
Mariano Alvira ee8f2c669e mc1322x: remove symbols.{c,h} 2012-02-13 10:01:36 -05:00
David Kopf 9d6542d49b Fix minimal-net webserver6, broken after native border router changes. 2012-02-11 15:03:24 -05:00
David Kopf 38267bfd5a Webserver-nano: Add page load times, remove workaround code for bug in arm strformat.c, correct the double count of leading zeros there. 2012-02-11 14:58:35 -05:00
David Kopf 987906be97 rf230bb updates: involves setting the 801.15.4 pending bit, 
0x800000 cpu clock, and a jtag reset bugfix
 2012-02-01 14:16:39 -07:00
Ivan Delamer 57e686179c Improved rf230bb.c synchronization/locking. Removed unnecessary locks 
during Tx (single-threaded environment). Added protection to Rx thread
from buffer access by ISR.
 2012-02-01 13:37:45 -07:00
David Kopf 7ca141b457 Access uart registers directly instead of through intermediate addresses in a RAM struct. 
Add a platform define to reduce the number of ports supported by the cpu.
 2012-01-21 13:49:58 -05:00
Niclas Finne f26920ae9b Define the BV macro if not already defined 2012-01-11 08:46:16 +01:00
David Kopf 58298f59db Add F_CPU=0x800000 option with phase lock to external 32768 Hz crystal 
Add MCU_CONF_LOW_WEAR option to avoid eeprom writes during development.
 2012-01-10 12:42:27 -05:00
Niclas Finne f3db12c19d MSP430 setup for f2xxx based on Z1 2012-01-09 14:56:03 +01:00
Niclas Finne 9ffcd53868 Fixed compiler warning (with IAR compiler) 2012-01-09 14:56:00 +01:00
Niclas Finne 3daa822f89 Moved configuration of memcpy workaround to cpu (only needed for an older version of mspgcc) 2012-01-09 14:55:57 +01:00
Niclas Finne fd81a0d393 Minor cleanup (avoid setting some compiler flags twice) 2012-01-09 14:55:54 +01:00
Niclas Finne 8e1e12dfd3 Ignore SMALL when using IAR compiler 2012-01-09 14:55:48 +01:00
Nicolas Tsiftes eba64bdc5e Be more explicit with the relationship between inheritance between MSP430 families. 2012-01-09 14:55:45 +01:00
Niclas Finne cdfa8708e3 * Added f2xxx for two series (for example z1) 
* f1xxx is baseline and always included
* Cleaned up the names of uart and spi (no x in names)
* Updated SPI configuration for WiSMote
 2012-01-09 14:54:57 +01:00
Niclas Finne f4f84ffca4 Updated SPI config for faster SPI, split msp430/clock/spi into separate versions for MSP430/MSP430X 2012-01-09 14:54:01 +01:00
Niclas Finne 09082f02fe Changed clock_delay to use the nop instruction 2012-01-09 14:49:39 +01:00
Niclas Finne cd4be4927a Fixed quick dco sync to also work with mspgcc 2012-01-09 14:41:42 +01:00
Niclas Finne 708f9d77d2 Corrected timing for higher CPU speed 2012-01-09 14:41:36 +01:00
Niclas Finne 05b10eb9ce Initial WiSMote port based on code from Arago Systems. 2012-01-09 12:25:06 +01:00
Niclas Finne 367c82a5ab added compiler flags and macros for IAR and mspgcc 4.4.5 compilers 2012-01-09 12:24:33 +01:00
David Kopf b251619a2f Add wpcap for cygwin/Windows native border router 2012-01-08 13:37:56 -05:00
Fredrik Osterlind 2644057fb2 using dma by default 2011-12-21 10:53:18 +01:00
David Kopf 81af871db9 Bugfix: use 16 bit tick count to adjust clock after sleep 2011-12-01 09:58:55 -05:00
Oliver Schmidt e38f008b9b The dependency on the ucontext functions has the potential to keep others from successfully using cpu/native for other platforms. As the Contiki multithreading library typically isn't used at all it's not worth the trouble. So we just limit it to Windows and Linux - where it is known to not only build but actually work. If someone needs the Contiki cpu/native multithreading library on another platform he's certainly welcome to add that platform - hopefully by just activating the codepath that we now made exclusive for Linux for his platform. 2011-11-30 23:41:39 +01:00
David Kopf fb977cb9ef Better fix for hardware FCS error on JTAG reset 
Correct silly error introduced by trying to save two bytes.
 2011-11-15 13:24:58 -05:00
David Kopf 31ba84eb75 Improve rf23x cca procesing 
Fix delay_loop timing bug by using long long calculation.
128rfa1 and rf230 both working with contikimac RDC
 2011-11-14 11:49:58 -05:00
David Kopf d1cd3f213c Add general unsupported interrupt vector suggested by Daniel Willmann 2011-11-14 11:36:18 -05:00
David Kopf 6eba721af1 Add rtimer_arch_sleep function, enabled with RDC_CONF_MCU_SLEEP 2011-11-14 11:10:35 -05:00
David Kopf c2364897f8 atmega128rfa1 cca fixes, energest and rimestat macros. 
Add option to return ACK to RDC layer when in extended mode, based on Georg von Zengen code.
 2011-11-08 12:20:22 -05:00
Niclas Finne bf299b1a07 Fixed splhigh/splx for the IAR compiler 2011-09-27 22:51:28 +02:00
Joakim Eriksson 5b1d9617c4 moved io and signal and IAR-GCC checks from driver files into contiki include file 2011-09-26 10:38:41 +02:00
Joakim Eriksson 95dde73618 fixed Sky platform for IAR compiler 2011-09-11 17:18:02 +02:00
David Kopf f721f646fa Adjust sleep time by ticks instead of seconds, proposed by Ivan Delamer 2011-09-10 12:44:49 -04:00
Adam Dunkels 4fd8133aa3 Removed the obsolete MAC_CONF_CHANNEL_CHECK_RATE (now replaced with NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE) 2011-09-05 20:42:19 +02:00
Mariano Alvira 43910c1be7 don't worry about wraparound in rtimer_arch_schedule 2011-09-02 12:36:10 -04:00
Mariano Alvira 6c0bbc492b change mc1322x rtimers to 32-bit 
hardcode a close default value for the RTC
 2011-09-02 12:32:47 -04:00
David Kopf dfdae5b02b This fixes commit 9a1ce7 for spaces instead of .... 2011-08-31 12:08:01 -04:00
David Kopf 470887eddd Print elf size if ELF_SIZE is defined 2011-08-31 11:50:14 -04:00
David Kopf 9a1ce7cf75 Use enumerated tx return values 2011-08-31 11:40:23 -04:00
David Kopf 5f2b2074f0 Implement WITH_RPL option in makefile 2011-08-28 16:11:48 -04:00
David Kopf bdec65b889 Fix typos and file endings 2011-08-28 16:04:36 -04:00
David Kopf 94fc40f736 Move LEDONPORTE1 define to contiki-conf.h, fixing typo. 2011-08-24 11:35:58 -04:00
David Kopf 09db159876 128rfa1 cca fix, NETSTACK_RADIO.off now returns 0/1 if radio off/on 2011-08-18 14:36:04 -04:00
David Kopf 53737d9a38 Use correct prescale factor 2011-08-18 13:58:20 -04:00
David Kopf 3ea102050b Apply patch of Ivan Delamer for atmega1281 @ 4 MHz 2011-08-17 13:16:46 -04:00
David Kopf 36fa735323 Calculate best prescaler based on F_CPU and CLOCK_CONF_SECONDS. Inspired by patch from Ivan Delamer. 2011-08-17 13:15:26 -04:00
maniacbug 0990896f54 Added an .eu target to upload only the eeprom for AVR cpu. 2011-08-16 14:10:48 -04:00
maniacbug 8f0bb86c02 No strict aliasing for AVR 
AVR build generates numerous aliasing errors.  This -f switch silences them.
 2011-08-16 14:07:06 -04:00
David Kopf 577215deca Use 128rfa1 interrupts instead of timing. 
Generalize DEBUGFLOW macro for use in multiple routines.
 2011-08-15 15:06:38 -04:00
David Kopf 50d1086553 Add changes needed for contikimac 2011-08-13 11:38:38 -04:00
David Kopf 03ab525652 Option for nested rtimer interrupts 2011-08-13 11:35:03 -04:00
David Kopf cdcb2c4744 CCA measurement was always returning busy 2011-08-06 13:48:52 -04:00
David Kopf b70d2b3163 Remove duplicate code block 2011-08-05 17:34:38 -04:00
David Kopf c9b19ce655 Change timer setups for arbitrary CLOCK_CONF_SECOND 
Change raven to 128 ticks and enable 32KHz crystal as default.
 2011-08-05 15:14:35 -04:00
David Kopf e2ad2acde4 Add stk500 platform and changes suggested by Daniel Willmann 2011-08-03 11:18:55 -04:00
David Kopf 6ec85fe079 Add Iris port of Shinta Hatatani 2011-08-03 10:17:59 -04:00
Mariano Alvira 2b9f4e8fed Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x 2011-08-01 19:50:46 -04:00
David Kopf cf3241c5db Add file needed for rpl border router 2011-07-24 12:07:39 -04:00
David Kopf 0bb585fd60 Replace WEBSERVER by AVR_WEBSERVER 2011-07-24 11:43:17 -04:00
Simon Berg 506eced1bc Bug fix by Jonathan Chung 2011-07-22 15:07:52 +02:00
Mariano Alvira 485d6716e0 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x 
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
 2011-07-18 07:25:19 -04:00
HATATANI Shinta f4740a062a IRIS port is working with uIPv6 2011-07-15 16:36:25 +09:00
Mariano Alvira 758fc37307 mc1322x: flush the rx fifos when full 2011-07-12 07:05:04 -04:00
Mariano Alvira 4cf9514aa9 fix gpio initialization for uart2 2011-07-09 14:33:03 -04:00
Mariano Alvira 6d96721ac4 mc1322x: block in uart putc if the TX buffer is full. Can also be 
configured to drop chars instead with UARTx_DROP_CHARS
 2011-07-09 12:46:30 -04:00
Mariano Alvira e80f9eb4b5 mc1322x: build fixes for uart2 2011-07-08 19:40:42 -04:00
Mariano Alvira e2d74fa0a5 Merge branch 'master' of git://git.devl.org/git/malvira/libmc1322x into uart-upstream 
Conflicts:
	cpu/mc1322x/lib/include/uart.h
	cpu/mc1322x/src/default_lowlevel.c
 2011-07-08 19:21:15 -04:00
David Kopf 6ea7250af7 Change ctimer startup order, add multihop to wpcap and minimal-net platform. 2011-06-30 12:12:07 -04:00
David Kopf c48b7ab78d Add RPL nodes and border router to minimal-net platform (cygwin only) 2011-06-28 08:19:48 -04:00
David Kopf 6b434a553f Implement SRAM routine of Georg von Zengen 2011-06-21 13:03:58 -04:00
Joakim Eriksson af601dfb23 improved support for IAR compiler for z1 2011-06-05 00:21:47 +02:00
Mariano Alvira 33b32c61e9 Only insert an ack packet if the ack request bit is set 2011-06-01 13:47:05 -04:00
Joakim Eriksson 77ec0bfa0f fixed the z1 platform and generic code used by z1 to work with IAR compiler 2011-05-25 17:21:51 +02:00
Mariano Alvira 724bcbd2d3 Merge remote branch 'libmc1322x/master' 
Conflicts:
	cpu/mc1322x/src/default_lowlevel.c
 2011-05-14 21:19:47 -04:00
Joakim Eriksson fd75050c67 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-05-13 11:53:45 +02:00
Joakim Eriksson 2c16538e6a fixed support for IAR compiler 2011-05-13 11:52:42 +02:00
Salvatore Pitrulli 7a48110067 STM32W flasher utilities for Linux and Windows merged into a single folder. 2011-05-10 19:26:33 +02:00
Mariano Alvira 0a2b86456b add option to insert an ack packet on autoack 2011-05-08 09:50:57 -04:00
Mariano Alvira 65671c66c6 turn on insert ack packet by default 2011-05-08 09:50:57 -04:00
Joakim Eriksson 3fa8da5ddf fixed IAR compilation paths 2011-05-02 15:19:28 +02:00
Salvatore Pitrulli 5eabf33211 Added functions for deep sleep to mbxxx platform. 2011-04-27 18:12:23 +02:00
Mariano Alvira d80449244d Merge remote branch 'libmc1322x/master' 2011-04-20 21:23:47 -04:00
Salvatore Pitrulli 01a7a78a94 Fixed temperature ADC conversion bug on mbxxx. 
The conversion was made from an incorrect source when
the GPIO pin was not PB7.
Added functions and macros used to select the correct
ADC channel.
 2011-04-20 18:06:20 +02:00
Salvatore Pitrulli aa968309af Merge remote branch 'sf/master' 2011-04-16 16:27:10 +02:00
Niclas Finne 813489633c Added missing include 2011-04-15 15:49:43 +02:00
Salvatore Pitrulli 4ff82b76e5 Removed -fsigned-char GCC compiler options. 2011-04-14 08:12:11 +02:00
Salvatore Pitrulli 0105057c44 Removed unwanted file. 2011-04-14 08:10:58 +02:00
Salvatore Pitrulli 0a0ad39c9b Added weak symbols for STM32W exception handlers and other minor updates for the HAL. 2011-04-14 08:06:13 +02:00
Salvatore Pitrulli 57163c616d Removed some warnings. 2011-04-14 08:05:21 +02:00
Salvatore Pitrulli af8e58e063 Set LED pins to output when MB851 is in sleep mode. 
This reduces power consumption.
 2011-04-13 18:14:12 +02:00
dak664 2e14df3981 Options to extend mc1322x fifo to RAM buffer, or use hardware flow control with tunslip6. 2011-04-08 15:15:16 -04:00
Salvatore Pitrulli 6655c876f2 Added functions and example for deep sleep on mb851. 
The added function let a process to make the system go
into deep sleep for maximum power saving.
The udp-ipv6-example shows how to use these new functions.
 2011-04-08 11:53:48 +00:00
dak664 89741bd322 Exit on watchdog reboot call 2011-04-07 17:47:54 -04:00
dak664 581d081ffe Don't use RF230_CONF_CCA_THRES if it is not defined. 2011-04-07 17:44:10 -04:00
Joakim Eriksson f603c965c1 Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki 2011-04-06 20:15:44 +02:00
Joakim Eriksson 928bf6b6c1 fixed cpu/msp430 for compilation with IAR compiler 2011-04-06 20:08:48 +02:00
Mariano Alvira 4f4e06c71b Merge remote branch 'libmc1322x/master' 2011-04-06 05:56:06 -04:00
Oliver Schmidt 5da4faf71e Allow VC++ to be used as alternative to GCC for building in the WIN32 target. 
TODOs:
- Update README
- Add dependency handling
- Add rtimersupport
 2011-04-03 22:32:11 +02:00
Oliver Schmidt f83fb3704b Replaced make-empty-symbols with empty-symbols.[c|h] 
The symbol generation shell scripts cause CRLF issues on Windows/Cygwin again and again. Instead of fixing this yet again I opted to remove the symbol generation script at least for the "no symbols" scenario with two C source files to be copied.
 2011-04-03 13:24:58 +02:00
dak664 a9cbbb4570 Add sneezer mode and tx power change 2011-03-23 18:08:07 -04:00
Mariano Alvira 11f5bca7c4 Merge remote branch 'libmc1322x/master' 
Conflicts:
	cpu/mc1322x/board/redbee-econotag.h
 2011-03-22 16:28:08 -04:00