Revision: 8009
http://playerstage.svn.sourceforge.net/playerstage/?rev=8009&view=rev
Author: gbiggs
Date: 2009-07-13 23:34:19 +0000 (Mon, 13 Jul 2009)
Log Message:
-----------
Applied patch #2820915
Modified Paths:
--------------
code/player/trunk/server/drivers/laser/sicklms200.cc
code/player/trunk/server/drivers/ptz/sonyevid30.cc
Modified: code/player/trunk/server/drivers/laser/sicklms200.cc
===================================================================
--- code/player/trunk/server/drivers/laser/sicklms200.cc 2009-07-13
23:00:51 UTC (rev 8008)
+++ code/player/trunk/server/drivers/laser/sicklms200.cc 2009-07-13
23:34:19 UTC (rev 8009)
@@ -910,7 +910,11 @@
// Returns 0 on success
int SickLMS200::OpenTerm()
{
+#if defined (__QNXNTO__)
+ this->laser_fd = ::open(this->device_name, O_RDWR , S_IRUSR | S_IWUSR );
+#else
this->laser_fd = ::open(this->device_name, O_RDWR | O_SYNC , S_IRUSR |
S_IWUSR );
+#endif
if (this->laser_fd < 0)
{
PLAYER_ERROR2("unable to open serial port [%s]; [%s]",
Modified: code/player/trunk/server/drivers/ptz/sonyevid30.cc
===================================================================
--- code/player/trunk/server/drivers/ptz/sonyevid30.cc 2009-07-13 23:00:51 UTC
(rev 8008)
+++ code/player/trunk/server/drivers/ptz/sonyevid30.cc 2009-07-13 23:34:19 UTC
(rev 8009)
@@ -604,7 +604,11 @@
fflush(stdout);
// open it. non-blocking at first, in case there's no ptz unit.
+#if defined (__QNXNTO__)
+ if((ptz_fd = open(ptz_serial_port, O_RDWR | O_NONBLOCK, S_IRUSR | S_IWUSR ))
< 0 )
+#else
if((ptz_fd = open(ptz_serial_port, O_RDWR | O_SYNC | O_NONBLOCK, S_IRUSR |
S_IWUSR )) < 0 )
+#endif
{
perror("SonyEVID30::Setup():open():");
return(-1);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
