hal/doc/spec hal-spec.html,1.50,1.51 hal-spec.xml.in,1.34,1.35
David Zeuthen
david at freedesktop.org
Wed Mar 2 12:12:02 PST 2005
Update of /cvs/hal/hal/doc/spec
In directory gabe:/tmp/cvs-serv26602/doc/spec
Modified Files:
hal-spec.html hal-spec.xml.in
Log Message:
2005-03-02 David Zeuthen <david at fubar.dk>
* hald/linux2/classdev.c (sound_add): Rename alsa.id to alsa.card_id;
add alsa.device_id; fixup info.product to be more useful
* doc/spec/hal-spec.xml.in: Update for alsa.* properties
Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- hal-spec.html 2 Mar 2005 19:25:24 -0000 1.50
+++ hal-spec.html 2 Mar 2005 20:12:00 -0000 1.51
@@ -512,21 +512,21 @@
><DL
><DT
><A
-HREF="#AEN2579"
+HREF="#AEN2586"
>Interface org.freedesktop.Hal.Manager</A
></DT
><DD
><DL
><DT
><A
-HREF="#AEN2590"
+HREF="#AEN2597"
>Example</A
></DT
></DL
></DD
><DT
><A
-HREF="#AEN2598"
+HREF="#AEN2605"
>Interface org.freedesktop.Hal.Device</A
></DT
></DL
@@ -5788,7 +5788,28 @@
><TD
>Yes</TD
><TD
-> Card number in system as registered by ALSA.
+> Card number in system as registered by ALSA.
+ </TD
+></TR
+><TR
+><TD
+><TT
+CLASS="literal"
+>alsa.card_id</TT
+> (string)</TD
+><TD
+> Examples: <TT
+CLASS="literal"
+>I82801DBICH4</TT
+>, <TT
+CLASS="literal"
+>MP3</TT
+>
+ </TD
+><TD
+>No</TD
+><TD
+> Textual description of the card.
</TD
></TR
><TR
@@ -5802,28 +5823,25 @@
><TD
>Yes</TD
><TD
-> Device number assigned by ALSA for the current card.
+> Device number assigned by ALSA for a current card.
</TD
></TR
><TR
><TD
><TT
CLASS="literal"
->alsa.id</TT
+>alsa.device_id</TT
> (string)</TD
><TD
> Examples: <TT
CLASS="literal"
->I82801DBICH4</TT
->, <TT
-CLASS="literal"
->MP3</TT
+>Intel 82801DB-ICH4 MIC2 ADC</TT
>
</TD
><TD
>No</TD
><TD
-> The ALSA ID used to represent the device.
+> Textual description of the specific device for a card
</TD
></TR
><TR
@@ -5831,13 +5849,13 @@
><TT
CLASS="literal"
>alsa.physical_device</TT
-> (int)</TD
+> (string)</TD
><TD
> </TD
><TD
>Yes</TD
><TD
-> The physical device the ALSA stream is bound to.
+> UDI of the physical device the ALSA device is bound to.
</TD
></TR
><TR
@@ -5951,7 +5969,7 @@
><P
></P
><A
-NAME="AEN1844"
+NAME="AEN1851"
></A
><TABLE
BORDER="1"
@@ -6072,7 +6090,7 @@
><P
></P
><A
-NAME="AEN1886"
+NAME="AEN1893"
></A
><TABLE
BORDER="1"
@@ -6140,7 +6158,7 @@
><P
></P
><A
-NAME="AEN1906"
+NAME="AEN1913"
></A
><TABLE
BORDER="1"
@@ -6534,7 +6552,7 @@
><P
></P
><A
-NAME="AEN2053"
+NAME="AEN2060"
></A
><TABLE
BORDER="1"
@@ -6648,7 +6666,7 @@
><P
></P
><A
-NAME="AEN2097"
+NAME="AEN2104"
></A
><TABLE
BORDER="1"
@@ -6716,7 +6734,7 @@
><P
></P
><A
-NAME="AEN2118"
+NAME="AEN2125"
></A
><TABLE
BORDER="1"
@@ -6810,7 +6828,7 @@
><P
></P
><A
-NAME="AEN2150"
+NAME="AEN2157"
></A
><TABLE
BORDER="1"
@@ -6921,7 +6939,7 @@
><P
></P
><A
-NAME="AEN2192"
+NAME="AEN2199"
></A
><TABLE
BORDER="1"
@@ -7073,7 +7091,7 @@
><P
></P
><A
-NAME="AEN2250"
+NAME="AEN2257"
></A
><TABLE
BORDER="1"
@@ -7232,7 +7250,7 @@
><P
></P
><A
-NAME="AEN2302"
+NAME="AEN2309"
></A
><TABLE
BORDER="1"
@@ -7361,7 +7379,7 @@
><P
></P
><A
-NAME="AEN2343"
+NAME="AEN2350"
></A
><TABLE
BORDER="1"
@@ -8429,7 +8447,7 @@
><P
></P
><A
-NAME="AEN2537"
+NAME="AEN2544"
></A
><TABLE
BORDER="1"
@@ -8589,7 +8607,7 @@
><HR><H2
CLASS="sect1"
><A
-NAME="AEN2579"
+NAME="AEN2586"
>Interface org.freedesktop.Hal.Manager</A
></H2
><P
@@ -8705,7 +8723,7 @@
><HR><H3
CLASS="sect2"
><A
-NAME="AEN2590"
+NAME="AEN2597"
>Example</A
></H3
><P
@@ -8823,7 +8841,7 @@
><HR><H2
CLASS="sect1"
><A
-NAME="AEN2598"
+NAME="AEN2605"
>Interface org.freedesktop.Hal.Device</A
></H2
><P
Index: hal-spec.xml.in
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.xml.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- hal-spec.xml.in 2 Mar 2005 19:22:10 -0000 1.34
+++ hal-spec.xml.in 2 Mar 2005 20:12:00 -0000 1.35
@@ -2835,7 +2835,17 @@
<entry></entry>
<entry>Yes</entry>
<entry>
- Card number in system as registered by ALSA.
+ Card number in system as registered by ALSA.
+ </entry>
+ </row>
+ <row>
+ <entry><literal>alsa.card_id</literal> (string)</entry>
+ <entry>
+ Examples: <literal>I82801DBICH4</literal>, <literal>MP3</literal>
+ </entry>
+ <entry>No</entry>
+ <entry>
+ Textual description of the card.
</entry>
</row>
<row>
@@ -2843,25 +2853,25 @@
<entry></entry>
<entry>Yes</entry>
<entry>
- Device number assigned by ALSA for the current card.
+ Device number assigned by ALSA for a current card.
</entry>
</row>
<row>
- <entry><literal>alsa.id</literal> (string)</entry>
+ <entry><literal>alsa.device_id</literal> (string)</entry>
<entry>
- Examples: <literal>I82801DBICH4</literal>, <literal>MP3</literal>
+ Examples: <literal>Intel 82801DB-ICH4 MIC2 ADC</literal>
</entry>
<entry>No</entry>
<entry>
- The ALSA ID used to represent the device.
+ Textual description of the specific device for a card
</entry>
- </row>
+ </row>
<row>
- <entry><literal>alsa.physical_device</literal> (int)</entry>
+ <entry><literal>alsa.physical_device</literal> (string)</entry>
<entry></entry>
<entry>Yes</entry>
<entry>
- The physical device the ALSA stream is bound to.
+ UDI of the physical device the ALSA device is bound to.
</entry>
</row>
<row>
More information about the hal-commit
mailing list