summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-18 13:47:01 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-09-18 13:47:01 +0800
commit65b3c186b25a079a67760a80285dec0ee9b7200b (patch)
tree12ff81de85e63720bee6909b9de125ef6d313479 /sysutils
parent15453301a5faf0506f975ecd442a396184e80f5d (diff)
downloadmarcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.tar
marcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.tar.gz
marcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.tar.bz2
marcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.tar.lz
marcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.tar.xz
marcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.tar.zst
marcuscom-ports-65b3c186b25a079a67760a80285dec0ee9b7200b.zip
Somehow this hunk got left out of my last commit. Make sure usb2 devices
attach properly to the device tree with the correct parent. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12897 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/hal/Makefile4
-rw-r--r--sysutils/hal/files/patch-hald_freebsd_hf-usb2.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index bd656ad44..885a9e509 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.62 2009/08/19 20:57:23 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.63 2009/09/14 04:34:35 marcus Exp $
#
PORTNAME= hal
DISTVERSION= 0.5.13
-PORTREVISION= 4
+PORTREVISION= 5
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 3afc57966..d91a4148e 100644
--- a/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
+++ b/sysutils/hal/files/patch-hald_freebsd_hf-usb2.c
@@ -2,7 +2,7 @@
+++ hald/freebsd/hf-usb2.c 2009-09-13 20:57:00.000000000 -0400
@@ -0,0 +1,312 @@
+/***************************************************************************
-+ * CVSID: $Id: patch-hald_freebsd_hf-usb2.c,v 1.2 2009-09-14 04:34:35 marcus Exp $
++ * CVSID: $Id: patch-hald_freebsd_hf-usb2.c,v 1.3 2009-09-18 05:47:01 marcus Exp $
+ *
+ * hf-usb.c : USB support
+ *
@@ -195,7 +195,7 @@
+ addr = libusb20_dev_get_address(pdev);
+
+ if (addr == 1)
-+ parent = hf_devtree_find_parent_from_info(hald_get_gdl(), "usbus", bus);
++ parent = hf_devtree_find_from_info(hald_get_gdl(), "usbus", bus);
+ else
+ parent = hf_device_store_match(hald_get_gdl(), "usb_device.bus_number",
+ HAL_PROPERTY_TYPE_INT32, bus, "usb_device.port_number",