hal/hald/linux2 apm.c, 1.3, 1.4 classdev.c, 1.11, 1.12 osspec.c, 1.10, 1.11 pmu.c, 1.3, 1.4

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory gabe:/tmp/cvs-serv28476/hald/linux2

Modified Files:
	apm.c classdev.c osspec.c pmu.c 
Log Message:
2005-02-08  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/osspec.c (get_hal_proc_path): Return hal_proc_path,
	not hal_sysfs_path. 

2005-02-08  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/osspec.c: 
	(hal_util_get_udevinfo_path):
	(hal_util_get_device_file):
	(hal_util_set_driver):
	(hal_util_find_closest_ancestor): Moved to here from ../util.c
	(get_hal_sysfs_path): New function
	(get_hal_proc_path): New function
	
	* hald/linux2/osspec_linux.h: New file; export the functions
	mentioned above



Index: apm.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/apm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- apm.c	8 Feb 2005 22:36:58 -0000	1.3
+++ apm.c	9 Feb 2005 00:56:38 -0000	1.4
@@ -29,7 +29,9 @@
 #include "../device_info.h"
 #include "../logger.h"
 #include "../hald_dbus.h"
-#include "util.h"
+#include "../util.h"
+
+#include "osspec_linux.h"
 
 #include "apm.h"
 #include "hotplug.h"

Index: classdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/classdev.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- classdev.c	8 Feb 2005 21:17:38 -0000	1.11
+++ classdev.c	9 Feb 2005 00:56:38 -0000	1.12
@@ -65,6 +65,8 @@
 #include "../device_info.h"
 #include "../hald_conf.h"
 
+#include "osspec_linux.h"
+
 #include "util.h"
 #include "coldplug.h"
 #include "hotplug_helper.h"

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- osspec.c	8 Feb 2005 22:36:58 -0000	1.10
+++ osspec.c	9 Feb 2005 00:56:38 -0000	1.11
@@ -96,7 +96,7 @@
 const gchar *
 get_hal_proc_path (void)
 {
-	return hal_sysfs_path;
+	return hal_proc_path;
 }
 
 static gboolean

Index: pmu.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/pmu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pmu.c	8 Feb 2005 22:36:58 -0000	1.3
+++ pmu.c	9 Feb 2005 00:56:38 -0000	1.4
@@ -29,7 +29,9 @@
 #include "../device_info.h"
 #include "../logger.h"
 #include "../hald_dbus.h"
-#include "util.h"
+#include "../util.h"
+
+#include "osspec_linux.h"
 
 #include "pmu.h"
 #include "hotplug.h"