hal: Branch 'master' - 2 commits

[Richard Hughes]

 tools/linux/hal-system-power-suspend-linux |    9 ----
 tools/linux/hal-system-video-resume-linux  |   55 -----------------------------
 tools/linux/hal-system-video-suspend-linux |   52 ---------------------------
 3 files changed, 116 deletions(-)

New commits:
diff-tree c62548b8192a28c9a4a330e456a7febfe39a5d09 (from 616a90266ec908c25d479def0378cc567c971fc0)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Feb 20 21:12:48 2007 +0000

    remove the zzz script from suspend
    
    Remove the zzz freebsd script from the linux suspend script.
    It's never going to match.

diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index d5ae5f2..1dd1a68 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -83,15 +83,6 @@ elif [ -f "/etc/redhat-release" ] || [ -
 		unsupported
 	fi
 
-#FreeBSD uses zzz to suspend for both ACPI and APM
-elif [ "x`uname -s`" = "xFreeBSD" ] ; then
-	if [ -x /usr/sbin/zzz ] ; then
-		/usr/sbin/zzz
-		RET=$?
-	else
-		unsupported
-	fi
-
 #Other distros just need to have *any* tools installed
 else
 	if [ -x "/usr/bin/powersave" ] ; then
diff-tree 616a90266ec908c25d479def0378cc567c971fc0 (from 5845d62c44246292d7c083ea2ea46a3322d482cd)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Feb 20 21:11:32 2007 +0000

    remove the hal-system-video-*-linux files
    
    Remove the hal-system-video-suspend-linux and hal-system-video-resume-linux files
    as they are now obsolete.

diff --git a/tools/linux/hal-system-video-resume-linux b/tools/linux/hal-system-video-resume-linux
deleted file mode 100755
index 852ee76..0000000
--- a/tools/linux/hal-system-video-resume-linux
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2006 Richard Hughes <richard at hughsie.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# Check we are the root user
-if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-    echo "org.freedesktop.Hal.Device.Video.PermissionDeniedByUID" >&2
-    echo "hal-system-video-resume refused uid $HAL_METHOD_INVOKED_BY_UID" >&2
-    exit 1
-fi
-
-checkvbetool() {
-    if ! [ -x "/usr/sbin/vbetool" ]; then
-        echo org.freedesktop.Hal.Device.Video.NotSupported >&2
-        echo vbetool not found or not executable >&2
-        exit 1
-    fi
-}
-
-# We might need to do one or many of these quirks
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_VBE_POST" == "true" ]; then
-	checkvbetool
-	/usr/sbin/vbetool post
-fi
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_VBESTATE_RESTORE" == "true" ]; then
-	checkvbetool
-	if [ -f /var/run/vbestate ]; then
-		/usr/sbin/vbetool vbestate restore < /var/run/vbestate
-	else
-		echo org.freedesktop.Hal.Device.Video.UnableToRetore>&2
-	        echo /var/run/vbestate is missing, can not restore >&2
-        	exit 1
-	fi
-fi
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_VBEMODE_RESTORE" == "true" ]; then
-	checkvbetool
-	if [ -f /var/run/vbemode ]; then
-		/usr/sbin/vbetool vbemode set `cat /var/run/vbemode`
-	else
-		echo org.freedesktop.Hal.Device.Video.UnableToRetore>&2
-	        echo /var/run/vbemode is missing, can not restore >&2
-        	exit 1
-	fi
-fi
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_DPMS_ON" == "true" ]; then
-	checkvbetool
-	/usr/sbin/vbetool dpms on > /dev/null 2>&1
-fi
-
-exit 0
diff --git a/tools/linux/hal-system-video-suspend-linux b/tools/linux/hal-system-video-suspend-linux
deleted file mode 100755
index 7d6214b..0000000
--- a/tools/linux/hal-system-video-suspend-linux
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2006 Richard Hughes <richard at hughsie.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# Check we are the root user
-if [ "$HAL_METHOD_INVOKED_BY_UID" != "0" ] ; then
-    echo "org.freedesktop.Hal.Device.Video.PermissionDeniedByUID" >&2
-    echo "hal-system-video-suspend refused uid $HAL_METHOD_INVOKED_BY_UID" >&2
-    exit 1
-fi
-
-checkvbetool() {
-    if ! [ -x "/usr/sbin/vbetool" ]; then
-        echo org.freedesktop.Hal.Device.Video.NotSupported >&2
-        echo vbetool not found or not executable >&2
-        exit 1
-    fi
-}
-
-
-# 1=s3_bios, 2=s3_mode, 3=both
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_S3_BIOS" == "true" ] && [ "$HAL_PROP_VIDEO_ADAPTER_PM_S3_MODE" == "true" ]; then
-	echo -n 3 > /proc/sys/kernel/acpi_video_flags
-elif [ "$HAL_PROP_VIDEO_ADAPTER_PM_S3_BIOS" == "true" ]; then
-	echo -n 1 > /proc/sys/kernel/acpi_video_flags
-elif [ "$HAL_PROP_VIDEO_ADAPTER_PM_S3_MODE" == "true" ]; then
-	echo -n 2 > /proc/sys/kernel/acpi_video_flags
-fi
-
-# We might need to do one or many of these quirks
-#if [ "$HAL_PROP_VIDEO_ADAPTER_PM_VGA_MODE_3" == "true" ]; then
-#	# TODO: we need to set mode3
-#fi
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_DPMS_SUSPEND" == "true" ]; then
-	checkvbetool
-	/usr/sbin/vbetool dpms suspend
-fi
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_VBESTATE_RESTORE" == "true" ]; then
-	checkvbetool
-	/usr/sbin/vbetool vbestate save > /var/run/vbestate
-fi
-if [ "$HAL_PROP_VIDEO_ADAPTER_PM_VBEMODE_RESTORE" == "true" ]; then
-	checkvbetool
-	/usr/sbin/vbetool vbemode get > /var/run/vbemode
-fi
-
-exit 0