hal/fdi/information/10freedesktop 10-usb-card-readers.fdi, NONE, 1.1 10-usb-music-players.fdi, NONE, 1.1 10-usb-zip-drives.fdi, NONE, 1.1

[David Zeuthen]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory gabe:/tmp/cvs-serv9653/fdi/information/10freedesktop

Added Files:
	10-usb-card-readers.fdi 10-usb-music-players.fdi 
	10-usb-zip-drives.fdi 
Log Message:
2005-02-26  David Zeuthen  <davidz at redhat.com>

	* libhal-storage/libhal-storage.h: Add new LibHalDriveType entries
	for ZIP, JAZ and FLASH_KEY - the latter represents a USB memory stick.

	* libhal-storage/libhal-storage.c (my_strvdup): New function
	(libhal_drive_from_udi): Fixup new detection of cameras and 
	musicplayers. Also handle storage.drive_type zip, jaz and flash_key
	and convert to LibHalDriveType as appropriate

	* libhal/libhal.h: Fixup type for LibHalDeviceCondition

	* libhal/libhal.c (filter_func): Fix up condition handling now that
	it's a name and details string rather than a whole DBusMessage trailing
	off. Fix up a bunch of free's due to new memory ownership semantics
	in the new D-BUS
	(libhal_device_query_capability): Handle this now that capabilities
	is a strlist

	* hald/device.c (hal_device_merge): info.capabilities is now a strlist
	(hal_device_add_capability): -do-
	(hal_device_has_capability): -do-
	(hal_device_property_strlist_add): Return whether element was actually
	added

	* fdi/information/10freedesktop/10-usb-zip-drives.fdi: New file

	* fdi/information/10freedesktop/10-usb-music-players.fdi: New file

	* fdi/information/10freedesktop/10-usb-card-readers.fdi: New file



--- NEW FILE: 10-usb-card-readers.fdi ---
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>

    <!-- Generic catch all -->
    <match key="storage.bus" string="usb">
      <match key="storage.model" contains="HS-CF">
        <merge key="storage.drive_type" type="string">compact_flash</merge>
      </match>      
      <match key="storage.model" contains="HS-MS">
        <merge key="storage.drive_type" type="string">memory_stick</merge>
      </match>      
      <match key="storage.model" contains="HS-SM">
        <merge key="storage.drive_type" type="string">smart_media</merge>
      </match>      
      <match key="storage.model" contains="HS-SD/MMC">
        <merge key="storage.drive_type" type="string">sd_mmc</merge>
      </match>      
    </match>

    <!-- Lexar CF Reader -->
    <match key="storage.bus" string="usb">
      <match key="@storage.physical_device:usb.vendor_id" int="0x05dc">
        <match key="@storage.physical_device:usb.product_id" int="0x0002">
          <merge key="storage.drive_type" type="string">compact_flash</merge>
        </match>
      </match>
    </match>    

  </device>
</deviceinfo>

--- NEW FILE: 10-usb-music-players.fdi ---
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>

    <!-- Apple iPod - TODO: use USB ids to determine exact output formats  -->
    <match key="info.category" string="storage">
      <match key="storage.vendor" contains="Apple">
	<match key="storage.model" contains="iPod">
	  <append key="info.capabilities" type="strlist">portable_audio_player</append>
          <merge key="portable_audio_player.access_method" type="string">storage</merge>
            <merge key="portable_audio_player.database_type" type="string">ipod</merge>
          <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
          <append key="portable_audio_player.output_formats" type="strlist">audio/x-mp3</append>
          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
          <merge key="storage.requires_eject" type="bool">true</merge>
	</match>
      </match>
    </match>	    

    <!-- Jetflash MP3 Player -->
    <match key="info.category" string="storage">
      <match key="@storage.physical_device:info.bus" string="usb">
	<match key="@storage.physical_device:usb.vendor_id" int="0x066f">
          <match key="@storage.physical_device:usb.product_id" int="0x8000">
	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
            <merge key="portable_audio_player.access_method" type="string">storage</merge>
            <merge key="portable_audio_player.database_type" type="string">flat</merge>
            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
          </match>
        </match>
      </match>
    </match>

  </device>
</deviceinfo>

--- NEW FILE: 10-usb-zip-drives.fdi ---
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>

    <!-- USB Zip Drives -->
    <match key="storage.bus" string="usb">
      <match key="storage.drive_type" string="disk">
	<match key="storage.vendor" string="IOMEGA">
          <match key="storage.model" contains_ncase="ZIP">
            <merge key="storage.drive_type" type="string">zip</merge>
            <merge key="storage.requires_eject" type="bool">true</merge>
          </match>
	</match>
      </match>
    </match>

  </device>
</deviceinfo>