hal/doc/conf Makefile.am, 1.3, 1.4 match-USB-camera.fdi, NONE, 1.1 match-USB-mp3-player.fdi, NONE, 1.1 match-cardreader.fdi, NONE, 1.1

[Danny Kukawka]

Update of /cvs/hal/hal/doc/conf
In directory gabe:/tmp/cvs-serv8321/doc/conf

Modified Files:
	Makefile.am 
Added Files:
	match-USB-camera.fdi match-USB-mp3-player.fdi 
	match-cardreader.fdi 
Log Message:
2005-11-01  Danny Kukawka  <danny.kukawka at web.de>

        * doc/conf/Makefile.am: added new fdi-files to Makefile

        * doc/conf/match-USB-camera.fdi, doc/conf/match-USB-mp3-player.fdi,
          doc/conf/match-cardreader.fdi: added and updated fdi-files from
        older HAL version to fix rebuild hal spec from distributed package

        * doc/spec/hal-spec.xml.in: fixed problem with rebuild spec from the
        distributed package and missing included fdi-files.



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/conf/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	1 Jul 2005 18:16:46 -0000	1.3
+++ Makefile.am	1 Nov 2005 18:56:35 -0000	1.4
@@ -1,5 +1,9 @@
 
-EXTRA_DIST = storage-policy-examples.fdi storage-skip-all.fdi storage-non-fixed.fdi
+EXTRA_DIST = storage-policy-examples.fdi storage-skip-all.fdi \
+	     storage-non-fixed.fdi match-cardreader.fdi \
+	     match-USB-camera.fdi match-USB-mp3-player.fdi
 
 confdir = $(DOCDIR)/conf
-conf_DATA = storage-policy-examples.fdi storage-skip-all.fdi storage-non-fixed.fdi
+conf_DATA = storage-policy-examples.fdi storage-skip-all.fdi \
+	    storage-non-fixed.fdi match-cardreader.fdi \
+	    match-USB-camera.fdi match-USB-mp3-player.fdi

--- NEW FILE: match-USB-camera.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<!-- Example: This device information file matches a Sony digital still 
              camera by matching on the USB vendor and product identifers.  -->

<deviceinfo version="0.2">
  <device>
    <match key="info.bus" string="usb">
      <match key="usb.vendor_id" int="0x054c">
        <match key="usb.product_id" int="0x0010">
          <merge key="info.category" type="string">camera</merge>
          <merge key="info.capabilities" type="string">camera</merge>
          <merge key="camera.access_method" type="string">storage</merge>
        </match>
      </match>
    </match>
  </device>
</deviceinfo>

--- NEW FILE: match-USB-mp3-player.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<!-- Example: This device information file matches an USB Mass Storage based MP3 player 
              by the matching on the USB vendor and product identifiers. -->

<deviceinfo version="0.2">
  <device>
    <match key="info.bus" string="usb">
      <match key="usb.vendor_id" int="0x066f">
        <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.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>
  </device>
</deviceinfo>

--- NEW FILE: match-cardreader.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<!-- Example: This device information file matches a memory card reader with 
              multiple storage ports that can be active at the same time. -->

<deviceinfo version="0.2">
  <device>
    <match key="storage.bus" string="usb">
      <match key="@storage.physical_device:usb.vendor_id" int="0x0424">
        <match key="@storage.physical_device:usb.product_id" int="0x20fc">
          <match key="storage.lun" int="0">
            <merge key="storage.drive_type" type="string">compact_flash</merge>
	  </match>
          <match key="storage.lun" int="1">
            <merge key="storage.drive_type" type="string">memory_stick</merge>
	  </match>
          <match key="storage.lun" int="2">
            <merge key="storage.drive_type" type="string">smart_media</merge>
	  </match>
          <match key="storage.lun" int="3">
            <merge key="storage.drive_type" type="string">sd_mmc</merge>
	  </match>
        </match>
      </match>
    </match>
  </device>
</deviceinfo>