<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } </style> </head> <body> <div class="content"> <h3> PulseAudio Marge Bot pushed to branch master at <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio">PulseAudio / pulseaudio</a> </h3> <h4> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/3fcd5e398d32477eecb86fbd943fba3c2606f84a">3fcd5e39</a> <div> by Takashi Sakamoto at 2021-08-11T15:04:07+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Revert "udev: use ID_MODEL/ID_VENDOR to give friendly name for FireWire devices" This reverts commit 3ac73598c67cb59a318c8baaf33fe97eed1e0b3e. Systemd v249 has new entries of hwdb for node and unit in IEEE 1394 bus (hwdb.d/80-ieee1394-unit-function.hwdb). It can obsolete my workaround added by commit 3ac73598c67c ("udev: use ID_MODEL/ID_VENDOR to give friendly name for FireWire devices"). The hwdb entry is handy prepared. When user finds missing entry, it's preferable to file issue or merge request in systemd project site. IEEE 1394 bus is enough legacy and it's easy to expect that few developer can evaluate the change. For reviewers, I describe the original issues and the integration of hwdb in systemd side. In systemd, udev rule for sound card (rules.d/78-sound-card.rules) has below line to assign information in hwdb to instance for sound card. ``` IMPORT{builtin}="hwdb" ``` In the case, the udev hwdb builtin finds information according to modalias by following nodes in device topology tree toward root. For sound card associated to unit in node in IEEE 1394 bus, it's inconvenient since hwdb had no entry for the unit. The instance for node in IEEE 1394 bus doesn't have modalias. As a result, the builtin reaches 1394 OHCI controller in PCI Express bus which maintains the IEEE 1394 bus, then the value for ID_VENDOR_FROM_DATABASE and ID_MODEL_FROM_DATABASE properties from hwdb of pci device (hwdb.d/20-pci-vendor-model.hwdb) for the sound card. For example, when two nodes are in IEEE 1394 bus and one of them has unit instance for audio and music functions, the topology of the bus is depicted in following diagram: ``` * 1394 OHCI controller (pci*, modalias) * node A - (pci*/fw0, /dev/fw0) * node B - (pci*/fw1, /dev/fw1) * unit B-1 - (pci*/fw1/fw1.0, modalias) * sound card 0 - (pci*/fw1/fw1.0/sound/card0, card0) ``` In the case, the udev hwdb builtin picks up from hwdb of pci device for the sound card: ``` $ udevadm test-builtin hwdb /sys/class/sound/card2 Load module index Parsed configuration file /usr/lib/systemd/network/99-default.link Parsed configuration file /usr/lib/systemd/network/73-usb-net-by-mac.link Created link configuration context. ID_PCI_CLASS_FROM_DATABASE=Serial bus controller ID_PCI_SUBCLASS_FROM_DATABASE=FireWire (IEEE 1394) ID_PCI_INTERFACE_FROM_DATABASE=OHCI ID_VENDOR_FROM_DATABASE=Texas Instruments ID_MODEL_FROM_DATABASE=XIO2213A/B/XIO2221 IEEE-1394b OHCI Controller [Cheetah Express] Unload module index Unloaded link configuration context. ``` The aim of my workaround is to avoid using ID_VENDOR_FROM_DATABASE and ID_MODEL_FROM_DATABASE for sound card associated to unit in IEEE 1394 bus. Instead, ID_VENDOR and ID_MODEL properties are used. However, it has another issue. For the properties, the udev rule for sound card has the other lines for sound card associated to unit in IEEE 1394 bus, below: ``` SUBSYSTEMS=="firewire", ATTRS{guid}=="?*", \ ENV{ID_BUS}="firewire", ENV{ID_SERIAL}="$attr{guid}", ENV{ID_SERIAL_SHORT}="$attr{guid}", \ ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{model}", \ ENV{ID_VENDOR}="$attr{vendor_name}", ENV{ID_MODEL}="$attr{model_name}" SUBSYSTEMS=="firewire", GOTO="skip_pci" ``` The values of ID_VENDOR and ID_MODEL properties come from vendor_name and model_name attributes in parent instance of the sound card, therefore they come from audio and music units in IEEE 1394 bus. Unfortunately these attributes are not available always. All of nodes in IEEE 1394 bus should have configuration ROM in place according to IEEE 1212 and Linux FireWire subsystem parses the content of ROM to detect units in the node. At the same time, the subsystem manages to detect information about vendor and model according to standard layout defined by 1394 Trading Association[1]. When the content of ROM is against the standard, the subsystem is discouraged the name detection. In the case, vendor_name and model_name attributes are not available, and supplemental information should be from software implementation. The new hwdb (hwdb.d/80-ieee1394-unit-function.hwdb) added to systemd v249 can solve the above issues. The prepared names for vendor and model in hwdb are assigned to both node and unit. The udev hwdb builtin can find the vendor and model names for the unit according to modalias before arriving at pci-device. Regardless of standard or non-standard configuration ROM, the hwdb gives prepared names of vendor and model. This is an example of Mark of the Unicorn (MOTU) Traveler. The search finishes at instance for unit in IEEE 1394 bus expectedly: ``` $ udevadm test-builtin hwdb /sys/class/sound/card2 Load module index Parsed configuration file /usr/lib/systemd/network/99-default.link Parsed configuration file /usr/lib/systemd/network/73-usb-net-by-mac.link Created link configuration context. ID_MODEL_FROM_DATABASE=Traveler ID_VENDOR_FROM_DATABASE=MOTU IEEE1394_UNIT_FUNCTION_AUDIO=1 IEEE1394_UNIT_FUNCTION_MIDI=1 Unload module index Unloaded link configuration context. ``` [1] Configuration ROM for AV/C Devices 1.0 (Dec. 12, 2000, 1394 Trading Association, TA Document 1999027) Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/610> </pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#f0e08d2d6eec77941a616b1c58cab18dfce65dab"> src/modules/udev-util.c </a> </li> </ul> <h4>Changes:</h4> <li id="f0e08d2d6eec77941a616b1c58cab18dfce65dab"> <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/3fcd5e398d32477eecb86fbd943fba3c2606f84a#f0e08d2d6eec77941a616b1c58cab18dfce65dab">src/modules/udev-util.c</a> <hr> <table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="168" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="168" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -168,7 +168,6 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="168" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 168 </td> <td class="new_line diff-line-num" data-linenumber="168" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 168 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> struct udev_device *card = NULL; </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="169" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 169 </td> <td class="new_line diff-line-num" data-linenumber="169" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 169 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> char *t; </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="170" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 170 </td> <td class="new_line diff-line-num" data-linenumber="170" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 170 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> const char *v; </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="171" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 171 </td> <td class="new_line diff-line-num old" data-linenumber="171" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- const char *bus = NULL; </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="172" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 172 </td> <td class="new_line diff-line-num" data-linenumber="171" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 171 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> int id; </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="173" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 173 </td> <td class="new_line diff-line-num" data-linenumber="172" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 172 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="174" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 174 </td> <td class="new_line diff-line-num" data-linenumber="173" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 173 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_assert(p); </pre> </td> </tr> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="202" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="201" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -202,16 +201,15 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="202" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 202 </td> <td class="new_line diff-line-num" data-linenumber="201" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 201 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_proplist_sets(p, "udev.id", v); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="203" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 203 </td> <td class="new_line diff-line-num" data-linenumber="202" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 202 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="204" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 204 </td> <td class="new_line diff-line-num" data-linenumber="203" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 203 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if (!pa_proplist_contains(p, PA_PROP_DEVICE_BUS)) </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="205" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 205 </td> <td class="new_line diff-line-num old" data-linenumber="204" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- if ((bus = udev_device_get_property_value(card, "ID_BUS")) && *bus) </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="206" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 206 </td> <td class="new_line diff-line-num old" data-linenumber="204" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- pa_proplist_sets(p, PA_PROP_DEVICE_BUS, bus); </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="207" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="204" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 204 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if ((v = udev_device_get_property_value(card, "ID_BUS")) && *v) </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="207" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="205" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 205 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ pa_proplist_sets(p, PA_PROP_DEVICE_BUS, v); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="207" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 207 </td> <td class="new_line diff-line-num" data-linenumber="206" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 206 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="208" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 208 </td> <td class="new_line diff-line-num" data-linenumber="207" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 207 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if (!pa_proplist_contains(p, PA_PROP_DEVICE_VENDOR_ID)) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="209" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 209 </td> <td class="new_line diff-line-num" data-linenumber="208" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 208 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if ((id = read_id(card, "ID_VENDOR_ID")) > 0) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="210" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 210 </td> <td class="new_line diff-line-num" data-linenumber="209" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 209 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_proplist_setf(p, PA_PROP_DEVICE_VENDOR_ID, "%04x", id); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="211" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 211 </td> <td class="new_line diff-line-num" data-linenumber="210" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 210 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="212" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 212 </td> <td class="new_line diff-line-num" data-linenumber="211" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 211 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if (!pa_proplist_contains(p, PA_PROP_DEVICE_VENDOR_NAME)) { </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="213" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 213 </td> <td class="new_line diff-line-num old" data-linenumber="212" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- /* ID_VENDOR_FROM_DATABASE returns the name of IEEE 1394 Phy/Link chipset for FireWire devices */ </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="214" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 214 </td> <td class="new_line diff-line-num old" data-linenumber="212" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- if (!pa_safe_streq(bus, "firewire") && (v = udev_device_get_property_value(card, "ID_VENDOR_FROM_DATABASE")) && *v) </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="215" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="212" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 212 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if ((v = udev_device_get_property_value(card, "ID_VENDOR_FROM_DATABASE")) && *v) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="215" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 215 </td> <td class="new_line diff-line-num" data-linenumber="213" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 213 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_proplist_sets(p, PA_PROP_DEVICE_VENDOR_NAME, v); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="216" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 216 </td> <td class="new_line diff-line-num" data-linenumber="214" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 214 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> else if ((v = udev_device_get_property_value(card, "ID_VENDOR_ENC")) && *v) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="217" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 217 </td> <td class="new_line diff-line-num" data-linenumber="215" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 215 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> proplist_sets_unescape(p, PA_PROP_DEVICE_VENDOR_NAME, v); </pre> </td> </tr> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="224" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="222" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match" style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -224,8 +222,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="224" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 224 </td> <td class="new_line diff-line-num" data-linenumber="222" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 222 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_proplist_setf(p, PA_PROP_DEVICE_PRODUCT_ID, "%04x", id); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="225" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 225 </td> <td class="new_line diff-line-num" data-linenumber="223" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 223 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="226" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 226 </td> <td class="new_line diff-line-num" data-linenumber="224" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 224 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> if (!pa_proplist_contains(p, PA_PROP_DEVICE_PRODUCT_NAME)) { </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="227" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 227 </td> <td class="new_line diff-line-num old" data-linenumber="225" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- /* ID_MODEL_FROM_DATABASE returns the name of IEEE 1394 Phy/Link chipset for FireWire devices */ </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num old" data-linenumber="228" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 228 </td> <td class="new_line diff-line-num old" data-linenumber="225" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- if (!pa_safe_streq(bus, "firewire") && (v = udev_device_get_property_value(card, "ID_MODEL_FROM_DATABASE")) && *v) </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num new" data-linenumber="229" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="new_line diff-line-num new" data-linenumber="225" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 225 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ if ((v = udev_device_get_property_value(card, "ID_MODEL_FROM_DATABASE")) && *v) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="229" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 229 </td> <td class="new_line diff-line-num" data-linenumber="226" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 226 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> pa_proplist_sets(p, PA_PROP_DEVICE_PRODUCT_NAME, v); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="230" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 230 </td> <td class="new_line diff-line-num" data-linenumber="227" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 227 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> else if ((v = udev_device_get_property_value(card, "ID_MODEL_ENC")) && *v) </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="old_line diff-line-num" data-linenumber="231" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 231 </td> <td class="new_line diff-line-num" data-linenumber="228" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 228 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> proplist_sets_unescape(p, PA_PROP_DEVICE_PRODUCT_NAME, v); </pre> </td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/3fcd5e398d32477eecb86fbd943fba3c2606f84a">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. <script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/3fcd5e398d32477eecb86fbd943fba3c2606f84a"}}</script> </div> </body> </html>