hal/fdi/20freedesktop canon-digital-ixus-v.fdi, 1.1, 1.2 jetflash-mp3-player.fdi, 1.1, 1.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi/20freedesktop
In directory pdx:/tmp/cvs-serv27210/fdi/20freedesktop

Modified Files:
	canon-digital-ixus-v.fdi jetflash-mp3-player.fdi 
Log Message:
2004-08-09  David Zeuthen  <david at fubar.dk>

	* doc/spec/Makefile.am (FIGURE_FILES): Added hal-fdi-example3.png

	* doc/spec/hal-spec.xml.in: Added some text about how storage_lun%d.*
	and storage.* properties are merged from the physical device object
	backing the block devices. Included .fdi example with 6in1 reader
	to further clarify this.

	* doc/spec/hal/hal-devices1.png: 
	* doc/spec/hal/hal-fdi-example1.png:
	Updated to show full device tree now that info.virtual is gone.

	* doc/spec/hal/hal-fdi-example2.png: New file

	* doc/spec/hal/hal-fdi-example3.png: New file

2004-08-08  David Zeuthen  <david at fubar.dk>

	* doc/TODO: Remove the TODO entry about support for multiple USB
	interfaces since this is now done

	* hald/linux/usbif_bus_device.c (compute_name_from_if): New function

	* hald/linux/usb_bus_device.c: Rename all usb.* properties to
	usb_device.*

	* hald/linux/usbif_bus_device.c: Rename all usbif.* properties to
	usb.*. Merge usb_device.* properties from parent device. Essentially
	an USB interface is now like an USB device was except that it
	exports properties usb.interface.* to describe the USB interface

	* tools/device-manager/Const.py.in: 
	* tools/device-manager/Representation.py: 
	Handle the s/usb/usb_device/ and s/usbif/usb/ renamings

	* doc/spec/hal-spec.xml.in: Apply a patch from Kay with spelling/
	language/grammar improvements. Also update to reflect the USB
	renaming.

	* hald/linux/usbif_bus_device.c (usbif_device_pre_process): 
	* hald/linux/scsi_host_class_device.c (scsi_host_class_pre_process): 
	* hald/linux/scsi_device_class_device.c 
	(scsi_device_class_pre_process): 
	* hald/linux/macio_bus_device.c (macio_device_pre_process): 
	* hald/linux/ieee1394_node_class_device.c 
	(ieee1394_node_class_pre_process): 
	* hald/linux/ieee1394_host_class_device.c 
	(ieee1394_host_class_pre_process): 
	* hald/linux/ide_host_bus_device.c (ide_host_device_pre_process): 
	* hald/linux/ide_bus_device.c (ide_device_pre_process): 
	* hald/linux/block_class_device.c (block_class_pre_process): 
	Don't set the info.virtual property

2004-08-06  David Zeuthen  <david at fubar.dk>

	* fdi/20freedesktop/canon-digital-ixus-v.fdi: Updated to match spec

	* fdi/20freedesktop/jetflash-mp3-player.fdi: Updated to match spec

	* doc/spec/hal-spec.xml.in: Work in progress

	* hald/linux/pcmcia_socket_class_device.c 
	(pcmcia_socket_class_pre_process): Add property pcmcia_socket.number



Index: canon-digital-ixus-v.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/canon-digital-ixus-v.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- canon-digital-ixus-v.fdi	23 Dec 2003 22:29:59 -0000	1.1
+++ canon-digital-ixus-v.fdi	9 Aug 2004 18:33:29 -0000	1.2
@@ -7,7 +7,8 @@
         <match key="usb.product_id" int="0x3052">
           <merge key="info.category" type="string">camera</merge>
           <merge key="info.capabilities" type="string">camera</merge>
-          <merge key="info.persistent" type="bool">true</merge>
+          <merge key="camera.access_method" type="string">user</merge>
+          <merge key="camera.libgphoto2.support" type="bool">true</merge>
         </match>
       </match>
     </match>

Index: jetflash-mp3-player.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/jetflash-mp3-player.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jetflash-mp3-player.fdi	26 Jun 2004 08:07:52 -0000	1.1
+++ jetflash-mp3-player.fdi	9 Aug 2004 18:33:29 -0000	1.2
@@ -7,9 +7,9 @@
         <match key="usb.product_id" int="0x8000">
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="info.capabilities" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.output" type="string">mp3 wma</merge>
-          <merge key="portable_audio_player.input" type="string">wav</merge>
-          <merge key="portable_audio_player.localdb" type="bool">false</merge>
+          <merge key="portable_audio_player.access_method" type="string">storage</merge>
+          <merge key="portable_audio_player.output_formats" type="string">audio/mpeg audio/x-ms-wma</merge>
+          <merge key="portable_audio_player.input_formats" type="string">audio/x-wav</merge>
         </match>
       </match>
     </match>