Update of /cvsroot/playerstage/code/player/libplayerxdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15335/libplayerxdr
Modified Files:
functiontable.c
Log Message:
applied Radu's patches to fix some inconsistencies in the core components
Index: functiontable.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayerxdr/functiontable.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** functiontable.c 10 Jul 2006 16:55:38 -0000 1.63
--- functiontable.c 26 Jul 2006 17:14:16 -0000 1.64
***************
*** 398,401 ****
--- 398,403 ----
{PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_CMD, PLAYER_POSITION3D_CMD_SET_VEL,
(player_pack_fn_t)player_position3d_cmd_vel_pack},
+ {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_GET_GEOM,
+ (player_pack_fn_t)player_position3d_geom_pack},
{PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_MOTOR_POWER,
(player_pack_fn_t)player_position3d_power_config_pack},
***************
*** 408,412 ****
{PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION3D_VELOCITY_MODE,
(player_pack_fn_t)player_position3d_velocity_mode_config_pack},
!
/* power messages */
--- 410,419 ----
{PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ,
PLAYER_POSITION3D_VELOCITY_MODE,
(player_pack_fn_t)player_position3d_velocity_mode_config_pack},
! {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_SPEED_PID,
! (player_pack_fn_t)player_position3d_speed_pid_req_pack},
! {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_POSITION_PID,
! (player_pack_fn_t)player_position3d_position_pid_req_pack},
! {PLAYER_POSITION3D_CODE, PLAYER_MSGTYPE_REQ, PLAYER_POSITION3D_SPEED_PROF,
! (player_pack_fn_t)player_position3d_speed_prof_req_pack},
/* power messages */
***************
*** 568,571 ****
--- 575,589 ----
return(NULL);
+ for(i=0;i<ftable_len;i++)
+ {
+ curr = ftable + i;
+ // Make sure the interface and subtype match exactly.
+ // match anyway if interface = 0 (universal data types)
+ if((curr->interf == interf || curr->interf == 0) &&
+ curr->type == type &&
+ curr->subtype == subtype)
+ return(curr->func);
+ }
+
// The supplied type can be RESP_ACK if the registered type is REQ.
if (type == PLAYER_MSGTYPE_RESP_ACK || type == PLAYER_MSGTYPE_RESP_NACK)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
