Merge remote branch 'libmc1322x/master' into update-libmc1322x

Conflicts: cpu/mc1322x/COPYING
2011-02-17 14:41:47 -05:00 · 2011-02-17 14:41:47 -05:00 · 2e331b51e8
commit 2e331b51e8
parent 2e33e1694a a4ef14f204
9 changed files with 386 additions and 20 deletions
--- a/cpu/mc1322x/lib/include/packet.h
+++ b/cpu/mc1322x/lib/include/packet.h
@ -52,6 +52,7 @@ struct packet {
 	/* On RX this should be 1 since the maca puts the length as the first byte*/
 	uint8_t offset; 	
 	uint8_t lqi;
+	uint8_t status;
 	#if PACKET_STATS
 	uint8_t seen; 
 	uint8_t post_tx;