From: Brian G. <ge...@us...> - 2007-08-23 12:59:23
|
Update of /cvsroot/playerstage/code/player/server/drivers/mixed/irobot/create In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/irobot/create Modified Files: create_driver.cc Log Message: applied Toby's autopointer patches Index: create_driver.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/server/drivers/mixed/irobot/create/create_driver.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** create_driver.cc 20 Aug 2007 06:37:28 -0000 1.5 --- create_driver.cc 23 Aug 2007 19:58:45 -0000 1.6 *************** *** 122,126 **** // MessageHandler ! int ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr, void * data); --- 122,126 ---- // MessageHandler ! int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void * data); *************** *** 305,309 **** posdata.pos.pa = this->create_dev->oa; ! this->Publish(this->position_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, (void*)&posdata, sizeof(posdata), NULL); --- 305,309 ---- posdata.pos.pa = this->create_dev->oa; ! this->Publish(this->position_addr, PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE, (void*)&posdata, sizeof(posdata), NULL); *************** *** 327,331 **** PLAYER_POWER_MASK_CHARGING); ! this->Publish(this->power_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE, (void*)&powerdata, sizeof(powerdata), NULL); --- 327,331 ---- PLAYER_POWER_MASK_CHARGING); ! this->Publish(this->power_addr, PLAYER_MSGTYPE_DATA, PLAYER_POWER_DATA_STATE, (void*)&powerdata, sizeof(powerdata), NULL); *************** *** 340,344 **** bumperdata.bumpers[1] = this->create_dev->bumper_right; ! this->Publish(this->bumper_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_BUMPER_DATA_STATE, (void*)&bumperdata, sizeof(bumperdata), NULL); --- 340,344 ---- bumperdata.bumpers[1] = this->create_dev->bumper_right; ! this->Publish(this->bumper_addr, PLAYER_MSGTYPE_DATA, PLAYER_BUMPER_DATA_STATE, (void*)&bumperdata, sizeof(bumperdata), NULL); *************** *** 362,366 **** irdata.ranges[10] = (float)this->create_dev->wheeldrop_right; ! this->Publish(this->ir_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES, (void*)&irdata, sizeof(irdata), NULL); --- 362,366 ---- irdata.ranges[10] = (float)this->create_dev->wheeldrop_right; ! this->Publish(this->ir_addr, PLAYER_MSGTYPE_DATA, PLAYER_IR_DATA_RANGES, (void*)&irdata, sizeof(irdata), NULL); *************** *** 376,380 **** gripperdata.stored=0; ! this->Publish(this->gripper_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_GRIPPER_DATA_STATE, --- 376,380 ---- gripperdata.stored=0; ! this->Publish(this->gripper_addr, PLAYER_MSGTYPE_DATA, PLAYER_GRIPPER_DATA_STATE, *************** *** 393,397 **** this->cpdata->data[4]=this->create_dev->remote_opcode; ! this->Publish(this->opaque_addr, NULL, PLAYER_MSGTYPE_DATA,PLAYER_OPAQUE_DATA_STATE, (void*)this->cpdata, sizeof(*this->cpdata), NULL); --- 393,397 ---- this->cpdata->data[4]=this->create_dev->remote_opcode; ! this->Publish(this->opaque_addr, PLAYER_MSGTYPE_DATA,PLAYER_OPAQUE_DATA_STATE, (void*)this->cpdata, sizeof(*this->cpdata), NULL); *************** *** 402,406 **** int ! Create::ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr, void * data) --- 402,406 ---- int ! Create::ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void * data) |