hal: Branch 'master' - 2 commits

[Joe Marcus Clarke]

 hald/freebsd/hf-net.c |    1 +
 hald/freebsd/hf-usb.c |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 528caf9fd5791c5d45116bb93253328257aababf
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Fri Mar 7 00:48:37 2008 -0500

    re-add net.physical_device property
    
    When the NetworkManager port is ready for FreeBSD, it will need this
    property.
    
    Forgotten by:	David Zeuthen

diff --git a/hald/freebsd/hf-net.c b/hald/freebsd/hf-net.c
index ec0f328..8648e6f 100644
--- a/hald/freebsd/hf-net.c
+++ b/hald/freebsd/hf-net.c
@@ -161,6 +161,7 @@ hf_net_device_new (const char *interface, HalDevice *parent, GError **err)
   hal_device_property_set_string(device, "net.address", mac ? mac : "00:00:00:00:00:00");
   hal_device_property_set_string(device, "net.interface", interface);
   hal_device_property_set_string(device, "net.originating_device", hal_device_get_udi(parent));
+  hal_device_property_set_string(device, "net.physical_device", hal_device_get_udi(parent));
   hal_device_property_set_string(device, "net.media", media);
   if (hf_devtree_is_driver(interface, "fwe"))
     hal_device_property_set_int(device, "net.arp_proto_hw_id", ARPHRD_IEEE1394);
commit 2c315c98bdcef8782e3eb198b7aeee01961a3dbd
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Fri Mar 7 00:47:13 2008 -0500

    re-add the info.bus properties
    
    Gphoto2 still uses info.bus for USB devices.
    
    Forgotten by:	David Zeuthen

diff --git a/hald/freebsd/hf-usb.c b/hald/freebsd/hf-usb.c
index d04f7f2..60ddd74 100644
--- a/hald/freebsd/hf-usb.c
+++ b/hald/freebsd/hf-usb.c
@@ -335,6 +335,7 @@ hf_usb_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "usb_device");
+  hal_device_property_set_string(device, "info.bus", "usb_device");
   hal_device_property_set_string(device, "info.product", di->udi_product);
   hal_device_property_set_string(device, "info.vendor", di->udi_vendor);
 
@@ -469,6 +470,7 @@ hf_usb_interface_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "usb");
+  hal_device_property_set_string(device, "info.bus", "usb");
 
   hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device.");