[pkgsrc/trunk]: pkgsrc/sysutils/hal/files/hald-netbsd According to spec oss.t...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31974ee7f5b2
branches:  trunk
changeset: 550741:31974ee7f5b2
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Thu Nov 27 18:00:44 2008 +0000

description:
According to spec oss.type should be 'pcm', not 'dsp'. Fill in
oss.device_id while we're here.

diffstat:

 sysutils/hal/files/hald-netbsd/devinfo_audio.c |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 998fdb0346fe -r 31974ee7f5b2 sysutils/hal/files/hald-netbsd/devinfo_audio.c
--- a/sysutils/hal/files/hald-netbsd/devinfo_audio.c    Thu Nov 27 18:00:06 2008 +0000
+++ b/sysutils/hal/files/hald-netbsd/devinfo_audio.c    Thu Nov 27 18:00:44 2008 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: devinfo_audio.c,v 1.1 2008/11/27 16:07:14 jmcneill Exp $ */
+/* $NetBSD: devinfo_audio.c,v 1.2 2008/11/27 18:00:44 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2008 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -127,6 +127,7 @@
 
        hal_device_property_set_int (d, "sound.card", unit);
        hal_device_property_set_string (d, "sound.card_id", audiodev.name);
+       hal_device_property_set_string (d, "netbsd.sound.hardware", audiodev.config);
 
        parent_udi = hal_device_property_get_string (parent, "info.udi");
        if (parent_udi)
@@ -157,7 +158,7 @@
 devinfo_audio_mixer_add(HalDevice *parent, const char *devnode, char *devfs_path, char *device_type)
 {
        HalDevice *d = NULL;
-       char *device_file, *parent_udi, *card_id;
+       char *device_file, *parent_udi, *card_id, *device_id;
        int16_t unit;
 
        if (strstr (devnode, "oss_mixer_") != devnode)
@@ -175,6 +176,8 @@
        unit = hal_device_property_get_int (parent, "sound.card");
        hal_device_property_set_int (d, "oss.card", unit);
        hal_device_property_set_int (d, "oss.device", unit + 16);
+       device_id = hal_device_property_get_string (parent, "netbsd.sound.hardware");
+       hal_device_property_set_string (d, "oss.device_id", device_id);
        hal_device_property_set_string (d, "oss.type", "mixer");
 
        device_file = g_strdup_printf (_PATH_MIXER "%d", unit);
@@ -194,7 +197,7 @@
 devinfo_audio_dsp_add(HalDevice *parent, const char *devnode, char *devfs_path, char *device_type)
 {
        HalDevice *d = NULL;
-       char *device_file, *parent_udi, *card_id;
+       char *device_file, *parent_udi, *card_id, *device_id;
        int16_t unit;
 
        if (strstr (devnode, "oss_dsp_") != devnode)
@@ -212,7 +215,9 @@
        unit = hal_device_property_get_int (parent, "sound.card");
        hal_device_property_set_int (d, "oss.card", unit);
        hal_device_property_set_int (d, "oss.device", unit);
-       hal_device_property_set_string (d, "oss.type", "dsp");
+       device_id = hal_device_property_get_string (parent, "netbsd.sound.hardware");
+       hal_device_property_set_string (d, "oss.device_id", device_id);
+       hal_device_property_set_string (d, "oss.type", "pcm");
 
        device_file = g_strdup_printf (_PATH_SOUND "%d", unit);
        hal_device_property_set_string (d, "oss.device_file", device_file);