[Firebug-cvs] fireboard/beta/tools/gps/SiRF Makefile,1.3,1.4 sirf_id28_1.c,1.4,1.5 sirf_id28_2.c,1.4,1.5 sirf_id28_3.c,1.4,1.5 sirf_id2_1.c,1.4,1.5 sirf_id2_2.c,1.4,1.5 sirf.h,1.3,NONE

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

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

Modified Files:
	Makefile sirf_id28_1.c sirf_id28_2.c sirf_id28_3.c 
	sirf_id2_1.c sirf_id2_2.c 
Removed Files:
	sirf.h 
Log Message:
MOved sirf header to lib sirf

Index: sirf_id28_3.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id28_3.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sirf_id28_3.c	1 Aug 2005 19:17:21 -0000	1.4
--- sirf_id28_3.c	1 Aug 2005 20:05:07 -0000	1.5
***************
*** 17,22 ****
--- 17,24 ----
  //#include "SiRF_ID28_3P_private.h"
  /** Not the best way to handle xbow dependencies. */
+ #ifdef TELOS_MOTE
  #include "../xdb.h"
  #include "../xsensors.h"
+ #endif
  
  
***************
*** 25,29 ****
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID28_3P SiRF_ID28_3P;
! //typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 154;
--- 27,33 ----
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID28_3P SiRF_ID28_3P;
! #ifndef TELOS_MOTE
! typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
! #endif
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 154;
***************
*** 332,336 ****
--- 336,342 ----
  data->phase_error_count,
  data->low_power_count);
+ #ifdef TELOS_MOTE
  xdb_execute(pg_command);
+ #endif
  }
  
***************
*** 573,576 ****
--- 579,583 ----
  }
  
+ #ifdef TELOS_MOTE
  XPacketHandler SiRF_ID28_3P_packet_handler = {
  // This should be replaced with the AM_TYPE
***************
*** 590,593 ****
--- 597,601 ----
  xpacket_add_type(&SiRF_ID28_3P_packet_handler);
  }
+ #endif
  /** The default size of this message type in bytes. */
  //static int DEFAULT_MESSAGE_SIZE = 23;

--- sirf.h DELETED ---

Index: sirf_id2_1.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id2_1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sirf_id2_1.c	1 Aug 2005 19:17:21 -0000	1.4
--- sirf_id2_1.c	1 Aug 2005 20:05:07 -0000	1.5
***************
*** 17,22 ****
--- 17,24 ----
  //#include "SiRF_ID2_1P_private.h"
  /** Not the best way to handle xbow dependencies. */
+ #ifdef TELOS_MOTE
  #include "../xdb.h"
  #include "../xsensors.h"
+ #endif
  
  
***************
*** 25,29 ****
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID2_1P SiRF_ID2_1P;
! //typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 150;
--- 27,33 ----
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID2_1P SiRF_ID2_1P;
! #ifndef TELOS_MOTE
! typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
! #endif
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 150;
***************
*** 254,258 ****
--- 258,264 ----
  data->mode2,
  data->gps_week);
+ #ifdef TELOS_MOTE
  xdb_execute(pg_command);
+ #endif
  }
  
***************
*** 435,438 ****
--- 441,445 ----
  }
  
+ #ifdef TELOS_MOTE
  XPacketHandler SiRF_ID2_1P_packet_handler = {
  // This should be replaced with the AM_TYPE
***************
*** 452,455 ****
--- 459,463 ----
  xpacket_add_type(&SiRF_ID2_1P_packet_handler);
  }
+ #endif
  /** The default size of this message type in bytes. */
  //static int DEFAULT_MESSAGE_SIZE = 27;

Index: sirf_id2_2.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id2_2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sirf_id2_2.c	1 Aug 2005 19:17:21 -0000	1.4
--- sirf_id2_2.c	1 Aug 2005 20:05:07 -0000	1.5
***************
*** 17,22 ****
--- 17,24 ----
  //#include "SiRF_ID2_2P_private.h"
  /** Not the best way to handle xbow dependencies. */
+ #ifdef TELOS_MOTE
  #include "../xdb.h"
  #include "../xsensors.h"
+ #endif
  
  
***************
*** 25,29 ****
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID2_2P SiRF_ID2_2P;
! //typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 151;
--- 27,33 ----
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID2_2P SiRF_ID2_2P;
! #ifndef TELOS_MOTE
! typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
! #endif
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 151;
***************
*** 306,310 ****
--- 310,316 ----
  data->ch11,
  data->ch12);
+ #ifdef TELOS_MOTE
  xdb_execute(pg_command);
+ #endif
  }
  
***************
*** 527,530 ****
--- 533,537 ----
  }
  
+ #ifdef TELOS_MOTE
  XPacketHandler SiRF_ID2_2P_packet_handler = {
  // This should be replaced with the AM_TYPE
***************
*** 544,547 ****
--- 551,555 ----
  xpacket_add_type(&SiRF_ID2_2P_packet_handler);
  }
+ #endif
  /** The default size of this message type in bytes. */
  //static int DEFAULT_MESSAGE_SIZE = 21;

Index: sirf_id28_1.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id28_1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sirf_id28_1.c	1 Aug 2005 19:17:21 -0000	1.4
--- sirf_id28_1.c	1 Aug 2005 20:05:07 -0000	1.5
***************
*** 17,22 ****
--- 17,24 ----
  //#include "SiRF_ID28_1P_private.h"
  /** Not the best way to handle xbow dependencies. */
+ #ifdef TELOS_MOTE
  #include "../xdb.h"
  #include "../xsensors.h"
+ #endif
  
  
***************
*** 25,29 ****
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID28_1P SiRF_ID28_1P;
! //typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 152;
--- 27,33 ----
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID28_1P SiRF_ID28_1P;
! #ifndef TELOS_MOTE
! typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
! #endif
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 152;
***************
*** 176,180 ****
--- 180,186 ----
  data->sat_id,
  data->gps_sw_time);
+ #ifdef TELOS_MOTE
  xdb_execute(pg_command);
+ #endif
  }
  
***************
*** 297,300 ****
--- 303,307 ----
  }
  
+ #ifdef TELOS_MOTE
  XPacketHandler SiRF_ID28_1P_packet_handler = {
  // This should be replaced with the AM_TYPE
***************
*** 314,317 ****
--- 321,325 ----
  xpacket_add_type(&SiRF_ID28_1P_packet_handler);
  }
+ #endif
  /** The default size of this message type in bytes. */
  //static int DEFAULT_MESSAGE_SIZE = 18;

Index: Makefile
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	29 Jul 2005 19:12:26 -0000	1.3
--- Makefile	1 Aug 2005 20:05:07 -0000	1.4
***************
*** 2,10 ****
  SRC = sirf_id2_1.c sirf_id2_2.c sirf_id28_1.c sirf_id28_2.c sirf_id28_3.c 
  
  
  # uint32_t -> int format produces annoying warning messages,
  # disable it for now.
  test: 
! 	gcc -Wall -Wno-format  -o sirftest sirftest.c $(SRC)
  
  
--- 2,11 ----
  SRC = sirf_id2_1.c sirf_id2_2.c sirf_id28_1.c sirf_id28_2.c sirf_id28_3.c 
  
+ INCLUDES = ../../../tos/lib/SiRF
  
  # uint32_t -> int format produces annoying warning messages,
  # disable it for now.
  test: 
! 	gcc -Wall -Wno-format  -o sirftest -I$(INCLUDES) sirftest.c $(SRC)
  
  

Index: sirf_id28_2.c
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tools/gps/SiRF/sirf_id28_2.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sirf_id28_2.c	1 Aug 2005 19:17:21 -0000	1.4
--- sirf_id28_2.c	1 Aug 2005 20:05:07 -0000	1.5
***************
*** 17,22 ****
--- 17,24 ----
  //#include "SiRF_ID28_2P_private.h"
  /** Not the best way to handle xbow dependencies. */
+ #ifdef TELOS_MOTE
  #include "../xdb.h"
  #include "../xsensors.h"
+ #endif
  
  
***************
*** 25,29 ****
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID28_2P SiRF_ID28_2P;
! //typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 153;
--- 27,33 ----
  /** These need to be moved to a header file. */
  typedef struct _SiRF_ID28_2P SiRF_ID28_2P;
! #ifndef TELOS_MOTE
! typedef struct _XbowSensorboardPacket XbowSensorboardPacket;
! #endif
  /** The Active Message type associated with this message. */
  //static const int AM_TYPE = 153;
***************
*** 176,180 ****
--- 180,186 ----
  data->carrier_phase,
  data->time_in_track);
+ #ifdef TELOS_MOTE
  xdb_execute(pg_command);
+ #endif
  }
  
***************
*** 297,300 ****
--- 303,307 ----
  }
  
+ #ifdef TELOS_MOTE
  XPacketHandler SiRF_ID28_2P_packet_handler = {
  // This should be replaced with the AM_TYPE
***************
*** 314,317 ****
--- 321,325 ----
  xpacket_add_type(&SiRF_ID28_2P_packet_handler);
  }
+ #endif
  /** The default size of this message type in bytes. */
  //static int DEFAULT_MESSAGE_SIZE = 26;