Update of /cvsroot/playerstage/code/player/server/drivers/rfid
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/rfid
Modified Files:
insideM300.cc phidgetRFID.cc sickrfi341.cc skyetekM1.cc
Log Message:
applied Toby's autopointer patches
Index: phidgetRFID.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/rfid/phidgetRFID.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** phidgetRFID.cc 9 Jun 2007 04:15:08 -0000 1.1
--- phidgetRFID.cc 23 Aug 2007 19:58:48 -0000 1.2
***************
*** 124,128 ****
virtual int Shutdown();
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr, void * data);
private:
--- 124,128 ----
virtual int Shutdown();
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr, void * data);
private:
***************
*** 253,257 ****
}
! int Phidgetrfid::ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data) {
--- 253,257 ----
}
! int Phidgetrfid::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data) {
***************
*** 401,405 ****
//Publishing data.
if (rfid_id.interf !=0) {
! Publish(rfid_id, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA,
(unsigned char*)&data_rfid, sizeof(player_rfid_data_t), NULL);
}
--- 401,405 ----
//Publishing data.
if (rfid_id.interf !=0) {
! Publish(rfid_id, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA, (unsigned
char*)&data_rfid, sizeof(player_rfid_data_t), NULL);
}
Index: skyetekM1.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/rfid/skyetekM1.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** skyetekM1.cc 20 Aug 2007 06:37:30 -0000 1.5
--- skyetekM1.cc 23 Aug 2007 19:58:48 -0000 1.6
***************
*** 106,110 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 106,110 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage (QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 283,287 ****
! int SkyetekM1::ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 283,287 ----
! int SkyetekM1::ProcessMessage (QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 368,372 ****
// Write the RFID data
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&Data, sizeof (player_rfid_data_t), NULL);
--- 368,372 ----
// Write the RFID data
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&Data, sizeof (player_rfid_data_t), NULL);
Index: sickrfi341.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/rfid/sickrfi341.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sickrfi341.cc 20 Aug 2007 06:37:30 -0000 1.3
--- sickrfi341.cc 23 Aug 2007 19:58:48 -0000 1.4
***************
*** 106,110 ****
// MessageHandler
! int ProcessMessage (MessageQueue* resp_queue,
player_msghdr* hdr,
void* data);
--- 106,110 ----
// MessageHandler
! int ProcessMessage (QueuePointer &resp_queue,
player_msghdr* hdr,
void* data);
***************
*** 199,203 ****
// ProcessMessage
int
! SickRFI341::ProcessMessage (MessageQueue* resp_queue,
player_msghdr* hdr,
void* data)
--- 199,203 ----
// ProcessMessage
int
! SickRFI341::ProcessMessage (QueuePointer &resp_queue,
player_msghdr* hdr,
void* data)
***************
*** 227,231 ****
// Make data available
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&data, sizeof (data), NULL);
--- 227,231 ----
// Make data available
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&data, sizeof (data), NULL);
Index: insideM300.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/rfid/insideM300.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** insideM300.cc 20 Aug 2007 06:37:30 -0000 1.4
--- insideM300.cc 23 Aug 2007 19:58:48 -0000 1.5
***************
*** 137,141 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 137,141 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage (QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 406,410 ****
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int InsideM300::ProcessMessage (MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 406,410 ----
////////////////////////////////////////////////////////////////////////////////
// ProcessMessage function
! int InsideM300::ProcessMessage (QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 465,469 ****
// Write the RFID data
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&Data, sizeof (player_rfid_data_t), NULL);
--- 465,469 ----
// Write the RFID data
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_RFID_DATA_TAGS,
&Data, sizeof (player_rfid_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
