summaryrefslogtreecommitdiff
path: root/sysutils/hal
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2011-05-25 22:30:46 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2011-05-25 22:30:46 +0000
commit6f2c02851c732fb841239e20b6212909ec8a82b2 (patch)
tree9f5a6b97a21ea0ded88e33f95901956e6c351974 /sysutils/hal
parentUpdate to 1.1.1. (diff)
Fix detection of usb2 devd events.
Submitted by: hps
Notes
Notes: svn path=/head/; revision=274659
Diffstat (limited to 'sysutils/hal')
-rw-r--r--sysutils/hal/Makefile2
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.c14
2 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index a83cc2d3a01c..eed3c7c7b018 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -8,7 +8,7 @@
PORTNAME= hal
DISTVERSION= 0.5.14
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
index 5e29b827b14c..d53d2a16694a 100644
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
@@ -129,17 +129,17 @@
+ const char *type,
+ const char *data)
+{
-+ if (! data || strcmp(system, "DEVFS") || strcmp(subsystem, "CDEV") ||
-+ (strcmp(type, "CREATE") && strcmp(type, "DESTROY")))
++ if (! data || strcmp(system, "USB") || strcmp(subsystem, "DEVICE") ||
++ (strcmp(type, "ATTACH") && strcmp(type, "DETACH")))
+ return FALSE;
+
-+ if (strstr(data, "cdev=ugen") != NULL ||
-+ strstr(data, "cdev=usb") != NULL)
-+ return TRUE;
-+
-+ return FALSE;
++ return TRUE;
+}
+
++
++
++
++
HFHandler hf_usb2_handler = {
.privileged_init = hf_usb2_privileged_init,
.probe = hf_usb2_probe