hal/hald/linux osspec.c,1.52.2.3,1.52.2.4

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory gabe:/tmp/cvs-serv11221/hald/linux

Modified Files:
      Tag: hal-0_4-stable-branch
	osspec.c 
Log Message:
2005-01-12  David Zeuthen  <davidz at redhat.com>

	* hald/linux/osspec.c (HOTPLUG_TIMEOUT): Increase to 25 seconds
	to better cope with callouts timeout of 10 seconds

	* hald/callout.c (iochn_data): Cope with callouts terminating
	and free timeout handler
	(callout_timeout_handler): New function; kill callouts if they
	time out
	(process_next_callout): Setup timeout for callouts - set to
	ten seconds



Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
retrieving revision 1.52.2.3
retrieving revision 1.52.2.4
diff -u -d -r1.52.2.3 -r1.52.2.4
--- osspec.c	7 Jan 2005 03:22:34 -0000	1.52.2.3
+++ osspec.c	12 Jan 2005 17:38:44 -0000	1.52.2.4
@@ -67,7 +67,7 @@
 #define FIRST_HOTPLUG_SLEEP 3500
 
 /** How many seconds before we discard a missing hotplug event and move on to the next one */
-#define HOTPLUG_TIMEOUT 15
+#define HOTPLUG_TIMEOUT 25
 
 extern ClassDeviceHandler input_class_handler;
 extern ClassDeviceHandler net_class_handler;