Fix: When Weston crashed, GtForce device input controller does an loop forever.

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

diff --git a/gtforce/ico_dic-gtforce.c b/gtforce/ico_dic-gtforce.c
index 89c72f9..b42e464 100644 (file)
--- a/gtforce/ico_dic-gtforce.c
+++ b/gtforce/ico_dic-gtforce.c
@@ -674,8 +674,8 @@ ico_dic_js_read(int fd)
                         iMng->code[icode].appid, iMng->code[icode].keycode, state);
                 ico_input_mgr_control_send_input_event(gIco_Dic_Mng.Wayland_InputCtl,
                                                        iMng->code[icode].appid, 0,
-                                                       ICO_INPUT_MGR_DEVICE_TYPE_KEYBOARD,
-                                                       0, iMng->code[icode].keycode, state);
+                                                       ICO_INPUT_MGR_DEVICE_TYPE_KEYBOARD, 0,
+                                                       0,iMng->code[icode].keycode, state);
             }
         }
         else    {

diff --git a/gtforce/ico_dic-wayland.c b/gtforce/ico_dic-wayland.c
index 5066b65..4938821 100644 (file)
--- a/gtforce/ico_dic-wayland.c
+++ b/gtforce/ico_dic-wayland.c
@@ -78,6 +78,7 @@ ico_dic_wayland_init(const char *display, Ico_Dic_Wayland_Cb callback)
 
     /* display dispatch to wait     */
     do  {
+        usleep(20*1000);
         wl_display_dispatch(gIco_Dic_Mng.Wayland_Display);
     } while ((gIco_Dic_Mng.Wayland_WindowMgr == NULL) ||
              (gIco_Dic_Mng.Wayland_InputCtl == NULL) ||

diff --git a/packaging/ico-uxf-device-input-controller.changes b/packaging/ico-uxf-device-input-controller.changes
index dbdd944..c25e66d 100644 (file)
--- a/packaging/ico-uxf-device-input-controller.changes
+++ b/packaging/ico-uxf-device-input-controller.changes
@@ -1,3 +1,9 @@
+* Thu Sep 26 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> accepted/tizen/20130919.204300@d52ab79
+- 0.9.02 release.
+-- fix for - When Weston crashed, GtForce device input controller does an loop forever.
+-- change of the path of the ico_set_vehicleinfo tool.
+-- the start method is changed to the Wants target of the service file of ico-uxf-homescreen
+
 * Thu Sep 19 2013 Shibata Makoto <shibata@mac.tec.toyota.co.jp> submit/tizen/20130919.104803@2537721
 - 0.9.01 release.
 -- The initial release for TizenIVI 3.0.

diff --git a/packaging/ico-uxf-device-input-controller.spec b/packaging/ico-uxf-device-input-controller.spec
index 06caa10..0db99bf 100644 (file)
--- a/packaging/ico-uxf-device-input-controller.spec
+++ b/packaging/ico-uxf-device-input-controller.spec
@@ -1,6 +1,6 @@
 Name:       ico-uxf-device-input-controller
 Summary:    Device Input Controller
-Version:    0.9.01
+Version:    0.9.02
 Release:    1.1
 Group:      System/GUI
 License:    Apache License, Version 2.0
@@ -12,10 +12,10 @@ BuildRequires: mesa-devel
 BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(glesv2)
 BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: ico-uxf-weston-plugin-devel >= 0.9.04
+BuildRequires: ico-uxf-weston-plugin-devel >= 0.9.05
 BuildRequires: ico-uxf-utilities-devel >= 0.2.04
 Requires: weston >= 1.2.1
-Requires: ico-uxf-weston-plugin >= 0.9.04
+Requires: ico-uxf-weston-plugin >= 0.9.05
 Requires: ico-uxf-utilities >= 0.2.04
 
 %description
@@ -44,7 +44,6 @@ install -m 0755 settings/set_navi_busguide.sh %{buildroot}%{ictl_conf}
 install -m 0755 settings/set_navi_destination.sh %{buildroot}%{ictl_conf}
 install -d %{buildroot}/%{_unitdir_user}/weston.target.wants
 install -m 644 settings/ico-device-input-controller.service %{buildroot}%{_unitdir_user}/ico-device-input-controller.service
-install -m 644 settings/ico-dic-wait-weston-ready.path %{buildroot}%{_unitdir_user}/ico-dic-wait-weston-ready.path
 ln -sf ../ico-dic-wait-weston-ready.path %{buildroot}/%{_unitdir_user}/weston.target.wants/
 
 %files
@@ -56,5 +55,4 @@ ln -sf ../ico-dic-wait-weston-ready.path %{buildroot}/%{_unitdir_user}/weston.ta
 %{ictl_conf}/set_navi_busguide.sh
 %{ictl_conf}/set_navi_destination.sh
 /usr/lib/systemd/user/ico-device-input-controller.service
-/usr/lib/systemd/user/ico-dic-wait-weston-ready.path
 /usr/lib/systemd/user/weston.target.wants/ico-dic-wait-weston-ready.path

diff --git a/settings/ico-device-input-controller.service b/settings/ico-device-input-controller.service
index b46f421..1d58280 100644 (file)
--- a/settings/ico-device-input-controller.service
+++ b/settings/ico-device-input-controller.service
@@ -4,7 +4,4 @@ Requires=weston.service
 After=weston.service
 
 [Service]
-#Environment=XDG_RUNTIME_DIR=/run/user/5000
-Type=oneshot
 ExecStart=/usr/bin/ico_dic-gtforce -d
-

diff --git a/settings/ico-dic-wait-weston-ready.path b/settings/ico-dic-wait-weston-ready.path
deleted file mode 100644 (file)
index f6bbfeb..0000000
--- a/settings/ico-dic-wait-weston-ready.path
+++ /dev/null
@@ -1,9 +0,0 @@
-Description=Path activation for ico-device-input-controller
-
-[Path]
-PathExists=/run/user/5000/wayland-0.lock
-#PathExists=/tmp/amd_ready
-Unit=ico-device-input-controller.service
-
-[Install]
-WantedBy=weston.target 

diff --git a/settings/set_daynight.sh b/settings/set_daynight.sh
index a3e3e99..eb17aa9 100755 (executable)
--- a/settings/set_daynight.sh
+++ b/settings/set_daynight.sh
@@ -4,8 +4,8 @@
 
 if [ -e /tmp/daynight_sw.day ] ; then
        rm -fr /tmp/daynight_sw.day
-       /usr/local/bin/ico_set_vehicleinfo EXTERIOR=0
+       /usr/bin/ico_set_vehicleinfo EXTERIOR=0
 else
        touch /tmp/daynight_sw.day
-       /usr/local/bin/ico_set_vehicleinfo EXTERIOR=1000
+       /usr/bin/ico_set_vehicleinfo EXTERIOR=1000
 fi

diff --git a/tests/test-homescreen.c b/tests/test-homescreen.c
index 1e2949e..ae3ad70 100644 (file)
--- a/tests/test-homescreen.c
+++ b/tests/test-homescreen.c
@@ -1548,7 +1548,7 @@ input_send(struct display *display, char *buf)
         print_log("HOMESCREEN: input_send(%s.%x,%d,%d,%x,%d)",
                   appid, surfaceid, type, no, code, value);
         ico_input_mgr_control_send_input_event(display->ico_input_mgr,
-                                               appid, surfaceid, type, no, code, value);
+                                               appid, surfaceid, type, no, 0, code, value);
     }
     else    {
         print_log("HOMESCREEN: input_send command[input_send {@app/serface} type no code "