[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/tkn154/TestPromiscuous TestPromiscuousC.nc, 1.2, 1.3

Jan-Hinrich Hauer janhauer at users.sourceforge.net
Thu Mar 26 10:17:54 PDT 2009


Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestPromiscuous
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29887/apps/tests/tkn154/TestPromiscuous

Modified Files:
	TestPromiscuousC.nc 
Log Message:
made hex output nicer

Index: TestPromiscuousC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/tkn154/TestPromiscuous/TestPromiscuousC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestPromiscuousC.nc	4 Mar 2009 18:31:00 -0000	1.2
--- TestPromiscuousC.nc	26 Mar 2009 17:17:50 -0000	1.3
***************
*** 103,124 ****
        printf("SrcAddr: ");
        if (SrcAddrMode == ADDR_MODE_SHORT_ADDRESS){
!         printf("0x%hx\n", SrcAddress.shortAddress);
!         printf("SrcPANId: 0x%x\n", SrcPANId);
        } else if (SrcAddrMode == ADDR_MODE_EXTENDED_ADDRESS){
          for (i=0; i<8; i++)
!           printf("0x%hx ", ((uint8_t*) &(SrcAddress.extendedAddress))[i]);
          printf("\n");
!         printf("SrcPANId: 0x%x\n", SrcPANId);
        } else printf("\n");
        printf("DstAddrMode: %d\n", DstAddrMode);
        printf("DstAddr: ");
        if ( DstAddrMode == ADDR_MODE_SHORT_ADDRESS){
!         printf("0x%hx\n", DstAddress.shortAddress);
!         printf("DestPANId: 0x%x\n", DstPANId);
        } else if  ( DstAddrMode == ADDR_MODE_EXTENDED_ADDRESS) {
          for (i=0; i<8; i++)
!           printf("0x%hx ", ((uint8_t*) &(DstAddress.extendedAddress))[i]);
          printf("\n");    
!         printf("DestPANId: 0x%x\n", DstPANId);
        } else printf("\n");
  
--- 103,124 ----
        printf("SrcAddr: ");
        if (SrcAddrMode == ADDR_MODE_SHORT_ADDRESS){
!         printf("0x%02X\n", SrcAddress.shortAddress);
!         printf("SrcPANId: 0x%02X\n", SrcPANId);
        } else if (SrcAddrMode == ADDR_MODE_EXTENDED_ADDRESS){
          for (i=0; i<8; i++)
!           printf("0x%02X ", ((uint8_t*) &(SrcAddress.extendedAddress))[i]);
          printf("\n");
!         printf("SrcPANId: 0x%02X\n", SrcPANId);
        } else printf("\n");
        printf("DstAddrMode: %d\n", DstAddrMode);
        printf("DstAddr: ");
        if ( DstAddrMode == ADDR_MODE_SHORT_ADDRESS){
!         printf("0x%02X\n", DstAddress.shortAddress);
!         printf("DestPANId: 0x%02X\n", DstPANId);
        } else if  ( DstAddrMode == ADDR_MODE_EXTENDED_ADDRESS) {
          for (i=0; i<8; i++)
!           printf("0x%02X ", ((uint8_t*) &(DstAddress.extendedAddress))[i]);
          printf("\n");    
!         printf("DestPANId: 0x%02X\n", DstPANId);
        } else printf("\n");
  
***************
*** 127,131 ****
        printf("MHR: ");
        for (i=0; i<headerLen; i++){
!         printf("0x%hx ", header[i]);
        }
        printf("\n");      
--- 127,131 ----
        printf("MHR: ");
        for (i=0; i<headerLen; i++){
!         printf("0x%02X ", header[i]);
        }
        printf("\n");      
***************
*** 133,137 ****
        printf("Payload: ");
        for (i=0; i<payloadLen; i++){
!         printf("0x%hx ", payload[i]);
        }
        printf("\n");
--- 133,137 ----
        printf("Payload: ");
        for (i=0; i<payloadLen; i++){
!         printf("0x%02X ", payload[i]);
        }
        printf("\n");



More information about the Tinyos-2-commits mailing list