aboutsummaryrefslogtreecommitdiff
path: root/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/hal/files/patch-hald_freebsd_hf-devd.c')
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-devd.c56
1 files changed, 0 insertions, 56 deletions
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c b/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
deleted file mode 100644
index 29ed38a7e443..000000000000
--- a/sysutils/hal/files/patch-hald_freebsd_hf-devd.c
+++ /dev/null
@@ -1,56 +0,0 @@
---- hald/freebsd/hf-devd.c.orig 2008-05-07 19:23:59.000000000 -0400
-+++ hald/freebsd/hf-devd.c 2009-05-30 03:15:33.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <string.h>
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-@@ -40,7 +41,11 @@
- #include "hf-acpi.h"
- #include "hf-net.h"
- #include "hf-pcmcia.h"
-+#include "hf-storage.h"
- #include "hf-usb.h"
-+#ifdef HAVE_LIBUSB20
-+#include "hf-usb2.h"
-+#endif
- #include "hf-util.h"
-
- #define HF_DEVD_SOCK_PATH "/var/run/devd.pipe"
-@@ -51,10 +56,16 @@
- #define HF_DEVD_EVENT_NOMATCH '?'
-
- static HFDevdHandler *handlers[] = {
-+#ifdef HAVE_LIBUSB20
-+ &hf_usb2_devd_handler,
-+#endif
-+#if __FreeBSD_version < 800092
- &hf_usb_devd_handler,
-+#endif
- &hf_net_devd_handler,
- &hf_acpi_devd_handler,
-- &hf_pcmcia_devd_handler
-+ &hf_pcmcia_devd_handler,
-+ &hf_storage_devd_handler
- };
-
- static gboolean hf_devd_inited = FALSE;
-@@ -381,13 +392,13 @@ hf_devd_event_cb (GIOChannel *source, GI
-
- status = g_io_channel_read_line(source, &event, NULL, &terminator, NULL);
-
-- if (status != G_IO_STATUS_NORMAL)
-+ if (status == G_IO_STATUS_NORMAL)
- {
- event[terminator] = 0;
- hf_devd_process_event(event);
- g_free(event);
- }
-- else if (status != G_IO_STATUS_AGAIN)
-+ else if (status == G_IO_STATUS_AGAIN)
- {
- hf_devd_init();
- if (hf_devd_inited)