hal/tools/device-manager Representation.py,1.5,1.6

[David Zeuthen]

Update of /cvs/hal/hal/tools/device-manager
In directory pdx:/tmp/cvs-serv656/tools/device-manager

Modified Files:
	Representation.py 
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: Representation.py
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/Representation.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/Representation.py	23 Dec 2003 22:29:59 -0000	1.5
+++ b/Representation.py	22 Apr 2004 21:52:06 -0000	1.6
@@ -60,7 +60,7 @@
             icon = self.icons["mouse"]
         elif cat=="input.keyboard":
             icon = self.icons["keyboard"]
-        elif cat=="bridge.cardbus":
+        elif cat=="pcmcia_socket":
             icon = self.icons["cardbus"]
         elif cat=="video":
             icon = self.icons["video"]