Update of /cvsroot/playerstage/code/player/server/drivers/mixed/rflex
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/rflex
Modified Files:
rflex.cc rflex.h
Log Message:
applied Toby's autopointer patches
Index: rflex.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/rflex/rflex.cc,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** rflex.cc 20 Aug 2007 06:37:29 -0000 1.38
--- rflex.cc 23 Aug 2007 19:58:46 -0000 1.39
***************
*** 355,359 ****
///////////////////////////////
void PrintHeader(player_msghdr_t hdr);
! int RFLEX::ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr,
void * data)
{
--- 355,359 ----
///////////////////////////////
void PrintHeader(player_msghdr_t hdr);
! int RFLEX::ProcessMessage(QueuePointer & resp_queue, player_msghdr * hdr,
void * data)
{
***************
*** 1081,1085 ****
if (position_id.interf != 0)
{
!
Publish(this->position_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_POSITION2D_DATA_STATE,
(unsigned char*)&rflex_data.position,
sizeof(player_position2d_data_t),
--- 1081,1085 ----
if (position_id.interf != 0)
{
!
Publish(this->position_id,PLAYER_MSGTYPE_DATA,PLAYER_POSITION2D_DATA_STATE,
(unsigned char*)&rflex_data.position,
sizeof(player_position2d_data_t),
***************
*** 1088,1092 ****
if (sonar_id.interf != 0)
{
!
Publish(this->sonar_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_SONAR_DATA_RANGES,
(unsigned char*)&rflex_data.sonar,
sizeof(player_sonar_data_t),
--- 1088,1092 ----
if (sonar_id.interf != 0)
{
! Publish(this->sonar_id,PLAYER_MSGTYPE_DATA,PLAYER_SONAR_DATA_RANGES,
(unsigned char*)&rflex_data.sonar,
sizeof(player_sonar_data_t),
***************
*** 1113,1117 ****
Unlock();
if (sonar_id_2.interf)
! Publish(this->sonar_id_2, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_SONAR_DATA_GEOM,
(unsigned char*)&geom, sizeof(player_sonar_geom_t), NULL);
}
--- 1113,1117 ----
Unlock();
if (sonar_id_2.interf)
! Publish(this->sonar_id_2, PLAYER_MSGTYPE_DATA,
PLAYER_SONAR_DATA_GEOM,
(unsigned char*)&geom, sizeof(player_sonar_geom_t), NULL);
}
***************
*** 1119,1138 ****
if (sonar_id_2.interf)
!
Publish(this->sonar_id_2,NULL,PLAYER_MSGTYPE_DATA,PLAYER_SONAR_DATA_RANGES,
(unsigned char*)&rflex_data.sonar2,
sizeof(player_sonar_data_t),
NULL);
if (ir_id.interf)
! Publish(this->ir_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_IR_DATA_RANGES,
(unsigned char*)&rflex_data.ir,
sizeof(player_ir_data_t),
NULL);
if (bumper_id.interf)
!
Publish(this->bumper_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_BUMPER_DATA_STATE,
(unsigned char*)&rflex_data.bumper,
sizeof(player_bumper_data_t),
NULL);
if (power_id.interf)
! Publish(this->power_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_POWER_DATA_STATE,
(unsigned char*)&rflex_data.power,
sizeof(player_power_data_t),
--- 1119,1138 ----
if (sonar_id_2.interf)
! Publish(this->sonar_id_2,PLAYER_MSGTYPE_DATA,PLAYER_SONAR_DATA_RANGES,
(unsigned char*)&rflex_data.sonar2,
sizeof(player_sonar_data_t),
NULL);
if (ir_id.interf)
! Publish(this->ir_id,PLAYER_MSGTYPE_DATA,PLAYER_IR_DATA_RANGES,
(unsigned char*)&rflex_data.ir,
sizeof(player_ir_data_t),
NULL);
if (bumper_id.interf)
! Publish(this->bumper_id,PLAYER_MSGTYPE_DATA,PLAYER_BUMPER_DATA_STATE,
(unsigned char*)&rflex_data.bumper,
sizeof(player_bumper_data_t),
NULL);
if (power_id.interf)
! Publish(this->power_id,PLAYER_MSGTYPE_DATA,PLAYER_POWER_DATA_STATE,
(unsigned char*)&rflex_data.power,
sizeof(player_power_data_t),
***************
*** 1140,1144 ****
if (aio_id.interf != 0)
{
! Publish(this->aio_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_AIO_DATA_STATE,
(unsigned char*)&rflex_data.aio,
sizeof(player_aio_data_t),
--- 1140,1144 ----
if (aio_id.interf != 0)
{
! Publish(this->aio_id,PLAYER_MSGTYPE_DATA,PLAYER_AIO_DATA_STATE,
(unsigned char*)&rflex_data.aio,
sizeof(player_aio_data_t),
***************
*** 1147,1151 ****
if (dio_id.interf != 0)
{
! Publish(this->dio_id,NULL,PLAYER_MSGTYPE_DATA,PLAYER_DIO_DATA_VALUES,
(unsigned char*)&rflex_data.dio,
sizeof(player_dio_data_t),
--- 1147,1151 ----
if (dio_id.interf != 0)
{
! Publish(this->dio_id,PLAYER_MSGTYPE_DATA,PLAYER_DIO_DATA_VALUES,
(unsigned char*)&rflex_data.dio,
sizeof(player_dio_data_t),
Index: rflex.h
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/rflex/rflex.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** rflex.h 26 Jan 2006 13:31:11 -0000 1.17
--- rflex.h 23 Aug 2007 19:58:46 -0000 1.18
***************
*** 157,161 ****
// MessageHandler
! int ProcessMessage(MessageQueue* resp_queue, player_msghdr * hdr,
void * data);
--- 157,161 ----
// MessageHandler
! int ProcessMessage(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
