Coexistence with ico-uxf-device-input-controller.

Change-Id: Ia7e9625a03485e31ed16408504f456466ae2c06a
Signed-off-by: Hayato Nakamura <hayato.nakamura@mail.toyota-td.jp>

diff --git a/carsim.service b/carsim.service
index 1ab7c84..111d946 100644 (file)
--- a/carsim.service
+++ b/carsim.service
@@ -7,6 +7,7 @@ Description=Carsimulator supported by G25 and G27.
 After=ambd.service
 
 [Service]
+Type=oneshot
 ExecStart=/usr/bin/carsim
 
 [Install]

diff --git a/packaging/ico-vic-carsimulator.changes b/packaging/ico-vic-carsimulator.changes
index d257265..82dccd8 100644 (file)
--- a/packaging/ico-vic-carsimulator.changes
+++ b/packaging/ico-vic-carsimulator.changes
@@ -1,3 +1,7 @@
+* Thu Sep 19 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/20130917.224135@6e9f63d
+- 0.9.04 release.
+-- Coexistence with ico-uxf-device-input-controller(for GTForce).
+
 * Mon Sep 16 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/2.0alpha-wayland/20130612.174818@b57c2a9
 - 0.9.03 release.
 -- Retry to Websocket connection failure.

diff --git a/packaging/ico-vic-carsimulator.spec b/packaging/ico-vic-carsimulator.spec
index 7ab5900..4097377 100644 (file)
--- a/packaging/ico-vic-carsimulator.spec
+++ b/packaging/ico-vic-carsimulator.spec
@@ -1,23 +1,25 @@
 Name:       ico-vic-carsimulator
 Summary:    CarSimulator
-Version:    0.9.03
+Version:    0.9.04
 Release:    1.1
 Group:      System Environment/Daemons
 License:    Apache 2.0
 Source0:    %{name}-%{version}.tar.bz2
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires:       glib2 
-Requires:       ico-vic-amb-plugin 
+Requires:       glib2
+Requires:       ico-vic-amb-plugin
 Requires:       ico-uxf-utilities
 BuildRequires:  make
 BuildRequires:  automake
 BuildRequires:  boost-devel
+#BuildRequires:  libwebsockets-devel
 BuildRequires:  glib2-devel
 BuildRequires:  json-glib-devel
+#BuildRequires:  ico-uxf-utilities
 BuildRequires:  ico-uxf-utilities-devel
 
-%description 
+%description
 CarSimulator is simulated driving software
 
 %prep
@@ -37,6 +39,7 @@ rm -rf %{buildroot}
 %define carsim_conf /usr/bin/
 mkdir -p %{buildroot}/etc/carsim/
 mkdir -p %{buildroot}/usr/lib/systemd/system/
+#install -m 0644 src/CarSim_Daemon.conf %{buildroot}%{carsim_conf}
 install -m 0644 G25.conf %{buildroot}/etc/carsim/
 install -m 0644 G27.conf %{buildroot}/etc/carsim/
 install -m 0644 carsim.service %{buildroot}/usr/lib/systemd/system/
@@ -49,3 +52,4 @@ install -m 0644 carsim.service %{buildroot}/usr/lib/systemd/system/
 %{_bindir}/*
 /etc/carsim/*
 /usr/lib/systemd/system/carsim.service
+#%{carsim_conf}/CarSim_Daemon.conf

diff --git a/src/AmbpiComm.cpp b/src/AmbpiComm.cpp
index b50f974..7efe0cc 100644 (file)
--- a/src/AmbpiComm.cpp
+++ b/src/AmbpiComm.cpp
@@ -226,15 +226,15 @@ bool AmbpiCommIF::init(const char* uri, const char* protocolName)
     }
     m_uri = uri;
     m_pNm = protocolName;
-       int loopcount = 0;
-       do {
-               m_context = ico_uws_create_context(uri, protocolName);
-               if (NULL != m_context) {
-                       break;
-               }
+    int loopcount = 0;
+    do {
+        m_context = ico_uws_create_context(uri, protocolName);
+        if (NULL != m_context) {
+            break;
+        }
         cerr << m_pNm << ":Failed to create context." << endl;
-               usleep (500 * 1000);
-       } while (m_context == NULL && ++loopcount < RECONNECT_WS);
+        usleep (500 * 1000);
+    } while (m_context == NULL && ++loopcount < RECONNECT_WS);
     int r = ico_uws_set_event_cb(m_context, _icoUwsCallback, (void*)this);
     if (ICO_UWS_ERR_NONE != r) {
         cerr << m_pNm << ":Failed to callback entry(" << r << ")." << endl;

diff --git a/src/CJoyStickEV.cpp b/src/CJoyStickEV.cpp
index 9e19c97..dcc16f6 100644 (file)
--- a/src/CJoyStickEV.cpp
+++ b/src/CJoyStickEV.cpp
@@ -309,9 +309,11 @@ bool CJoyStickEV::deviceGrab(int fd)
     if (0 > fd) {
         return false;
     }
+#if 0           /* no need grab on weston-1.2.x */
     if (0 > ioctl(fd, EVIOCGRAB, 1)) {
          return false;
     }
+#endif
     m_grab = true;
     return true;
 }
@@ -327,9 +329,11 @@ bool CJoyStickEV::deviceGrabRelese(int fd)
     if (false == m_grab) {
         return false;
     }
+#if 0           /* no need grab on weston-1.2.x */
     if (0 > ioctl(fd, EVIOCGRAB, 0)) {
         return false;
     }
+#endif
     m_grab = false;
     return true;
 }

diff --git a/src/Makefile.am b/src/Makefile.am
index ba22cb8..c9a8cd1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = carsim
 
 carsim_SOURCES = AmbpiComm.h AmbpiComm.cpp CJoyStick.h CJoyStick.cpp CJoyStickEV.h CJoyStickEV.cpp CJoyStickG25.h CJoyStickG25.cpp CJoyStickG27.h CJoyStickG27.cpp CConf.h CConf.cpp CGtCtrl.h CGtCtrl.cpp CCalc.h CCalc.cpp CAvgCar.h CAvgCar.cpp CarSim_Daemon.cpp
-carsim_LDADD = -lpthread -ljson-glib-1.0 -lgobject-2.0 -lglib-2.0 -lrt -lico-util-com
+carsim_LDADD = -lpthread -ljson-glib-1.0 -lgobject-2.0 -lglib-2.0 -lrt -lico-util
 carsim_CPPFLAGS = -I/usr/include/glib-2.0 -I/usr/include/json-glib-1.0 -I/usr/lib/glib-2.0/include -std=c++0x
 carsim_LDFLAGS =