hal: Branch 'master' - 2 commits

[Danny Kukawka]

 hald/linux/probing/probe-video4linux.c     |   38 +++++++++++++++--------------
 tools/linux/hal-system-power-suspend-linux |    1 
 2 files changed, 21 insertions(+), 18 deletions(-)

New commits:
commit 45a96df15a38745cb4ea786b241b008821419081
Author: Philipp Ittershagen <philipp at gate-nine.de>
Date:   Sun Aug 10 10:11:36 2008 +0200

    add save-pci support to hal-system-power-suspend-linux
    
    Add --quirk-save-pci support to hal-system-power-suspend-linux.

diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index 157201f..76c5800 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -28,6 +28,7 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS" = "true" ] && QUIRKS="$QUIRKS --quirk-reset-brightness"
+[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_SAVE_PCI" = "true" ] && QUIRKS="$QUIRKS --quirk-save-pci"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_NONE" = "true" ] && QUIRKS="$QUIRKS --quirk-none"
 
 # Urh. Do any BIOSen handle this correctly?
commit b0ef7a06c03ff6401f8fb98cb208a46419614656
Author: Lucas Rocha <lucasr at litl.com>
Date:   Sun Aug 10 10:05:30 2008 +0200

    probe for v4l only if probe for v4l2 failed
    
    When probing capabilities on a video4linux device, if v4l2 probing
    works, there's no need to still try to probe with v4l

diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c
index 0d89040..ffc2f37 100644
--- a/hald/linux/probing/probe-video4linux.c
+++ b/hald/linux/probing/probe-video4linux.c
@@ -100,26 +100,28 @@ main (int argc, char *argv[])
 			libhal_device_add_capability (ctx, udi, "video4linux.tuner", &error);
 		if ((v2cap.capabilities & V4L2_CAP_RADIO) > 0)
 			libhal_device_add_capability (ctx, udi, "video4linux.radio", &error);
-	} else
+	} else {
 		HAL_DEBUG (("ioctl VIDIOC_QUERYCAP failed"));
 
-	if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
-		libhal_changeset_set_property_string (cset,
-		                                      "video4linux.version", "1");
-
-		libhal_changeset_set_property_string (cset,
-		                                      "info.product", v1cap.name);
-
-		if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
-			libhal_device_add_capability (ctx, udi, "video4linux.video_capture", &error);
-		if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
-			libhal_device_add_capability (ctx, udi, "video4linux.video_overlay", &error);
-		if (v1cap.audios > 0)
-			libhal_device_add_capability (ctx, udi, "video4linux.audio", &error);
-		if ((v1cap.type & VID_TYPE_TUNER) > 0)
-			libhal_device_add_capability (ctx, udi, "video4linux.tuner", &error);
-	} else
-		HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
+		if (ioctl (fd, VIDIOCGCAP, &v1cap) == 0) {
+			libhal_changeset_set_property_string (cset,
+			                                      "video4linux.version", "1");
+
+			libhal_changeset_set_property_string (cset,
+			                                      "info.product", v1cap.name);
+
+			if ((v1cap.type & VID_TYPE_CAPTURE) > 0)
+				libhal_device_add_capability (ctx, udi, "video4linux.video_capture", &error);
+			if ((v1cap.type & VID_TYPE_OVERLAY) > 0)
+				libhal_device_add_capability (ctx, udi, "video4linux.video_overlay", &error);
+			if (v1cap.audios > 0)
+				libhal_device_add_capability (ctx, udi, "video4linux.audio", &error);
+			if ((v1cap.type & VID_TYPE_TUNER) > 0)
+				libhal_device_add_capability (ctx, udi, "video4linux.tuner", &error);
+		} else {
+			HAL_DEBUG (("ioctl VIDIOCGCAP failed"));
+		}
+	}
 
 	libhal_device_commit_changeset (ctx, cset, &error);
 	libhal_device_free_changeset (cset);