← Back to branch summary

~ubuntu-branches/ubuntu/hardy/hal-info/hardy-proposed

« back to all changes in this revision

Viewing changes to fdi/information/10freedesktop/10-usb-card-readers.fdi

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2007-05-23 09:48:55 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070523094855-vm58vbm7zqczscz4
Tags: 20070516-1ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/patches/music-players.patch: Some additional USB music players.

Show diffs side-by-side

added added

removed removed

Lines of Context:
fdi/information/10freedesktop/10-usb-card-readers.fdi
89
89
      </match>
90
90
      <match key="storage.model" string="IC1210    MMC/SD">
91
91
        <merge key="storage.drive_type" type="string">sd_mmc</merge>
 
92
</match>
 
93
 
 
94
      <!-- Noname multi-card Reader -->
 
95
      <match key="@storage.physical_device:usb.vendor_id" int="0x05e3">
 
96
          <match key="@storage.physical_device:usb.product_id" int="0x0760">
 
97
             <match key="storage.lun" int="0">
 
98
                     <merge key="storage.drive_type" type="string">compact_flash</merge>
 
99
             </match>
 
100
             <match key="storage.lun" int="1">
 
101
                     <merge key="storage.drive_type" type="string">memory_stick</merge>
 
102
             </match>
 
103
             <match key="storage.lun" int="2">
 
104
                     <merge key="storage.drive_type" type="string">sd_mmc</merge>
 
105
             </match>
 
106
             <match key="storage.lun" int="3">
 
107
                     <merge key="storage.drive_type" type="string">smart_media</merge>
 
108
             </match>
 
109
        </match>
92
110
      </match>
93
111
 
94
112
      <!-- Lexar CF Reader -->