[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/byte_radio PacketSerializerP.nc, 1.4, 1.5 MacReceive.nc, 1.2, 1.3 LinkLayerP.nc, 1.3, 1.4 LinkLayerC.nc, 1.2, 1.3

[akoepke]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7090/lib/byte_radio

Modified Files:
	PacketSerializerP.nc MacReceive.nc LinkLayerP.nc LinkLayerC.nc 
Log Message:
switch to metric MHz for SMCLK, adjust constants, include SmclkManager
reduce baud rate for radio -- it can not handle more than 23kBit/s with a
50kHz frequency shift


Index: PacketSerializerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/PacketSerializerP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PacketSerializerP.nc	12 Dec 2006 18:23:28 -0000	1.4
--- PacketSerializerP.nc	5 Apr 2007 06:38:45 -0000	1.5
***************
*** 101,105 ****
    
    async event void PhyPacketTx.sendHeaderDone() {
!     TransmitNextByte();
    }
  
--- 101,105 ----
    
    async event void PhyPacketTx.sendHeaderDone() {
!       TransmitNextByte();
    }
  
***************
*** 115,119 ****
      message_radio_header_t* header = getHeader((message_t*) txBufPtr);
      if (byteCnt < header->length + sizeof(message_header_t) ) {  // send (data + header), compute crc
!         if(byteCnt == sizeof(message_header_t)) signal RadioTimeStamping.transmittedSFD(0, (message_t*)txBufPtr); 
          crc = crcByte(crc, ((uint8_t *)(txBufPtr))[byteCnt]);
          call RadioByteComm.txByte(((uint8_t *)(txBufPtr))[byteCnt++]);
--- 115,121 ----
      message_radio_header_t* header = getHeader((message_t*) txBufPtr);
      if (byteCnt < header->length + sizeof(message_header_t) ) {  // send (data + header), compute crc
!         if(byteCnt == sizeof(message_header_t)) {
!             signal RadioTimeStamping.transmittedSFD(0, (message_t*)txBufPtr);
!         }
          crc = crcByte(crc, ((uint8_t *)(txBufPtr))[byteCnt]);
          call RadioByteComm.txByte(((uint8_t *)(txBufPtr))[byteCnt++]);
***************
*** 125,129 ****
        call RadioByteComm.txByte((uint8_t)(crc >> 8));
      } else { /* (byteCnt > (header->length + sizeof(message_header_t)+1)) */
!         call PhyPacketTx.sendFooter();  
      }
    }
--- 127,131 ----
        call RadioByteComm.txByte((uint8_t)(crc >> 8));
      } else { /* (byteCnt > (header->length + sizeof(message_header_t)+1)) */
!         call PhyPacketTx.sendFooter();
      }
    }

Index: MacReceive.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/MacReceive.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MacReceive.nc	12 Jul 2006 17:02:20 -0000	1.2
--- MacReceive.nc	5 Apr 2007 06:38:45 -0000	1.3
***************
*** 63,66 ****
     */
    async event message_t* receiveDone(message_t* msg);
!   
  }
--- 63,66 ----
     */
    async event message_t* receiveDone(message_t* msg);
! 
  }

Index: LinkLayerP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/LinkLayerP.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LinkLayerP.nc	7 Nov 2006 19:31:18 -0000	1.3
--- LinkLayerP.nc	5 Apr 2007 06:38:45 -0000	1.4
***************
*** 61,67 ****
    message_t  rxBuf;
  
-   /* packet vars */
-   uint8_t seqNo;              // for later use ...
-     
    /* state vars */
    error_t splitStateError;    // state of SplitControl interfaces
--- 61,64 ----
***************
*** 85,89 ****
            rxBufPtr = &rxBuf;
            txBufPtr = 0;
-           seqNo = 0;
            splitStateError = EOFF;
            rxBusy = FALSE;
--- 82,85 ----
***************
*** 162,167 ****
      
      command error_t Send.send(message_t *msg, uint8_t len) {
!       ++seqNo;  // where to put?
!       return call SendDown.send(msg, len);
      }
  
--- 158,166 ----
      
      command error_t Send.send(message_t *msg, uint8_t len) {
!         if(getMetadata(msg)->ack != NO_ACK_REQUESTED) {
!             // ensure reasonable value
!             getMetadata(msg)->ack = ACK_REQUESTED;
!         }
!         return call SendDown.send(msg, len);
      }
  
***************
*** 213,217 ****
          if (rxBusy) {
            msgPtr = msg;
!         } else {
            rxBusy = TRUE;
            msgPtr = rxBufPtr;
--- 212,217 ----
          if (rxBusy) {
            msgPtr = msg;
!         }
!         else {
            rxBusy = TRUE;
            msgPtr = rxBufPtr;
***************
*** 222,226 ****
        return msgPtr;
      }
!     
      command void* Receive.getPayload(message_t* msg, uint8_t* len) {
        return call Packet.getPayload(msg, len);
--- 222,226 ----
        return msgPtr;
      }
! 
      command void* Receive.getPayload(message_t* msg, uint8_t* len) {
        return call Packet.getPayload(msg, len);

Index: LinkLayerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/byte_radio/LinkLayerC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LinkLayerC.nc	12 Jul 2006 17:02:20 -0000	1.2
--- LinkLayerC.nc	5 Apr 2007 06:38:45 -0000	1.3
***************
*** 54,58 ****
    components LinkLayerP as Llc,
               MainC;
-   
      MainC.SoftwareInit -> Llc;
      SplitControl = Llc;
--- 54,57 ----