Update of /cvsroot/playerstage/code/player/server/drivers/mixed/p2os
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/p2os
Modified Files:
p2os.cc p2os.h
Log Message:
applied Toby's autopointer patches
Index: p2os.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/p2os/p2os.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** p2os.h 10 Jul 2006 16:55:38 -0000 1.33
--- p2os.h 23 Aug 2007 19:58:45 -0000 1.34
***************
*** 222,226 ****
/* toggle motors on/off, according to val */
void ToggleMotorPower(unsigned char val);
! int HandleConfig(MessageQueue* resp_queue,
player_msghdr * hdr,
void* data);
--- 222,226 ----
/* toggle motors on/off, according to val */
void ToggleMotorPower(unsigned char val);
! int HandleConfig(QueuePointer & resp_queue,
player_msghdr * hdr,
void* data);
***************
*** 324,329 ****
// MessageHandler
! virtual int ProcessMessage(MessageQueue * resp_queue,
! player_msghdr * hdr,
void * data);
--- 324,329 ----
// MessageHandler
! virtual int ProcessMessage(QueuePointer & resp_queue,
! player_msghdr * hdr,
void * data);
Index: p2os.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/p2os/p2os.cc,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** p2os.cc 20 Aug 2007 06:37:29 -0000 1.82
--- p2os.cc 23 Aug 2007 19:58:45 -0000 1.83
***************
*** 724,728 ****
}
struct sockaddr_in addr;
! assert(h->h_length <= (int) (sizeof(addr.sin_addr)));
//printf("gethostbyname returned address %d length %d.\n", * h->h_addr,
h->h_length);
memcpy(&(addr.sin_addr), h->h_addr, h->h_length);
--- 724,728 ----
}
struct sockaddr_in addr;
! assert((size_t)h->h_length <= sizeof(addr.sin_addr));
//printf("gethostbyname returned address %d length %d.\n", * h->h_addr,
h->h_length);
memcpy(&(addr.sin_addr), h->h_addr, h->h_length);
***************
*** 1372,1376 ****
// put odometry data
! this->Publish(this->position_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
--- 1372,1376 ----
// put odometry data
! this->Publish(this->position_id,
PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
***************
*** 1380,1384 ****
// put sonar data
! this->Publish(this->sonar_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_SONAR_DATA_RANGES,
--- 1380,1384 ----
// put sonar data
! this->Publish(this->sonar_id,
PLAYER_MSGTYPE_DATA,
PLAYER_SONAR_DATA_RANGES,
***************
*** 1388,1392 ****
// put aio data
! this->Publish(this->aio_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_AIO_DATA_STATE,
--- 1388,1392 ----
// put aio data
! this->Publish(this->aio_id,
PLAYER_MSGTYPE_DATA,
PLAYER_AIO_DATA_STATE,
***************
*** 1396,1400 ****
// put dio data
! this->Publish(this->dio_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_DIO_DATA_VALUES,
--- 1396,1400 ----
// put dio data
! this->Publish(this->dio_id,
PLAYER_MSGTYPE_DATA,
PLAYER_DIO_DATA_VALUES,
***************
*** 1404,1408 ****
// put gripper data
! this->Publish(this->gripper_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
--- 1404,1408 ----
// put gripper data
! this->Publish(this->gripper_id,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
***************
*** 1412,1416 ****
// put lift data
! this->Publish(this->lift_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_ACTARRAY_DATA_STATE,
--- 1412,1416 ----
// put lift data
! this->Publish(this->lift_id,
PLAYER_MSGTYPE_DATA,
PLAYER_ACTARRAY_DATA_STATE,
***************
*** 1420,1424 ****
// put bumper data
! this->Publish(this->bumper_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_BUMPER_DATA_STATE,
--- 1420,1424 ----
// put bumper data
! this->Publish(this->bumper_id,
PLAYER_MSGTYPE_DATA,
PLAYER_BUMPER_DATA_STATE,
***************
*** 1428,1432 ****
// put power data
! this->Publish(this->power_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_POWER_DATA_STATE,
--- 1428,1432 ----
// put power data
! this->Publish(this->power_id,
PLAYER_MSGTYPE_DATA,
PLAYER_POWER_DATA_STATE,
***************
*** 1436,1440 ****
// put compass data
! this->Publish(this->compass_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
--- 1436,1440 ----
// put compass data
! this->Publish(this->compass_id,
PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
***************
*** 1444,1448 ****
// put gyro data
! this->Publish(this->gyro_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
--- 1444,1448 ----
// put gyro data
! this->Publish(this->gyro_id,
PLAYER_MSGTYPE_DATA,
PLAYER_POSITION2D_DATA_STATE,
***************
*** 1452,1456 ****
// put blobfinder data
! this->Publish(this->blobfinder_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_BLOBFINDER_DATA_BLOBS,
--- 1452,1456 ----
// put blobfinder data
! this->Publish(this->blobfinder_id,
PLAYER_MSGTYPE_DATA,
PLAYER_BLOBFINDER_DATA_BLOBS,
***************
*** 1460,1464 ****
// put actarray data
! this->Publish(this->actarray_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_ACTARRAY_DATA_STATE,
--- 1460,1464 ----
// put actarray data
! this->Publish(this->actarray_id,
PLAYER_MSGTYPE_DATA,
PLAYER_ACTARRAY_DATA_STATE,
***************
*** 1468,1472 ****
// put limb data
! this->Publish(this->limb_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_LIMB_DATA_STATE,
--- 1468,1472 ----
// put limb data
! this->Publish(this->limb_id,
PLAYER_MSGTYPE_DATA,
PLAYER_LIMB_DATA_STATE,
***************
*** 1476,1480 ****
// put arm gripper data
! this->Publish(this->armgripper_id, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
--- 1476,1480 ----
// put arm gripper data
! this->Publish(this->armgripper_id,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
***************
*** 2061,2065 ****
int
! P2OS::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data)
--- 2061,2065 ----
int
! P2OS::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
***************
*** 2110,2114 ****
int
! P2OS::HandleConfig(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 2110,2114 ----
int
! P2OS::HandleConfig(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
-------------------------------------------------------------------------
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
