hal: Branch 'origin' - 6 commits
David Zeuthen
david at kemper.freedesktop.org
Sun Apr 1 01:58:42 PDT 2007
COPYING | 9 +----
configure.in | 6 +--
fdi/information/10freedesktop/10-usb-music-players.fdi | 26 +++++++++++++++--
fdi/information/30user/.gitignore | 4 --
fdi/information/30user/Makefile.am | 23 ---------------
fdi/information/Makefile.am | 2 -
fdi/preprobe/30user/Makefile.am | 7 ----
fdi/preprobe/Makefile.am | 2 -
8 files changed, 30 insertions(+), 49 deletions(-)
New commits:
diff-tree fda3ec662beb94a67f7aef7b0a97ef3c650cc657 (from 82c808cacfbe4a04194b28e2bcaf0474173b1c93)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Mar 28 23:49:52 2007 +0200
fix detection of Motorola RAZR v3 series as USB music player
Fixed detection of Motorola RAZR v3 series as USB music player. Set
portable_audio_player.type only for V3i to ipod, all other devices
with the same USB product ID don't have this capability. All other
devices get portable_audio_player.type == generic.
This fix fd.o bug #10161.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7363548..caf66ca 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -3,6 +3,17 @@
<deviceinfo version="0.2">
<device>
+ <!-- some specual device handling -->
+ <match key="info.subsystem" string="usb">
+ <!-- copy information to identify the v3i Motorola -->
+ <match key="@info.parent:usb_device.product" contains="Motorola Phone (V3i)">
+ <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">
@@ -657,10 +668,14 @@
<match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
<!-- Motorola iTunes enabled phone -->
<match key="@storage.originating_device:usb.product_id" int="0x4810">
- <merge key="storage.model" type="string">V360</merge>
+ <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)">
+ <merge key="storage.model" type="string">Motorola Phone (V3i)</merge>
+ <merge key="portable_audio_player.type" type="string">ipod</merge>
+ </match>
<merge key="storage.vendor" type="string">Motorola</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
- <merge key="portable_audio_player.type" type="string">ipod</merge>
<append key="portable_audio_player.output_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">mobile/audio/</append>
diff-tree 82c808cacfbe4a04194b28e2bcaf0474173b1c93 (from a3d88893a5086926711c98df101a0a6981c2f46a)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Tue Mar 27 16:53:08 2007 +0200
added T.sonic 610 (Transcend) USB MP3-Player
Added adopted patch from David Olivier <dolivier at intraprise.co.za> from
fd.o bug 10419 for T.sonic 610 (Transcend) MP3-Player to
10-usb-music-players.fdi
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 6d9a13c..7363548 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -308,6 +308,13 @@
<append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
<append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
</match>
+ <!--Transcend (T.Sonic 610) -->
+ <match key="@storage.originating_device:usb.product_id" int="0x82e0">
+ <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.input_formats" type="strlist">audio/x-wav</append>
+ </match>
<!-- TrekStor i.Beat jump MP3 Player -->
<match key="@storage.originating_device:usb.product_id" int="0x835d">
<merge key="portable_audio_player.type" type="string">generic</merge>
diff-tree a3d88893a5086926711c98df101a0a6981c2f46a (from 312459e63b1e515b35ecf4800e609b38928c138f)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Mar 26 20:21:55 2007 -0400
rename fdi/preprobe/10freedesktop to fdi/preprobe/10osvendor
diff --git a/configure.in b/configure.in
index f9eb4e9..55fa853 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ fdi/information/Makefile
fdi/information/10freedesktop/Makefile
fdi/information/20thirdparty/Makefile
fdi/preprobe/Makefile
-fdi/preprobe/10freedesktop/Makefile
+fdi/preprobe/10osvendor/Makefile
fdi/preprobe/20thirdparty/Makefile
])
diff --git a/fdi/preprobe/10freedesktop/10-ide-drives.fdi b/fdi/preprobe/10freedesktop/10-ide-drives.fdi
deleted file mode 100644
index 0749499..0000000
--- a/fdi/preprobe/10freedesktop/10-ide-drives.fdi
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
- <device>
- <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
- <match key="storage.bus" string="ide">
- <match key="storage.drive_type" string="disk">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
- </match>
- </match>
-
- <match key="storage.bus" string="ide">
- <match key="storage.drive_type" string="floppy">
- <!-- IOMEGA Zip Drive -->
- <match key="storage.model" contains_ncase="ZIP">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.no_partitions_hint" type="bool">true</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- <!-- treat as floppy and data at partition 4; adjust device file -->
- <append key="block.device" type="string">4</append>
- </match>
- </match>
- </match>
-
- <match key="storage.bus" string="scsi">
- <match key="storage.drive_type" string="disk">
- <!-- IOMEGA Zip Drive -->
- <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>
-
- <!-- IOMEGA CLIK! Drive -->
- <match key="storage.model" contains_ncase="CLIK">
- <merge key="storage.drive_type" type="string">zip</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
-
- <!-- Jaz -->
- <match key="storage.model" contains_ncase="JAZ">
- <merge key="storage.drive_type" type="string">jaz</merge>
- <merge key="storage.requires_eject" type="bool">true</merge>
- </match>
- </match>
- </match>
-
-
- </device>
-</deviceinfo>
diff --git a/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi b/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi
deleted file mode 100644
index 0d14053..0000000
--- a/fdi/preprobe/10freedesktop/20-broken-usb-sticks.fdi
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
- <device>
-
- <!-- Some SanDisk USB sticks expose an extra LUN that is, I suppose, used for
- Windows drivers (Geez, guys, thanks a lot.). Ignore this. RH #208512 -->
- <match key="storage.bus" string="usb">
- <match key="storage.drive_type" string="cdrom">
- <match key="storage.lun" int="1">
- <match key="storage.vendor" string="SanDisk">
- <match key="storage.model" string="U3 Cruzer Micro">
- <merge key="info.ignore" type="bool">true</merge>
- </match>
- </match>
- </match>
- </match>
- </match>
- </device>
-</deviceinfo>
diff --git a/fdi/preprobe/10freedesktop/Makefile.am b/fdi/preprobe/10freedesktop/Makefile.am
deleted file mode 100644
index 03da3e9..0000000
--- a/fdi/preprobe/10freedesktop/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
-
-dist_fdi_DATA = 10-ide-drives.fdi 20-broken-usb-sticks.fdi
-
-check:
- for f in $(dist_fdi_DATA); do \
- echo -n "Validate XML in $$f : "; \
- xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
- if test -s xmllint.error; \
- then \
- echo failed; \
- cat xmllint.error; \
- rm -f xmllint.error; \
- exit 1; \
- else \
- echo ok; \
- rm -f xmllint.error; \
- fi; \
- done;
diff --git a/fdi/preprobe/10osvendor/10-ide-drives.fdi b/fdi/preprobe/10osvendor/10-ide-drives.fdi
new file mode 100644
index 0000000..0749499
--- /dev/null
+++ b/fdi/preprobe/10osvendor/10-ide-drives.fdi
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+ <device>
+ <!-- Handle weird IDE drives (Jaz and Zip) by matching on the IDE model -->
+ <match key="storage.bus" string="ide">
+ <match key="storage.drive_type" string="disk">
+ <!-- IOMEGA Zip Drive -->
+ <match key="storage.model" contains_ncase="ZIP">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- IOMEGA CLIK! Drive -->
+ <match key="storage.model" contains_ncase="CLIK">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- Jaz -->
+ <match key="storage.model" contains_ncase="JAZ">
+ <merge key="storage.drive_type" type="string">jaz</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+ </match>
+ </match>
+
+ <match key="storage.bus" string="ide">
+ <match key="storage.drive_type" string="floppy">
+ <!-- IOMEGA Zip Drive -->
+ <match key="storage.model" contains_ncase="ZIP">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- IOMEGA CLIK! Drive -->
+ <match key="storage.model" contains_ncase="CLIK">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+
+ <!-- Jaz -->
+ <match key="storage.model" contains_ncase="JAZ">
+ <merge key="storage.drive_type" type="string">jaz</merge>
+ <merge key="storage.no_partitions_hint" type="bool">true</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ <!-- treat as floppy and data at partition 4; adjust device file -->
+ <append key="block.device" type="string">4</append>
+ </match>
+ </match>
+ </match>
+
+ <match key="storage.bus" string="scsi">
+ <match key="storage.drive_type" string="disk">
+ <!-- IOMEGA Zip Drive -->
+ <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>
+
+ <!-- IOMEGA CLIK! Drive -->
+ <match key="storage.model" contains_ncase="CLIK">
+ <merge key="storage.drive_type" type="string">zip</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
+
+ <!-- Jaz -->
+ <match key="storage.model" contains_ncase="JAZ">
+ <merge key="storage.drive_type" type="string">jaz</merge>
+ <merge key="storage.requires_eject" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+
+
+ </device>
+</deviceinfo>
diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
new file mode 100644
index 0000000..0d14053
--- /dev/null
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+ <device>
+
+ <!-- Some SanDisk USB sticks expose an extra LUN that is, I suppose, used for
+ Windows drivers (Geez, guys, thanks a lot.). Ignore this. RH #208512 -->
+ <match key="storage.bus" string="usb">
+ <match key="storage.drive_type" string="cdrom">
+ <match key="storage.lun" int="1">
+ <match key="storage.vendor" string="SanDisk">
+ <match key="storage.model" string="U3 Cruzer Micro">
+ <merge key="info.ignore" type="bool">true</merge>
+ </match>
+ </match>
+ </match>
+ </match>
+ </match>
+ </device>
+</deviceinfo>
diff --git a/fdi/preprobe/10osvendor/Makefile.am b/fdi/preprobe/10osvendor/Makefile.am
new file mode 100644
index 0000000..03da3e9
--- /dev/null
+++ b/fdi/preprobe/10osvendor/Makefile.am
@@ -0,0 +1,20 @@
+
+fdidir = $(datadir)/hal/fdi/preprobe/10osvendor
+
+dist_fdi_DATA = 10-ide-drives.fdi 20-broken-usb-sticks.fdi
+
+check:
+ for f in $(dist_fdi_DATA); do \
+ echo -n "Validate XML in $$f : "; \
+ xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
+ if test -s xmllint.error; \
+ then \
+ echo failed; \
+ cat xmllint.error; \
+ rm -f xmllint.error; \
+ exit 1; \
+ else \
+ echo ok; \
+ rm -f xmllint.error; \
+ fi; \
+ done;
diff --git a/fdi/preprobe/Makefile.am b/fdi/preprobe/Makefile.am
index 74273d3..36cf6e7 100644
--- a/fdi/preprobe/Makefile.am
+++ b/fdi/preprobe/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = 10freedesktop 20thirdparty
+SUBDIRS = 10osvendor 20thirdparty
diff-tree 312459e63b1e515b35ecf4800e609b38928c138f (from b1ba285086ed84e8861f1047e6bc629b9b964f76)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Mar 26 20:09:28 2007 -0400
move creation of /etc/hal/fdi/* to the main hal package
diff --git a/configure.in b/configure.in
index 9bebcc6..f9eb4e9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070326, david at fubar.dk)
+AC_INIT(hal-info, 20070327, david at fubar.dk)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -25,11 +25,9 @@ fdi/Makefile
fdi/information/Makefile
fdi/information/10freedesktop/Makefile
fdi/information/20thirdparty/Makefile
-fdi/information/30user/Makefile
fdi/preprobe/Makefile
fdi/preprobe/10freedesktop/Makefile
fdi/preprobe/20thirdparty/Makefile
-fdi/preprobe/30user/Makefile
])
dnl ==========================================================================
diff --git a/fdi/information/30user/.gitignore b/fdi/information/30user/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/information/30user/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/information/30user/Makefile.am b/fdi/information/30user/Makefile.am
deleted file mode 100644
index b33f605..0000000
--- a/fdi/information/30user/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-fdidir = $(sysconfdir)/hal/fdi/information
-
-dist_fdi_DATA =
-
-check:
- for f in $(dist_fdi_DATA); do \
- echo -n "Validate XML in $$f : "; \
- xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
- if test -s xmllint.error; \
- then \
- echo failed; \
- cat xmllint.error; \
- rm -f xmllint.error; \
- exit 1; \
- else \
- echo ok; \
- rm -f xmllint.error; \
- fi; \
- done;
-
-clean-local :
- rm -f *~
diff --git a/fdi/information/Makefile.am b/fdi/information/Makefile.am
index 40ff1e5..74273d3 100644
--- a/fdi/information/Makefile.am
+++ b/fdi/information/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = 10freedesktop 20thirdparty 30user
+SUBDIRS = 10freedesktop 20thirdparty
diff --git a/fdi/preprobe/30user/Makefile.am b/fdi/preprobe/30user/Makefile.am
deleted file mode 100644
index da04d3e..0000000
--- a/fdi/preprobe/30user/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-fdidir = $(sysconfdir)/hal/fdi/preprobe
-
-dist_fdi_DATA =
-
-
-
diff --git a/fdi/preprobe/Makefile.am b/fdi/preprobe/Makefile.am
index 40ff1e5..74273d3 100644
--- a/fdi/preprobe/Makefile.am
+++ b/fdi/preprobe/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = 10freedesktop 20thirdparty 30user
+SUBDIRS = 10freedesktop 20thirdparty
diff-tree b1ba285086ed84e8861f1047e6bc629b9b964f76 (from a4a6417472dc3421ea110293dca85b691f3ce7b4)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Mar 26 00:50:06 2007 -0400
fix up COPYING to avoid mentioning source files etc.
diff --git a/COPYING b/COPYING
index be90312..a1b1beb 100644
--- a/COPYING
+++ b/COPYING
@@ -1,11 +1,6 @@
-HAL is licensed to you under your choice of the Academic Free
+hal-info is licensed to you under your choice of the Academic Free
License version 2.1, or the GNU General Public License version 2.
-Both licenses are included here. Some individual source code files
-and/or binaries may be under the GPL only or under the LGPG.
-
-Each source code file is marked with the proper copyright information.
-
-
+Both licenses are included here.
The Academic Free License
v. 2.1
diff-tree a4a6417472dc3421ea110293dca85b691f3ce7b4 (from a6a5f1bee756bd686418778ba06f987e2d918370)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Mar 26 00:48:32 2007 -0400
update version to 20060326
diff --git a/configure.in b/configure.in
index a064ed9..9bebcc6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070313, david at fubar.dk)
+AC_INIT(hal-info, 20070326, david at fubar.dk)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
More information about the hal-commit
mailing list