[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/epfl/lcav/tos/lib/XE1205Radio XE1205ControlM.nc, 1.13, 1.14

[Henri DF]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/epfl/lcav/tos/lib/XE1205Radio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6457

Modified Files:
	XE1205ControlM.nc 
Log Message:
Fix two bugs reported by Irfan Acar:

- cache preamble patterns properly
- set baseband bw properly


Index: XE1205ControlM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/epfl/lcav/tos/lib/XE1205Radio/XE1205ControlM.nc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** XE1205ControlM.nc	9 Nov 2005 10:37:20 -0000	1.13
--- XE1205ControlM.nc	25 May 2006 19:50:24 -0000	1.14
***************
*** 121,130 ****
--- 121,134 ----
      config[0] = XE1205_WRITE(Pattern_13);
      config[1] = (Xe1205_Pattern >> 16) & 0xff;
+     regCache[Pattern_13] = config[1];
+     
  
      config[2] = XE1205_WRITE(Pattern_14);
      config[3] = (Xe1205_Pattern >> 8) & 0xff;
+     regCache[Pattern_14] = config[3];
  
      config[4] = XE1205_WRITE(Pattern_15);
      config[5] = Xe1205_Pattern & 0xff;
+     regCache[Pattern_15] = config[5];
  
      call HPLXE1205.writeConfig_havebus(config, sizeof(config));
***************
*** 137,146 ****
--- 141,153 ----
      config[0] = XE1205_WRITE(Pattern_13);
      config[1] = (Xe1205_lplPattern >> 16) & 0xff;
+     regCache[Pattern_13] = config[1];
  
      config[2] = XE1205_WRITE(Pattern_14);
      config[3] = (Xe1205_lplPattern >> 8) & 0xff;
+     regCache[Pattern_14] = config[3];
  
      config[4] = XE1205_WRITE(Pattern_15);
      config[5] = Xe1205_lplPattern & 0xff;
+     regCache[Pattern_15] = config[5];
  
      call HPLXE1205.writeConfig_havebus(config, sizeof(config));
***************
*** 153,162 ****
--- 160,173 ----
      config[0] = XE1205_WRITE(Pattern_13);
      config[1] = (Xe1205_Ack_code >> 16) & 0xff;
+     regCache[Pattern_13] = config[1];
  
      config[2] = XE1205_WRITE(Pattern_14);
      config[3] = (Xe1205_Ack_code >> 8) & 0xff;
+     regCache[Pattern_14] = config[3];
  
      config[4] = XE1205_WRITE(Pattern_15);
      config[5] = Xe1205_Ack_code & 0xff;
+     regCache[Pattern_15] = config[5];
+ 
      call HPLXE1205.writeConfig_havebus(config, sizeof(config));
      return SUCCESS;      
***************
*** 324,330 ****
  
      config[0] = XE1205_WRITE(MCParam_0);
!     config[1] = regCache[MCParam_0];
      config[2] = XE1205_WRITE(MCParam_1);
!     config[3] = regCache[MCParam_1];
  
      if (call HPLXE1205.writeConfig(config, sizeof(config)) == SUCCESS) {
--- 335,341 ----
  
      config[0] = XE1205_WRITE(MCParam_0);
!     config[1] = (regCache[MCParam_0] & ~0x01) | (reg >> 8);
      config[2] = XE1205_WRITE(MCParam_1);
!     config[3] = reg;
  
      if (call HPLXE1205.writeConfig(config, sizeof(config)) == SUCCESS) {