hal/hald Makefile.am,1.19,1.20

[David Zeuthen]

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

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

	* hald/linux/usb_bus_device.c (usb_add_caps_from_class): don't set
	capabilities from device class since this is very misleading.
	In fact, capabilities should only stem from kernel- or userspace-
	drivers. We retain the right to set the usbhub capability as no
	kernel driver is bound to this class of devices. Yet.. who knows?
	In either case, a GUI device browsers can always inspect the info.bus
	and consult the appropriate stuff, e.g. the usb.device_class, 
	_sub_class and _protocol deal for usb devices, to select an appropriate
	icon.

	* hald/linux/pci_bus_device.c (pci_add_caps_from_class): removed for
	same reasons as above
	(pci_device_pre_process): don't call pci_add_caps_from_class

	* tools/device-manager/Representation.py:
	s/bridge.cardbus/pcmcia_socket/

	* hald/linux/osspec.c: add pcmcia_socket_class_handler

	* hald/linux/pcmcia_socket_class_device.c: new file; very simple just
	tag a busdevice with the capability pcmcia_socket

	* hald/linux/class_device.c (class_device_final): log an informative
	message when we merge onto a device



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/hald/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/Makefile.am	14 Apr 2004 21:05:07 -0000	1.19
+++ b/Makefile.am	22 Apr 2004 21:52:05 -0000	1.20
@@ -43,6 +43,7 @@
 					linux/block_class_device.c	\
 					linux/ide_host_bus_device.c	\
 					linux/ide_bus_device.c		\
+					linux/pcmcia_socket_class_device.c \
 	linux/linux_dvd_rw_utils.h	linux/linux_dvd_rw_utils.c
 
 #					linux/ieee1394_host_class_device.c