Update of /cvsroot/playerstage/code/player/server/drivers/mixed/rmp
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/rmp
Modified Files:
segwayrmp.cc segwayrmp.h
Log Message:
applied Toby's autopointer patches
Index: segwayrmp.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/rmp/segwayrmp.cc,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** segwayrmp.cc 20 Aug 2007 06:37:29 -0000 1.45
--- segwayrmp.cc 23 Aug 2007 19:58:46 -0000 1.46
***************
*** 341,349 ****
// Send data to clients
! Publish(this->position_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
&this->position_data, sizeof(this->position_data), NULL);
! Publish(this->position3d_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION3D_DATA_STATE,
&this->position3d_data, sizeof(this->position3d_data), NULL);
! Publish(this->power_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_POWER_DATA_STATE,
&this->power_data, sizeof(this->power_data), NULL);
--- 341,349 ----
// Send data to clients
! Publish(this->position_id, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
&this->position_data, sizeof(this->position_data), NULL);
! Publish(this->position3d_id, PLAYER_MSGTYPE_DATA,
PLAYER_POSITION3D_DATA_STATE,
&this->position3d_data, sizeof(this->position3d_data), NULL);
! Publish(this->power_id, PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE,
&this->power_data, sizeof(this->power_data), NULL);
***************
*** 443,447 ****
int
! SegwayRMP::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 443,447 ----
int
! SegwayRMP::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 496,500 ****
// returns 0 to indicate we did NOT write to CAN bus
int
! SegwayRMP::HandlePositionConfig(MessageQueue* client, uint32_t subtype, void*
buffer, size_t len)
{
uint16_t rmp_cmd,rmp_val;
--- 496,500 ----
// returns 0 to indicate we did NOT write to CAN bus
int
! SegwayRMP::HandlePositionConfig(QueuePointer &client, uint32_t subtype, void*
buffer, size_t len)
{
uint16_t rmp_cmd,rmp_val;
***************
*** 714,718 ****
// returns 0 to indicate we did NOT write to CAN bus
int
! SegwayRMP::HandlePosition3DConfig(MessageQueue* client, uint32_t subtype,
void* buffer, size_t len)
{
switch(subtype)
--- 714,718 ----
// returns 0 to indicate we did NOT write to CAN bus
int
! SegwayRMP::HandlePosition3DConfig(QueuePointer &client, uint32_t subtype,
void* buffer, size_t len)
{
switch(subtype)
Index: segwayrmp.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/rmp/segwayrmp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** segwayrmp.h 1 Mar 2007 20:41:47 -0000 1.7
--- segwayrmp.h 23 Aug 2007 19:58:46 -0000 1.8
***************
*** 39,43 ****
virtual int Setup();
virtual int Shutdown();
! virtual int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 39,43 ----
virtual int Setup();
virtual int Shutdown();
! virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 84,91 ****
// helper to handle config requests
! int HandlePositionConfig(MessageQueue* resp_queue, uint32_t subtype,
void* data, size_t len);
// helper to handle config requests
! int HandlePosition3DConfig(MessageQueue* resp_queue, uint32_t subtype,
void* data, size_t len);
// helper to read a cycle of data from the RMP
--- 84,91 ----
// helper to handle config requests
! int HandlePositionConfig(QueuePointer &resp_queue, uint32_t subtype,
void* data, size_t len);
// helper to handle config requests
! int HandlePosition3DConfig(QueuePointer &resp_queue, uint32_t subtype,
void* data, size_t len);
// helper to read a cycle of data from the RMP
-------------------------------------------------------------------------
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
