[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/serial SerialP.nc, 1.1.2.12, 1.1.2.13

[Philipp Huppertz]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	SerialP.nc 
Log Message:
- changed back to revision 1.12.11 (i accidently committed an older revision before)

Index: SerialP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/serial/SerialP.nc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** SerialP.nc	3 Aug 2006 18:21:08 -0000	1.1.2.12
--- SerialP.nc	17 Aug 2006 17:19:25 -0000	1.1.2.13
***************
*** 1,3 ****
- // $Id$
  /*									
   *  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.  By
--- 1,2 ----
***************
*** 671,676 ****
        case TXSTATE_INFO:
          atomic {
-           uint8_t nextByte;
- 
            txResult = call SerialFrameComm.putData(txBuf[txIndex].buf);
            txCRC = crcByte(txCRC,txBuf[txIndex].buf);
--- 670,673 ----
***************
*** 678,689 ****
            
            if (txIndex == TX_DATA_INDEX){
              nextByte = signal SendBytePacket.nextByte();
            }
!           if (txBuf[txIndex].state == BUFFER_COMPLETE || txByteCnt >= SERIAL_MTU){
              txState = TXSTATE_FCS1;
            }
-           else { /* never called on ack b/c ack is BUFFER_COMPLETE initially */
-             txBuf[txIndex].buf = nextByte;
-           }
          }
          break;
--- 675,690 ----
            
            if (txIndex == TX_DATA_INDEX){
+             uint8_t nextByte;
              nextByte = signal SendBytePacket.nextByte();
+             if (txBuf[txIndex].state == BUFFER_COMPLETE || txByteCnt >= SERIAL_MTU){
+               txState = TXSTATE_FCS1;
+             }
+             else { /* never called on ack b/c ack is BUFFER_COMPLETE initially */
+               txBuf[txIndex].buf = nextByte;
+             }
            }
!           else { // TX_ACK_INDEX
              txState = TXSTATE_FCS1;
            }
          }
          break;