Author: freetz Date: Mon Jun 5 20:04:23 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - dbus fixes from fedora
---- Files affected: SOURCES: bluez-utils-invalid-timeval.patch (NONE -> 1.1) (NEW), bluez-utils-poll-timeout.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/bluez-utils-invalid-timeval.patch diff -u /dev/null SOURCES/bluez-utils-invalid-timeval.patch:1.1 --- /dev/null Mon Jun 5 22:04:23 2006 +++ SOURCES/bluez-utils-invalid-timeval.patch Mon Jun 5 22:04:18 2006 @@ -0,0 +1,28 @@ +--- bluez-utils-2.25/hcid/dbus.c~ 2006-01-08 02:03:05.000000000 +0000 ++++ bluez-utils-2.25/hcid/dbus.c 2006-04-21 18:07:41.000000000 +0100 +@@ -54,7 +54,7 @@ static DBusConnection *connection; + static int default_dev = -1; + + #define TIMEOUT (30 * 1000) /* 30 seconds */ +-#define DBUS_RECONNECT_TIMER (5 * 1000 * 1000) /* 5 sec */ ++#define DBUS_RECONNECT_TIMER 5 /* 5 sec */ + #define MAX_PATH_LENGTH 64 + #define MAX_CONN_NUMBER 10 + +@@ -1262,12 +1262,12 @@ static void reconnect_timer_start(void) + sigaction(SIGALRM, &sa, NULL); + + /* expire after X msec... */ +- timer.it_value.tv_sec = 0; +- timer.it_value.tv_usec = DBUS_RECONNECT_TIMER; ++ timer.it_value.tv_sec = DBUS_RECONNECT_TIMER; ++ timer.it_value.tv_usec = 0; + + /* ... and every x msec after that. */ +- timer.it_interval.tv_sec = 0; +- timer.it_interval.tv_usec = DBUS_RECONNECT_TIMER; ++ timer.it_interval.tv_sec = DBUS_RECONNECT_TIMER; ++ timer.it_interval.tv_usec = 0; + + setitimer(ITIMER_REAL, &timer, NULL); + } ================================================================ Index: SOURCES/bluez-utils-poll-timeout.patch diff -u /dev/null SOURCES/bluez-utils-poll-timeout.patch:1.1 --- /dev/null Mon Jun 5 22:04:23 2006 +++ SOURCES/bluez-utils-poll-timeout.patch Mon Jun 5 22:04:18 2006 @@ -0,0 +1,11 @@ +--- bluez-utils-2.25/hidd/main.c.timeout 2006-03-23 13:24:21.000000000 -0500 ++++ bluez-utils-2.25/hidd/main.c 2006-03-23 13:24:26.000000000 -0500 +@@ -335,7 +335,7 @@ + p[0].revents = 0; + p[1].revents = 0; + +- err = poll(p, 2, 100); ++ err = poll(p, 2, -1); + if (err <= 0) + continue; + ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
