hal/hald Makefile.am,1.27,1.28

David Zeuthen david at pdx.freedesktop.org
Thu Jun 24 14:47:51 PDT 2004


Update of /cvs/hal/hal/hald
In directory pdx:/tmp/cvs-serv30315/hald

Modified Files:
	Makefile.am 
Log Message:
2004-06-24  David Zeuthen  <david at fubar.dk>

	Add floppy support to HAL - tested with x86 legacy floppies and
	an USB floppy drive.

	* tools/device-manager/Const.py.in (BUS_NAMES): Add platform bus

	* hald/linux/common.h: Add read_single_line_grep prototype

	* hald/linux/common.c (read_single_line_grep): New function

	* hald/linux/block_class_device.c (detect_media): Add the
	force_poll parameter to poll on devices with media detection
	explicitly disabled.  Introduce support for non-optical drives
	with block.no_partitions set to TRUE. Remember to clear linux.*
	properties for discs and volumes from block.no_partitions as hot
	unplugging such drives will cause the top-level block device to
	stay as the child is found instead when searching on
	linux.sysfs_path
	(block_class_pre_process): Introduce a nasty hack to read
	/proc/scsi/usb-storage/<scsi-hostnumber> to determine if we're
	a floppy drive and thus should set block.no_partitions to TRUE
	(foreach_block_device): Rename to mtab_foreach_device, split into
	mtab_handle_volume and mtab_handle_storage
	(mtab_handle_volume): New function, handle normal partition based
	volumes in /etc/mtab
	(mtab_handle_storage): New function, handle block.no_partitions
	volumes in /etc/mtab
	(block_class_removed): Make sure to remove the HAL-made child
	if block.no_partitions is TRUE

	* hald/linux/block_class_device.c (disc_remove_from_gdl): Rename
	to volume_remove_from_gdl

	* hald/linux/platform_bus_device.c: New file

	* hald/Makefile.am (hald_SOURCES): Add platform_bus_device.c



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am	20 Jun 2004 13:27:45 -0000	1.27
+++ Makefile.am	24 Jun 2004 21:47:48 -0000	1.28
@@ -49,8 +49,9 @@
 					linux/pcmcia_socket_class_device.c \
 					linux/macio_bus_device.c	\
 					linux/ieee1394_class_device.c	\
-					linux/ieee1394_node_class_device.c	\
-					linux/ieee1394_host_class_device.c	\
+					linux/ieee1394_node_class_device.c \
+					linux/ieee1394_host_class_device.c \
+					linux/platform_bus_device.c	\
 	linux/linux_dvd_rw_utils.h	linux/linux_dvd_rw_utils.c
 
 #					linux/ieee1394_host_class_device.c





More information about the hal-commit mailing list