hal ChangeLog,1.372.2.33,1.372.2.34 configure.in,1.57.2.8,1.57.2.9

[David Zeuthen]

Update of /cvs/hal/hal
In directory gabe:/tmp/cvs-serv17999

Modified Files:
      Tag: hal-0_4-stable-branch
	ChangeLog configure.in 
Log Message:
2005-01-17  David Zeuthen  <davidz at redhat.com>

	* hald/linux/net_class_device.c (mii_get_rate): Add debug statements
	to see if we enter this function
	(mii_get_link): Add debug statements to see if we enter
	(link_detection_handle_message): Assume link is always 100Mbps
	if built with --enable-sysfs-carrier.
	(net_class_pre_process): If built with --enable-sysfs-carrier
	use sysfs file to check link and assume 100Mbps for speed if
	there is a link

	* configure.in: Add new --enable-sysfs-carrier option for using
	the carrier file in sysfs to determine whether there is link for
	networking devices. Right now this will always set the speed to
	100Mbps until there is a link (until the Linux kernel exports
	this in sysfs also). Requires Linux 2.6.10 or later. Disabled
	by default; hald now only uses mii registers if this is disabled.



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.372.2.33
retrieving revision 1.372.2.34
diff -u -d -r1.372.2.33 -r1.372.2.34
--- ChangeLog	17 Jan 2005 15:25:00 -0000	1.372.2.33
+++ ChangeLog	17 Jan 2005 20:00:30 -0000	1.372.2.34
@@ -1,3 +1,21 @@
+2005-01-17  David Zeuthen  <davidz at redhat.com>
+
+	* hald/linux/net_class_device.c (mii_get_rate): Add debug statements
+	to see if we enter this function
+	(mii_get_link): Add debug statements to see if we enter
+	(link_detection_handle_message): Assume link is always 100Mbps
+	if built with --enable-sysfs-carrier.
+	(net_class_pre_process): If built with --enable-sysfs-carrier
+	use sysfs file to check link and assume 100Mbps for speed if
+	there is a link
+
+	* configure.in: Add new --enable-sysfs-carrier option for using
+	the carrier file in sysfs to determine whether there is link for
+	networking devices. Right now this will always set the speed to
+	100Mbps until there is a link (until the Linux kernel exports
+	this in sysfs also). Requires Linux 2.6.10 or later. Disabled
+	by default; hald now only uses mii registers if this is disabled.
+
 2005-01-17  Kay Sievers  <kay.sievers at vrfy.org>
 
 	* hald/linux/volume_id/volume_id.c: (probe_vfat): Thanks to
@@ -10,7 +28,7 @@
 	signed volumes. Accept directory volume label entry only if the
 	entry has no cluster associated.
 
-2005-01-12  David Zeuthen  <david at fubar.dk>
+2005-01-12  David Zeuthen  <davidz at redhat.com>
 
 	* NEWS: Update for 0.4.5
 

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.57.2.8
retrieving revision 1.57.2.9
diff -u -d -r1.57.2.8 -r1.57.2.9
--- configure.in	12 Jan 2005 22:19:43 -0000	1.57.2.8
+++ configure.in	17 Jan 2005 20:00:30 -0000	1.57.2.9
@@ -82,6 +82,7 @@
 AC_SUBST(PCMCIA_SUPPORT_ENABLE)
 AM_CONDITIONAL(PCMCIA_SUPPORT_ENABLE, test x$enable_pcmcia_support = xyes)
 
+
 AC_ARG_WITH(stab_file,[  --with-stab-file=<file>  PCMCIA socket table file (/var/lib/pcmcia/stab)])
 if test -z "$with_stab_file" ; then
     PCMCIA_STAB_FILE=/var/lib/pcmcia/stab
@@ -91,6 +92,13 @@
 AC_SUBST(PCMCIA_STAB_FILE)
 AC_DEFINE_UNQUOTED(PCMCIA_STAB_FILE,"$PCMCIA_STAB_FILE", [PCMCIA socket table file])
 
+AC_ARG_ENABLE(sysfs-carrier,         [  --enable-sysfs-carrier       Use the carrier file in sysfs for link detection rather that mii registers (req. Linux 2.6.10 or later)],enable_sysfs_carrier=yes,enable_sysfs_carrier=no)
+if test "x$enable_sysfs_carrier" = "xyes" ; then
+   AC_DEFINE(SYSFS_CARRIER_ENABLE,1,[Whether the carrier file in sysfs should be used for link detection (req. Linux 2.6.10 or later)])
+fi
+AC_SUBST(SYSFS_CARRIER_ENABLE)
+AM_CONDITIONAL(SYSFS_CARRIER_ENABLE, test x$enable_sysfs_carrier = xyes)
+
 AC_ARG_ENABLE(hotplug_map,         [  --enable-hotplug-map    Install hotplug-map callout],enable_hotplug_map=yes,enable_hotplug_map=no)
 if test "x$enable_hotplug_map" = "xyes" ; then
    AC_DEFINE(HOTPLUG_MAP_ENABLED,1,[Whether hotplug-map callout should be installed])
@@ -460,6 +468,8 @@
         Extended PCMCIA support:  ${enable_pcmcia_support}
         PCMCIA stab file:         ${PCMCIA_STAB_FILE}
 
+        Use sysfs for linkdetect: ${enable_sysfs_carrier} (req. 2.6.10 kernel)
+
         install hal-hotplug-map:  ${enable_hotplug_map}"
 
 echo "