Revision: 9049
http://playerstage.svn.sourceforge.net/playerstage/?rev=9049&view=rev
Author: jpgr87
Date: 2011-05-24 01:58:11 +0000 (Tue, 24 May 2011)
Log Message:
-----------
Re-ran sed without clobbering the svn internal files, capabilities request typo
should be sorted out now
Modified Paths:
--------------
code/player/trunk/libplayercore/driver.h
code/player/trunk/libplayerinterface/functiontable.c
code/player/trunk/libplayerinterface/player.h
code/player/trunk/server/drivers/audio/alsa.cc
code/player/trunk/server/drivers/gps/gbxgarminacfr.cc
code/player/trunk/server/drivers/limb/eeDHcontroller.cc
code/player/trunk/server/drivers/mixed/p2os/p2os.cc
code/player/trunk/server/drivers/opaque/flexiport.cc
code/player/trunk/server/drivers/power/oceanserver.cc
code/player/trunk/server/drivers/ranger/fromranger.cc
code/player/trunk/server/drivers/ranger/gbxsickacfr.cc
code/player/trunk/server/drivers/ranger/hokuyo_aist.cc
code/player/trunk/server/drivers/ranger/toranger.cc
Modified: code/player/trunk/libplayercore/driver.h
===================================================================
--- code/player/trunk/libplayercore/driver.h 2011-05-24 01:47:08 UTC (rev
9048)
+++ code/player/trunk/libplayercore/driver.h 2011-05-24 01:58:11 UTC (rev
9049)
@@ -84,12 +84,12 @@
*/
#define HANDLE_CAPABILITY_REQUEST(device_addr, queue, hdr, data, cap_type,
cap_subtype) \
- if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ,
device_addr)) \
+ if(Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ,
device_addr)) \
{ \
player_capabilities_req_t & cap_req = *
reinterpret_cast<player_capabilities_req_t *> (data);\
if (cap_req.type == cap_type && cap_req.subtype == cap_subtype) \
{ \
- Publish(device_addr, queue, PLAYER_MSGTYPE_RESP_ACK,
PLAYER_CAPABILTIES_REQ); \
+ Publish(device_addr, queue, PLAYER_MSGTYPE_RESP_ACK,
PLAYER_CAPABILITIES_REQ); \
return 0; \
} \
}
Modified: code/player/trunk/libplayerinterface/functiontable.c
===================================================================
--- code/player/trunk/libplayerinterface/functiontable.c 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/libplayerinterface/functiontable.c 2011-05-24
01:58:11 UTC (rev 9049)
@@ -88,7 +88,7 @@
{
/* This list is currently alphabetized, please keep it that way! */
/* universal messages */
- {0, PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ,
+ {0, PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ,
(player_pack_fn_t)player_capabilities_req_pack, NULL, NULL},
{0, PLAYER_MSGTYPE_REQ, PLAYER_GET_BOOLPROP_REQ,
(player_pack_fn_t)player_boolprop_req_pack,
(player_copy_fn_t)player_boolprop_req_t_copy,
(player_cleanup_fn_t)player_boolprop_req_t_cleanup,
Modified: code/player/trunk/libplayerinterface/player.h
===================================================================
--- code/player/trunk/libplayerinterface/player.h 2011-05-24 01:47:08 UTC
(rev 9048)
+++ code/player/trunk/libplayerinterface/player.h 2011-05-24 01:58:11 UTC
(rev 9049)
@@ -376,7 +376,7 @@
@defgroup capabilities Capabilities
Querying driver capabilities.
-All drivers will respond to the universal request subtype,
PLAYER_CAPABILTIES_REQ.
+All drivers will respond to the universal request subtype,
PLAYER_CAPABILITIES_REQ.
This request takes a data structure that defines the message type and subtype
of the
capability you wish to query. The driver will respond with a NACK if the
capability
@@ -385,12 +385,12 @@
The HANDLE_CAPABILITY_REQUEST macro (from driver.h) can be used to make this
process
simpler, an example call would be something like this at the start of
ProcessMessage
-HANDLE_CAPABILITY_REQUEST (position_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+HANDLE_CAPABILITY_REQUEST (position_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
HANDLE_CAPABILITY_REQUEST (position_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_CMD, PLAYER_POSITION2D_CMD_VEL);
*/
-#define PLAYER_CAPABILTIES_REQ 255
+#define PLAYER_CAPABILITIES_REQ 255
/** @brief Structure containing a single capability request */
typedef struct player_capabilities_req
Modified: code/player/trunk/server/drivers/audio/alsa.cc
===================================================================
--- code/player/trunk/server/drivers/audio/alsa.cc 2011-05-24 01:47:08 UTC
(rev 9048)
+++ code/player/trunk/server/drivers/audio/alsa.cc 2011-05-24 01:58:11 UTC
(rev 9049)
@@ -2575,7 +2575,7 @@
int Alsa::ProcessMessage (QueuePointer &resp_queue, player_msghdr *hdr, void
*data)
{
// Check for capabilities requests first
- HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
if (pbHandle)
{
HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_CMD, PLAYER_AUDIO_CMD_WAV_PLAY);
Modified: code/player/trunk/server/drivers/gps/gbxgarminacfr.cc
===================================================================
--- code/player/trunk/server/drivers/gps/gbxgarminacfr.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/gps/gbxgarminacfr.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -189,7 +189,7 @@
int GbxGarminAcfr::ProcessMessage (QueuePointer &resp_queue, player_msghdr
*hdr, void *data)
{
// Check for capability requests
- HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
return -1;
}
Modified: code/player/trunk/server/drivers/limb/eeDHcontroller.cc
===================================================================
--- code/player/trunk/server/drivers/limb/eeDHcontroller.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/limb/eeDHcontroller.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -608,7 +608,7 @@
void * data)
{
// Check for capabilities requests first
- HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_LIMB_REQ_SPEED);
HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_CMD, PLAYER_LIMB_CMD_SETPOSE);
HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_CMD, PLAYER_LIMB_CMD_SETPOSITION);
Modified: code/player/trunk/server/drivers/mixed/p2os/p2os.cc
===================================================================
--- code/player/trunk/server/drivers/mixed/p2os/p2os.cc 2011-05-24 01:47:08 UTC
(rev 9048)
+++ code/player/trunk/server/drivers/mixed/p2os/p2os.cc 2011-05-24 01:58:11 UTC
(rev 9049)
@@ -2220,12 +2220,12 @@
void * data)
{
// Check for capabilities requests first
- HANDLE_CAPABILITY_REQUEST (position_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
- HANDLE_CAPABILITY_REQUEST (actarray_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
- HANDLE_CAPABILITY_REQUEST (lift_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
- HANDLE_CAPABILITY_REQUEST (limb_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
- HANDLE_CAPABILITY_REQUEST (gripper_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
- HANDLE_CAPABILITY_REQUEST (armgripper_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (position_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (actarray_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (lift_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (limb_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (gripper_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (armgripper_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
// Position2d caps
HANDLE_CAPABILITY_REQUEST (position_id, resp_queue, hdr, data,
PLAYER_MSGTYPE_CMD, PLAYER_POSITION2D_CMD_VEL);
// Act array caps
Modified: code/player/trunk/server/drivers/opaque/flexiport.cc
===================================================================
--- code/player/trunk/server/drivers/opaque/flexiport.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/opaque/flexiport.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -181,7 +181,7 @@
{
// Check for capability requests
HANDLE_CAPABILITY_REQUEST (device_addr, respQueue, hdr, data,
- PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
// Property handlers that need to be done manually due to calling into
the urg_nz library.
if (Message::MatchMessage (hdr, PLAYER_MSGTYPE_REQ,
PLAYER_SET_INTPROP_REQ, device_addr))
Modified: code/player/trunk/server/drivers/power/oceanserver.cc
===================================================================
--- code/player/trunk/server/drivers/power/oceanserver.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/power/oceanserver.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -161,7 +161,7 @@
int OceanServer::ProcessMessage (QueuePointer &resp_queue, player_msghdr *hdr,
void *data)
{
// Check for capability requests
- HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
return -1;
}
Modified: code/player/trunk/server/drivers/ranger/fromranger.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/fromranger.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/ranger/fromranger.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -68,7 +68,7 @@
int FromRanger::ProcessMessage (QueuePointer &respQueue, player_msghdr *hdr,
void *data)
{
// Check for capabilities requests first
- HANDLE_CAPABILITY_REQUEST (device_addr, respQueue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, respQueue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
// Pass property get/set messages through to the input device
if (Message::MatchMessage (hdr, PLAYER_MSGTYPE_REQ,
PLAYER_GET_INTPROP_REQ, device_addr) ||
Modified: code/player/trunk/server/drivers/ranger/gbxsickacfr.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/gbxsickacfr.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/ranger/gbxsickacfr.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -317,7 +317,7 @@
int GbxSickAcfr::ProcessMessage (QueuePointer &resp_queue, player_msghdr *hdr,
void *data)
{
// Check for capability requests
- HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_RANGER_REQ_GET_GEOM);
HANDLE_CAPABILITY_REQUEST (device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_RANGER_REQ_GET_CONFIG);
Modified: code/player/trunk/server/drivers/ranger/hokuyo_aist.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/hokuyo_aist.cc 2011-05-24
01:47:08 UTC (rev 9048)
+++ code/player/trunk/server/drivers/ranger/hokuyo_aist.cc 2011-05-24
01:58:11 UTC (rev 9049)
@@ -291,7 +291,7 @@
{
// Check for capability requests
HANDLE_CAPABILITY_REQUEST(device_addr, resp_queue, hdr, data,
- PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
HANDLE_CAPABILITY_REQUEST(device_addr, resp_queue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_RANGER_REQ_GET_GEOM);
HANDLE_CAPABILITY_REQUEST(device_addr, resp_queue, hdr, data,
Modified: code/player/trunk/server/drivers/ranger/toranger.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/toranger.cc 2011-05-24 01:47:08 UTC
(rev 9048)
+++ code/player/trunk/server/drivers/ranger/toranger.cc 2011-05-24 01:58:11 UTC
(rev 9049)
@@ -91,7 +91,7 @@
int ToRanger::ProcessMessage (QueuePointer &respQueue, player_msghdr *hdr,
void *data)
{
// Check for capabilities requests first
- HANDLE_CAPABILITY_REQUEST (device_addr, respQueue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILTIES_REQ);
+ HANDLE_CAPABILITY_REQUEST (device_addr, respQueue, hdr, data,
PLAYER_MSGTYPE_REQ, PLAYER_CAPABILITIES_REQ);
// Pass property get/set messages through to the input device
if (Message::MatchMessage (hdr, PLAYER_MSGTYPE_REQ,
PLAYER_GET_INTPROP_REQ, device_addr) ||
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
