hal: Branch 'origin' - 6 commits
David Zeuthen
david at kemper.freedesktop.org
Wed Apr 25 13:32:52 PDT 2007
fdi/information/10freedesktop/10-usb-music-players.fdi | 42 +++++++++++------
1 files changed, 28 insertions(+), 14 deletions(-)
New commits:
diff-tree a109a73038ee5b153f69d9d3fdce06668e77b6e6 (from aa5e5b760f28b6e662b8b10137c19bc39a59ef49)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Mon Apr 16 14:14:23 2007 +0200
added SanDisk Sansa c250 to list of USB MP3 player
Added new entry for SanDisk Sansa c250 as USB MP3 Player. Used and reworked/
extended patch from Duane S. Bone <duane_bone at hotmail.com> (see fd.o bug
10622) due to product information.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 4a68792..bbca407 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -363,7 +363,7 @@
<merge key="portable_audio_player.access_method" type="string">storage</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
- <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
</match>
<!-- Sansa e270 (maybe others as well) -->
<match key="@storage.originating_device:usb.product_id" int="0x7421">
@@ -373,6 +373,17 @@
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
</match>
+ <!-- Sansa c250 -->
+ <match key="@storage.originating_device:usb.product_id" int="0x7451">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
</match>
<!-- Feiya Technology Corp Memory Bar -->
diff-tree aa5e5b760f28b6e662b8b10137c19bc39a59ef49 (from 9e0a6418400797bfa8851bbd25f86f2dc4124121)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 13 17:32:12 2007 +0200
fixed detection of Motorola mobile phones with iTunes capability
Fixed detection of Motorola mobile phones with iTunes capability by use
multiple indirect references to get the information from the phone as
proposed by David. Use now:
@storage.originating_device:@info.parent:usb_device.product
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 1f94027..4a68792 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -3,17 +3,6 @@
<deviceinfo version="0.2">
<device>
- <!-- some specual device handling -->
- <match key="info.subsystem" string="usb">
- <!-- copy information to identify the Motorola Phones -->
- <match key="@info.parent:usb_device.product" contains="Motorola Phone">
- <match key="usb.product" string="USB Mass Storage Interface">
- <merge key="info.product" type="copy_property">@info.parent:usb_device.product</merge>
- <prepend key="info.product" type="string">USB Mass Storage Interface at </prepend>
- </match>
- </match>
- </match>
-
<match key="info.category" string="storage">
<!-- Apple iPod - TODO: use USB ids to determine exact output formats -->
<match key="storage.vendor" contains="Apple">
@@ -684,11 +673,11 @@
<match key="@storage.originating_device:usb.product_id" int="0x4810">
<merge key="storage.model" type="string">V3 series</merge>
<merge key="portable_audio_player.type" type="string">generic</merge>
- <match key="@storage.physical_device:info.product" contains="Motorola Phone (V3i)">
+ <match key="@storage.originating_device:@info.parent:usb_device.product" contains="Motorola Phone (V3i)">
<merge key="storage.model" type="string">Motorola Phone (V3i)</merge>
<merge key="portable_audio_player.type" type="string">ipod</merge>
</match>
- <match key="@storage.physical_device:info.product" contains_ncase="iTunes">
+ <match key="@storage.originating_device:@info.parent:usb_device.product" contains_ncase="iTunes">
<merge key="storage.model" type="string">Motorola iTunes Phone</merge>
<merge key="portable_audio_player.type" type="string">ipod</merge>
</match>
diff-tree 9e0a6418400797bfa8851bbd25f86f2dc4124121 (from 823a4d9ef45841257aac1710e8c6ca8610c68f69)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Apr 11 21:48:51 2007 +0200
added SonyEricsson W910i to USB musicplayer
Added SonyEricsson W910i to USB musicplayer. Used, reworked and extended
patch from Florian Meister <florian.meister at medienhaus.at> (see fd.o #10579)
due to information from the usermanual of the mobile phone.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 1daf02f..1f94027 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -571,6 +571,20 @@
<append key="portable_audio_player.audio_folders" type="strlist">MP3/</append>
<append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
</match>
+
+ <!-- W950i mobile phone -->
+ <match key="@storage.originating_device:usb.product_id" int="0xd037">
+ <merge key="portable_audio_player.type" type="string">generic</merge>
+ <merge key="portable_audio_player.access_method" type="string">storage</merge>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+ <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.rn-realaudio</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/aac</append>
+ <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+ <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+ <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
+ <append key="portable_audio_player.playlist_path" type="strlist">Music/playlists</append>
+ </match>
</match>
<match key="@storage.originating_device:usb.vendor_id" int="0x1006">
diff-tree 823a4d9ef45841257aac1710e8c6ca8610c68f69 (from 1ca5120e19505e547ef90c60525b0d03715a61cc)
Author: David Zeuthen <davidz at redhat.com>
Date: Sun Apr 8 17:21:51 2007 -0400
revert "don't include ChangeLog in the tarballs"
This reverts commit 7130e72ebfc4bec279d5fb4f485e3c37d43150a1.
diff --git a/Makefile.am b/Makefile.am
index 66ac8af..93537ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,31 @@
SUBDIRS = fdi
+MAINTAINERCLEANFILES = ChangeLog
+
+# Creating ChangeLog from git log (taken from cairo/Makefile.am):
+
+ChangeLog: $(srcdir)/ChangeLog
+
+$(srcdir)/ChangeLog:
+ @if test -d "$(srcdir)/.git"; then \
+ (cd "$(srcdir)" && \
+ ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
+ && mv -f $@.tmp $@ \
+ || ($(RM) $@.tmp; \
+ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+ (test -f $@ || echo git-log is required to generate this file >> $@)); \
+ else \
+ test -f $@ || \
+ (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
+ echo A git checkout and git-log is required to generate this file >> $@); \
+ fi
+
+.PHONY: ChangeLog $(srcdir)/ChangeLog
+
DISTCLEANFILES =
-EXTRA_DIST = HACKING
+EXTRA_DIST = HACKING ChangeLog
clean-local :
rm -f *~
diff-tree 1ca5120e19505e547ef90c60525b0d03715a61cc (from parents)
Merge: 7130e72ebfc4bec279d5fb4f485e3c37d43150a1 f7ed323781b2268e8f3f32881358cec841ddb414
Author: David Zeuthen <davidz at redhat.com>
Date: Fri Apr 6 17:19:35 2007 -0400
Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal-info
diff-tree 7130e72ebfc4bec279d5fb4f485e3c37d43150a1 (from 99a23a544de6a3fec811a81f7ddcd81265994db1)
Author: David Zeuthen <davidz at redhat.com>
Date: Fri Apr 6 17:18:39 2007 -0400
don't include ChangeLog in the tarballs
We could instead maintain a NEWS file that is updated whenever we bump
the version number and make an "official release".
diff --git a/Makefile.am b/Makefile.am
index 93537ff..66ac8af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,31 +2,9 @@
SUBDIRS = fdi
-MAINTAINERCLEANFILES = ChangeLog
-
-# Creating ChangeLog from git log (taken from cairo/Makefile.am):
-
-ChangeLog: $(srcdir)/ChangeLog
-
-$(srcdir)/ChangeLog:
- @if test -d "$(srcdir)/.git"; then \
- (cd "$(srcdir)" && \
- ./missing --run git-log --stat) | fmt --split-only > $@.tmp \
- && mv -f $@.tmp $@ \
- || ($(RM) $@.tmp; \
- echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
- (test -f $@ || echo git-log is required to generate this file >> $@)); \
- else \
- test -f $@ || \
- (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
- echo A git checkout and git-log is required to generate this file >> $@); \
- fi
-
-.PHONY: ChangeLog $(srcdir)/ChangeLog
-
DISTCLEANFILES =
-EXTRA_DIST = HACKING ChangeLog
+EXTRA_DIST = HACKING
clean-local :
rm -f *~
More information about the hal-commit
mailing list