[Tizen-submit] 3416: Changes to Tizen:2.1:Main/xorg-x11-drv-evdev-multitouch

noreply at tizen.org noreply at tizen.org
Fri Apr 26 15:27:24 GMT 2013


Hi,
Jinkun Jang have made the following changes to xorg-x11-drv-evdev-multitouch in project Tizen:2.1:Main. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #3416

  submit:       Tizen:2.1:Main:build/xorg-x11-drv-evdev-multitouch(cleanup) -> Tizen:2.1:Main


Message:
Submitter: Jinkun Jang <jinkun.jang at samsung.com>
Comments: upload latest
Git project: adaptation/xorg/driver/xserver-xorg-input-evdev-multitouch
Tag: submit/tizen_2.1/20130426.152745
Commit: 46bcf1c Fix a crash when multitouch devices are removed quickly by udev change events

State:   new        2013-04-26T07:58:02 tizenrobot
Comment: <no comment>
old:
----
  xorg-x11-drv-evdev-multitouch-2.3.2.tar.gz

new:
----
  xorg-x11-drv-evdev-multitouch-2.3.3.tar.gz

spec files:
-----------
--- xorg-x11-drv-evdev-multitouch.spec
+++ xorg-x11-drv-evdev-multitouch.spec
@@ -1,9 +1,9 @@
 #sbs-git:slp/pkgs/xorg/driver/xserver-xorg-input-evdev-multitouch xserver-xorg-input-evdev-multitouch 2.3.2 b89f300e6969a0b8cef3bbe5720ec5300baf4ad3
 Name:	xorg-x11-drv-evdev-multitouch
 Summary:    X.Org evdev multitouch input driver.
-Version: 2.3.2
+Version: 2.3.3
 Release:    4
-VCS:        adaptation/xorg/driver/xserver-xorg-input-evdev-multitouch#2.1_release-0-g32048c0
+VCS:        adaptation/xorg/driver/xserver-xorg-input-evdev-multitouch#submit/tizen_2.1/20130426.152745-0-g46bcf1c
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz

other changes:
--------------

++++++ xorg-x11-drv-evdev-multitouch-2.3.2.tar.gz -> xorg-x11-drv-evdev-multitouch-2.3.3.tar.gz
--- /packaging/xorg-x11-drv-evdev-multitouch.spec
+++ /packaging/xorg-x11-drv-evdev-multitouch.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/xorg/driver/xserver-xorg-input-evdev-multitouch xserver-xorg-input-evdev-multitouch 2.3.2 b89f300e6969a0b8cef3bbe5720ec5300baf4ad3
 Name:	xorg-x11-drv-evdev-multitouch
 Summary:    X.Org evdev multitouch input driver.
-Version: 2.3.2
+Version: 2.3.3
 Release:    4
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
--- /src/evdevmultitouch.c
+++ /src/evdevmultitouch.c
@@ -99,6 +99,8 @@
 #define False FALSE
 #endif
 
+#define MAX_MT	10
+
 #define POLL_DISABLE	'0'
 #define POLL_ENABLE		'1'
 #define POLL_REQUEST	'2'
@@ -203,7 +205,7 @@
 /* All devices the evdevmultitouch driver has allocated and knows about.
  * MAXDEVICES is safe as null-terminated array, as two devices (VCP and VCK)
  * cannot be used by evdevmultitouch, leaving us with a space of 2 at the end. */
-static EvdevMultitouchPtr evdevmultitouch_devices[MAXDEVICES] = {NULL,};
+static EvdevMultitouchPtr evdevmultitouch_devices[MAX_MT] = {NULL,};
 
 static size_t EvdevMultitouchCountBits(unsigned long *array, size_t nlongs)
 {
@@ -250,18 +252,22 @@
 static BOOL
 EvdevMultitouchIsDuplicate(InputInfoPtr pInfo)
 {
+    int i;
     EvdevMultitouchPtr pEvdevMultitouch = pInfo->private;
-    EvdevMultitouchPtr* dev   = evdevmultitouch_devices;
+    EvdevMultitouchPtr dev;
 
-    if (pEvdevMultitouch->min_maj)
+    if (pEvdevMultitouch->min_maj && dev)
     {
-        while(*dev)
+        for(i = 0 ; i < MAX_MT ; i++)
         {
-            if ((*dev) != pEvdevMultitouch &&
-                (*dev)->min_maj &&
-                (*dev)->min_maj == pEvdevMultitouch->min_maj)
-                return TRUE;
-            dev++;
+        	dev = evdevmultitouch_devices[i];
+        	if(dev)
+    		{
+			if ((dev) != pEvdevMultitouch &&
+			     (dev)->min_maj &&
+			     (dev)->min_maj == pEvdevMultitouch->min_maj)

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list