[Commit-gnuradio] r6698 - gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband

[gnychis]

Author: gnychis
Date: 2007-10-25 21:32:36 -0600 (Thu, 25 Oct 2007)
New Revision: 6698

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/gen_test_packets.py
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usb_packet.py
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
Log:
Two lessons learned:
  1. sed can be a bad idea
  2. check your svn diff's before your commit, not after


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/gen_test_packets.py
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/gen_test_packets.py
        2007-10-26 03:25:57 UTC (rev 6697)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/gen_test_packets.py
        2007-10-26 03:32:36 UTC (rev 6698)
@@ -70,7 +70,7 @@
     lengths = gen_shuffled_lengths()
     npkts = len(lengths)                # number of packets we'll generator on 
each stream
     pkt_gen_0 = packet_sequence_generator(0, lengths)
-    pkt_gen_1 = packet_sequence_generator(CONTROL_CHAN, gen_shuffled_lengths())
+    pkt_gen_1 = packet_sequence_generator(0x1f, gen_shuffled_lengths())
     pkt_gen = (pkt_gen_0, pkt_gen_1)
     
     which_gen = (npkts * [0]) + (npkts * [1])

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usb_packet.py
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usb_packet.py  
    2007-10-26 03:25:57 UTC (rev 6697)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usb_packet.py  
    2007-10-26 03:32:36 UTC (rev 6698)
@@ -38,13 +38,13 @@
 RSSI_MASK = 0x3f
 RSSI_SHIFT = 21
 
-CHAN_MASK = CONTROL_CHAN
+CHAN_MASK = 0x1f
 CHAN_SHIFT = 16
 
 TAG_MASK = 0xf
 TAG_SHIFT = 9
 
-PAYLOAD_LEN_MASK = CONTROL_CHANf
+PAYLOAD_LEN_MASK = 0x1ff
 PAYLOAD_LEN_SHIFT = 0
 
 def make_header(flags, chan, payload_len, timestamp, rssi=0, tag=0):

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
   2007-10-26 03:25:57 UTC (rev 6697)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_inband_usb_packet.h
   2007-10-26 03:32:36 UTC (rev 6698)
@@ -79,13 +79,13 @@
   static const int RSSI_MASK = 0x3f;
   static const int RSSI_SHIFT = 21;
 
-  static const int CHAN_MASK = CONTROL_CHAN;
+  static const int CHAN_MASK = 0x1f;
   static const int CHAN_SHIFT = 16;
 
   static const int TAG_MASK = 0xf;
   static const int TAG_SHIFT = 9;
 
-  static const int PAYLOAD_LEN_MASK = CONTROL_CHANf;
+  static const int PAYLOAD_LEN_MASK = 0x1ff;
   static const int PAYLOAD_LEN_SHIFT = 0;
 
   // Fixed size for opcode and length fields