[Pkg-utopia-commits] r807 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-05-01 20:44:32 +0000 (Mon, 01 May 2006)
New Revision: 807

Added:
   packages/unstable/hal/debian/patches/08_probe_serial.patch
Modified:
   packages/unstable/hal/debian/changelog
Log:
* debian/patches/08_probe_serial.patch
 + Only probe legacy serial ports. Fixes issue with usb serial ports from
 wince pda's that can't handle the probing (Closes: #352934)

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-05-01 20:24:28 UTC (rev 806)
+++ packages/unstable/hal/debian/changelog	2006-05-01 20:44:32 UTC (rev 807)
@@ -8,8 +8,11 @@
     (Closes: 359749)
   * debian/patches/07_suspend2.patch
     + Added. Possibility to use hibernate to suspend-to-ram
+  * debian/patches/08_probe_serial.patch
+   + Only probe legacy serial ports. Fixes issue with usb serial ports from
+   wince pda's that can't handle the probing (Closes: #352934)
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon,  1 May 2006 22:23:48 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon,  1 May 2006 22:42:50 +0200
 
 hal (0.5.7-1) unstable; urgency=low
 

Added: packages/unstable/hal/debian/patches/08_probe_serial.patch
===================================================================
--- packages/unstable/hal/debian/patches/08_probe_serial.patch	2006-05-01 20:24:28 UTC (rev 806)
+++ packages/unstable/hal/debian/patches/08_probe_serial.patch	2006-05-01 20:44:32 UTC (rev 807)
@@ -0,0 +1,24 @@
+diff -ruN hal-0.5.7-old/hald/linux2/classdev.c hal-0.5.7/hald/linux2/classdev.c
+--- hal-0.5.7-old/hald/linux2/classdev.c	2006-01-28 23:51:18.000000000 +0100
++++ hal-0.5.7/hald/linux2/classdev.c	2006-05-01 22:42:45.000000000 +0200
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- * CVSID: $Id: classdev.c,v 1.42 2006/01/28 22:51:18 david Exp $
++ * CVSID: $Id: classdev.c,v 1.43 2006/03/03 19:19:53 dkukawka Exp $
+  *
+  * classdev.c : Handling of functional kernel devices
+  *
+@@ -927,7 +927,12 @@
+ static const gchar *
+ serial_get_prober (HalDevice *d)
+ {
+-	return "hald-probe-serial";
++	/* FIXME TODO: check if there is an other way, to call the porber only
++		 on ttyS* devices, than check the name of the device file */
++	if (!strncmp(hal_device_property_get_string (d, "linux.device_file"), "/dev/ttyS", 9))
++		return "hald-probe-serial";
++	else 
++		return NULL;
+ }
+ 
+ static gboolean