Update of /cvsroot/playerstage/code/player/server/drivers/wsn
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/wsn
Modified Files:
accel_calib.cc mica2.cc rcore_xbridge.cc
Log Message:
applied Toby's autopointer patches
Index: rcore_xbridge.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wsn/rcore_xbridge.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rcore_xbridge.cc 9 Feb 2007 10:27:17 -0000 1.4
--- rcore_xbridge.cc 23 Aug 2007 19:58:48 -0000 1.5
***************
*** 146,150 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 146,150 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage (QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 306,310 ****
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int RCore_XBridge::ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 306,310 ----
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int RCore_XBridge::ProcessMessage (QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 458,462 ****
if (readppacket == 0)
// Publish the WSN data
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA,
&temp_data, sizeof (player_wsn_data_t), NULL);
else
--- 458,462 ----
if (readppacket == 0)
// Publish the WSN data
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA,
&temp_data, sizeof (player_wsn_data_t), NULL);
else
***************
*** 485,489 ****
// Publish the WSN data (each packet goes separately)
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA,
&temp_data, sizeof (player_wsn_data_t), NULL);
}
--- 485,489 ----
// Publish the WSN data (each packet goes separately)
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA,
&temp_data, sizeof (player_wsn_data_t), NULL);
}
Index: mica2.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wsn/mica2.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mica2.cc 20 Aug 2007 06:37:30 -0000 1.9
--- mica2.cc 23 Aug 2007 19:58:48 -0000 1.10
***************
*** 151,155 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 151,155 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage (QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 448,452 ****
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int Mica2::ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 448,452 ----
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int Mica2::ProcessMessage (QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 1122,1131 ****
if ((provideRFID) && (rfidPacket))
// Write the RFID data
! Publish (rfid_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&rfid_data, sizeof (player_rfid_data_t), NULL);
if ((provideWSN) && (wsnPacket))
// Write the WSN data
! Publish (wsn_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA_STATE,
&wsn_data, sizeof (player_wsn_data_t), NULL);
--- 1122,1131 ----
if ((provideRFID) && (rfidPacket))
// Write the RFID data
! Publish (rfid_addr, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&rfid_data, sizeof (player_rfid_data_t), NULL);
if ((provideWSN) && (wsnPacket))
// Write the WSN data
! Publish (wsn_addr, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA_STATE,
&wsn_data, sizeof (player_wsn_data_t), NULL);
Index: accel_calib.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/wsn/accel_calib.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** accel_calib.cc 20 Aug 2007 06:37:30 -0000 1.2
--- accel_calib.cc 23 Aug 2007 19:58:48 -0000 1.3
***************
*** 131,135 ****
virtual int Shutdown ();
// This method will be invoked on each incoming message
! virtual int ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 131,135 ----
virtual int Shutdown ();
// This method will be invoked on each incoming message
! virtual int ProcessMessage (QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 290,294 ****
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int Accel_Calib::ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 290,294 ----
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int Accel_Calib::ProcessMessage (QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 347,351 ****
// Write the WSN data
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_WSN_DATA_STATE,
&new_wsn_data, sizeof (player_wsn_data_t), NULL);
--- 347,351 ----
// Write the WSN data
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_WSN_DATA_STATE,
&new_wsn_data, sizeof (player_wsn_data_t), NULL);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
