[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/collection ForwardingEngineP.nc, 1.1.2.6, 1.1.2.7

[Kyle Jamieson]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19702

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	ForwardingEngineP.nc 
Log Message:
Updated ForwardingEngine to use renamed Queue methods.

Index: ForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/Attic/ForwardingEngineP.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** ForwardingEngineP.nc	1 May 2006 01:46:17 -0000	1.1.2.6
--- ForwardingEngineP.nc	1 May 2006 16:43:32 -0000	1.1.2.7
***************
*** 94,98 ****
    event void RadioControl.startDone() {
      radioOn = TRUE;
!     if (!Queue.isEmpty()) {
        post sendTask();
      }
--- 94,98 ----
    event void RadioControl.startDone() {
      radioOn = TRUE;
!     if (!SendQueue.empty()) {
        post sendTask();
      }
***************
*** 139,143 ****
      qe->client = client;
      
!     if (call SendQueue.push(qe) == SUCCESS) {
        if (radioOn && call SendQueue.size() == 1) {
          post sendTask();
--- 139,143 ----
      qe->client = client;
      
!     if (call SendQueue.enqueue(qe) == SUCCESS) {
        if (radioOn && call SendQueue.size() == 1) {
          post sendTask();
***************
*** 154,158 ****
    task void sendTask() {
      if (!call UnicastNameFreeRouting.hasRoute() ||
!          call SendQueue.isEmpty() || 
           sending) {
        return;
--- 154,158 ----
    task void sendTask() {
      if (!call UnicastNameFreeRouting.hasRoute() ||
!          call SendQueue.empty() || 
           sending) {
        return;
***************
*** 216,220 ****
      else if (getHeader(qe->msg)->origin == TOS_NODE_ID) {
        network_header_t* hdr;
!       call SendQueue.pop();
        hdr = getHeader(qe->msg);
        if (qe->client < CLIENT_COUNT)
--- 216,220 ----
      else if (getHeader(qe->msg)->origin == TOS_NODE_ID) {
        network_header_t* hdr;
!       call SendQueue.dequeue();
        hdr = getHeader(qe->msg);
        if (qe->client < CLIENT_COUNT)
***************
*** 244,248 ****
        uint8_t len = call SubPacket.payloadLength(m);x
        call Packet.setPayloadLength(m, len + sizeof(network_header_t));
!       if (call SendQueue.push(qe))
          return newMsg;
        else {
--- 244,248 ----
        uint8_t len = call SubPacket.payloadLength(m);x
        call Packet.setPayloadLength(m, len + sizeof(network_header_t));
!       if (call SendQueue.enqueue(qe))
          return newMsg;
        else {