[Firebug-cvs] fireboard/beta/tools/gps/SiRF sirftest.c,1.7,1.8 sirftest.h,1.1,1.2 sirftest2.c,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/firebug/fireboard/beta/tools/gps/SiRF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5700/tools/gps/SiRF

Modified Files:
	sirftest.c sirftest.h sirftest2.c 
Log Message:
More work on sirf message parsing.

Index: sirftest.h
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirftest.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sirftest.h	17 Aug 2005 21:48:41 -0000	1.1
--- sirftest.h	18 Aug 2005 00:38:46 -0000	1.2
***************
*** 1,25 ****
  
! 
! // Header used in packets that make up a long message.
! //
! typedef struct fragmentHeader {
!   uint8_t mote_id;
!   uint8_t sequenceNumber;
!   uint8_t blockNumber;
!   uint8_t blockCount;
! } FragmentHeader_t;
! 
! #ifndef TOSH_DATA_LENGTH
! #define TOSH_DATA_LENGTH 29
! #endif
! 
! #define FRAGMENT_PAYLOAD_LENGTH (TOSH_DATA_LENGTH - sizeof(FragmentHeader_t))
! 
! // Packet to transport variable length (and long) messages in a fixed
! // length radio message.
! typedef struct messageFragment {
!   FragmentHeader_t h;
!   uint8_t data[FRAGMENT_PAYLOAD_LENGTH];
! } MessageFragment_t;
  
  
--- 1,5 ----
  
! #ifndef FB_SIRFTEST_H
! #define FB_SIRFTEST_H
  
  
***************
*** 39,40 ****
--- 19,21 ----
  typedef struct msg_packer msg_packer_t;
  
+ #endif  /* FB_SIRFTEST_H */

Index: sirftest2.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirftest2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sirftest2.c	17 Aug 2005 21:47:39 -0000	1.1
--- sirftest2.c	18 Aug 2005 00:38:46 -0000	1.2
***************
*** 18,22 ****
  
  #include "sirftest_util.h"
- 
  #include "sirf.h"
  
--- 18,21 ----
***************
*** 363,388 ****
  
  
- // Header used in packets that make up a long message.
- //
- typedef struct fragmentHeader {
-   uint8_t mote_id;
-   uint8_t sequenceNumber;
-   uint8_t blockNumber;
-   uint8_t blockCount;
- } FragmentHeader_t;
- 
- #ifndef TOSH_DATA_LENGTH
- #define TOSH_DATA_LENGTH 29
- #endif
- 
- #define FRAGMENT_PAYLOAD_LENGTH (TOSH_DATA_LENGTH - sizeof(FragmentHeader_t))
- 
- // Packet to transport variable length (and long) messages in a fixed
- // length radio message.
- typedef struct messageFragment {
-   FragmentHeader_t h;
-   uint8_t data[FRAGMENT_PAYLOAD_LENGTH];
- } MessageFragment_t;
- 
  
  // Struct pointer for msg parsing code.
--- 362,365 ----

Index: sirftest.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirftest.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sirftest.c	17 Aug 2005 21:46:00 -0000	1.7
--- sirftest.c	18 Aug 2005 00:38:46 -0000	1.8
***************
*** 604,607 ****
--- 604,608 ----
  
  
+ #if 0
  // Header used in packets that make up a long message.
  //
***************
*** 629,632 ****
--- 630,635 ----
  // Struct pointer for msg parsing code.
  typedef void * (*message_parser)(uint8_t * raw_msg);
+ #endif 
+ 
  
  struct msg_packer {
***************
*** 642,645 ****
--- 645,649 ----
  typedef struct msg_packer msg_packer_t;
  
+ 
  #define NUMBER_OF_MOTES 30
  msg_packer_t * mp_array[NUMBER_OF_MOTES];