Hello community,
here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at 2014-10-22 16:23:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa-tools (Old)
and /work/SRC/openSUSE:Factory/.alsa-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa-tools/alsa-tools.changes 2014-10-07 16:01:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.alsa-tools.new/alsa-tools.changes 2014-10-22 16:23:05.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 17 12:00:33 CEST 2014 - tiwai@suse.de
+
+- Backport upstream patch for adding hdajacksensetest helper:
+ 0003-Add-a-small-hdajacksensetest-helper.patch
+- Add hdajacksensetest sub-package
+
+-------------------------------------------------------------------
New:
----
0003-Add-a-small-hdajacksensetest-helper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-tools.spec ++++++
--- /var/tmp/diff_new_pack.jneC1c/_old 2014-10-22 16:23:06.000000000 +0200
+++ /var/tmp/diff_new_pack.jneC1c/_new 2014-10-22 16:23:06.000000000 +0200
@@ -43,6 +43,7 @@
# upstream fixes
Patch1: 0001-ld10k1-Fix-missing-parentheses-for-functions.patch
Patch2: 0002-hdajackretask-Add-hints-functionality.patch
+Patch3: 0003-Add-a-small-hdajacksensetest-helper.patch
# build fixes
Patch100: alsa-tools-desktop-fix.dif
Patch101: alsa-tools-no_m4_dir.dif
@@ -272,6 +273,16 @@
%description -n hdajackretask
hdajackretask is a GUI tool to make it easy to retask HD-audio jacks.
+
+%package -n hdajacksensetest
+Version: 0.20141006
+Release: 0
+Summary: Tool to check HD-audio jack/pin status
+Group: Productivity/Multimedia/Sound/Utilities
+
+%description -n hdajacksensetest
+hdajacksensetest is a small program to check the current pin/jack status
+of the HD-audio codec.
%endif
%if %{have_fltk}
@@ -305,6 +316,7 @@
# upstream fixes
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# build fixes
%patch100 -p1
%patch101 -p1
@@ -323,7 +335,7 @@
%endif
%if %{have_gtk3}
-ALL_PACKS="$ALL_PACKS hdajackretask"
+ALL_PACKS="$ALL_PACKS hdajackretask hdajacksensetest"
%endif
%if %{have_fltk}
@@ -500,6 +512,10 @@
%{_bindir}/hdajackretask
%doc hdajackretask/AUTHORS
%doc hdajackretask/README
+
+%files -n hdajacksensetest
+%defattr(-, root, root)
+%{_bindir}/hdajacksensetest
%endif
%if %{have_fltk}
++++++ 0003-Add-a-small-hdajacksensetest-helper.patch ++++++
From 7a7d94a031b6b3c605c47de2779b0e03442a8d30 Mon Sep 17 00:00:00 2001
From: David Henningsson
Date: Mon, 6 Oct 2014 15:30:03 +0200
Subject: [PATCH] Add a small "hdajacksensetest" helper
I previously had a small python script doing the same thing,
but it depended on hda-analyzer, which always breaks when something
new is added to the codec proc file.
I got tired and rewrote it as a small C program instead, which I
hope will be a useful addition to alsa-tools.
Signed-off-by: David Henningsson
Signed-off-by: Takashi Iwai
---
Makefile | 2 +-
hdajacksensetest/Makefile.am | 12 +++
hdajacksensetest/configure.ac | 10 +++
hdajacksensetest/gitcompile | 13 ++++
hdajacksensetest/hdajacksensetest.c | 146 ++++++++++++++++++++++++++++++++++++
5 files changed, 182 insertions(+), 1 deletion(-)
create mode 100644 hdajacksensetest/Makefile.am
create mode 100644 hdajacksensetest/configure.ac
create mode 100755 hdajacksensetest/gitcompile
create mode 100644 hdajacksensetest/hdajacksensetest.c
diff --git a/Makefile b/Makefile
index b2da046a64ec..72f95e266d23 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ TOP = .
SUBDIRS = as10k1 envy24control hdsploader hdspconf hdspmixer \
mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
- hwmixvolume hdajackretask hda-verb
+ hwmixvolume hdajackretask hda-verb hdajacksensetest
all:
@for i in $(SUBDIRS); do \
diff --git a/hdajacksensetest/Makefile.am b/hdajacksensetest/Makefile.am
new file mode 100644
index 000000000000..795373c89a87
--- /dev/null
+++ b/hdajacksensetest/Makefile.am
@@ -0,0 +1,12 @@
+MYNAME = hdajacksensetest
+AUTOMAKE_OPTIONS = foreign
+bin_PROGRAMS = hdajacksensetest
+AM_CFLAGS = @GLIB_CFLAGS@ -I "../hdajackretask/" -I "../hda-verb/"
+hdajacksensetest_SOURCES = hdajacksensetest.c ../hdajackretask/sysfs-pin-configs.c
+hdajacksensetest_LDADD = @GLIB_LIBS@
+
+alsa-dist: distdir
+ @rm -rf ../distdir/$(MYNAME)
+ @mkdir -p ../distdir/$(MYNAME)
+ @cp -RLpv $(distdir)/* ../distdir/$(MYNAME)
+ @rm -rf $(distdir)
diff --git a/hdajacksensetest/configure.ac b/hdajacksensetest/configure.ac
new file mode 100644
index 000000000000..fa9ae8e366bf
--- /dev/null
+++ b/hdajacksensetest/configure.ac
@@ -0,0 +1,10 @@
+AC_INIT(hdajacksensetest, 0.20141006)
+AM_INIT_AUTOMAKE(subdir-objects)
+AM_MAINTAINER_MODE([enable])
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_HEADER_STDC
+
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+
+AC_OUTPUT(Makefile)
diff --git a/hdajacksensetest/gitcompile b/hdajacksensetest/gitcompile
new file mode 100755
index 000000000000..58328bd3a50e
--- /dev/null
+++ b/hdajacksensetest/gitcompile
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+aclocal $ACLOCAL_FLAGS || exit 1
+automake --foreign --add-missing || exit 1
+autoconf || exit 1
+export CFLAGS='-O2 -Wall -pipe -g'
+echo "CFLAGS=$CFLAGS"
+echo "./configure $@"
+./configure $@ || exit 1
+unset CFLAGS
+if [ -z "$GITCOMPILE_NO_MAKE" ]; then
+ make || exit 1
+fi
diff --git a/hdajacksensetest/hdajacksensetest.c b/hdajacksensetest/hdajacksensetest.c
new file mode 100644
index 000000000000..cb8d9cdd83dd
--- /dev/null
+++ b/hdajacksensetest/hdajacksensetest.c
@@ -0,0 +1,146 @@
+/*
+ * Checks the current pin/jack status of the codec
+ *
+ * Copyright (c) 2014 David Henningsson, Canonical Ltd.
+ * (With some minor pieces copy-pasted from hda-verb by Takashi Iwai)
+ *
+ * Licensed under GPL v2 or later.
+ */
+
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include "sysfs-pin-configs.h"
+
+#include
+#include
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+#include "hda_hwdep.h"
+
+gint card_index, codec_index;
+gboolean try_all_pins, set_pin_sense;
+
+static GOptionEntry arg_entries[] =
+{
+ { "card", 'c', 0, G_OPTION_ARG_INT, &card_index, "card index (as can be seen in /proc/asound/cards)", "X" },
+ { "codec", 'd', 0, G_OPTION_ARG_INT, &codec_index, "codec device index (as can be seen in /proc/asound/cardX/codecY)", "Y" },
+ { "allpins", 'a', 0, G_OPTION_ARG_NONE, &try_all_pins, "try all pins, even those who (probably) does not have a physical jack", NULL },
+ { "setpinsense", 's', 0, G_OPTION_ARG_NONE, &set_pin_sense, "execute 'Set pin sense' before the pin sense is measured", NULL },
+ { NULL }
+};
+
+static void parse_command_line(int argc, char **argv)
+{
+ GError *error = NULL;
+ GOptionContext *context = g_option_context_new("- check current jack/pin sense");
+ g_option_context_add_main_entries(context, arg_entries, NULL);
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ fprintf(stderr, "Option parsing failed: %s\n", error->message);
+ exit(1);
+ }
+ g_option_context_free(context);
+}
+
+
+static gboolean should_check_pin(pin_configs_t *pin)
+{
+ unsigned long defcfg = actual_pin_config(pin);
+ if (try_all_pins)
+ return TRUE;
+ if (get_port_conn(defcfg) != 0)
+ return FALSE; // Not a jack
+ if (defcfg & (1 << 8)) // Jack has NO_PRESENCE set
+ return FALSE;
+ return TRUE;
+}
+
+int fd;
+
+static void codec_open()
+{
+ char filename[64];
+ int version = 0;
+
+ snprintf(filename, 64, "/dev/snd/hwC%dD%d", card_index, codec_index);
+ fd = open(filename, O_RDWR);
+ if (fd < 0) {
+ if (errno == EACCES)
+ fprintf(stderr, "Permission error (hint: this program usually requires root)\n");
+ else
+ fprintf(stderr, "Ioctl call failed with error %d\n", errno);
+ exit(1);
+ }
+
+ if (ioctl(fd, HDA_IOCTL_PVERSION, &version) < 0) {
+ fprintf(stderr, "Ioctl call failed with error %d\n", errno);
+ fprintf(stderr, "Looks like an invalid hwdep device...\n");
+ close(fd);
+ exit(1);
+ }
+ if (version < HDA_HWDEP_VERSION) {
+ fprintf(stderr, "Invalid version number 0x%x\n", version);
+ fprintf(stderr, "Looks like an invalid hwdep device...\n");
+ close(fd);
+ exit(1);
+ }
+}
+
+static unsigned long codec_rw(int nid, int verb, int param)
+{
+ struct hda_verb_ioctl val;
+
+ val.verb = HDA_VERB(nid, verb, param);
+ if (ioctl(fd, HDA_IOCTL_VERB_WRITE, &val) < 0) {
+ fprintf(stderr, "Ioctl call failed with error %d\n", errno);
+ close(fd);
+ exit(1);
+ }
+ return val.res;
+}
+
+#define AC_VERB_GET_PIN_SENSE 0x0f09
+#define AC_VERB_SET_PIN_SENSE 0x709
+
+#define MAX_PINS 32
+
+pin_configs_t pin_configs[MAX_PINS];
+
+int main(int argc, char **argv)
+{
+ int pin_count, i;
+
+ parse_command_line(argc, argv);
+ pin_count = get_pin_configs_list(pin_configs, MAX_PINS, card_index, codec_index);
+ if (pin_count == 0) {
+ fprintf(stderr, "No pins found for card %d codec %d, did you pick the right one?\n", card_index, codec_index);
+ exit(1);
+ }
+
+ codec_open();
+
+ if (set_pin_sense) {
+ for (i = 0; i < pin_count; i++)
+ if (should_check_pin(&pin_configs[i])) {
+ codec_rw(pin_configs[i].nid, AC_VERB_SET_PIN_SENSE, 0);
+ }
+ sleep(1);
+ }
+
+ for (i = 0; i < pin_count; i++)
+ if (should_check_pin(&pin_configs[i])) {
+ gchar *desc = get_config_description(actual_pin_config(&pin_configs[i]));
+ unsigned long present = codec_rw(pin_configs[i].nid, AC_VERB_GET_PIN_SENSE, 0);
+ printf("Pin 0x%.2x (%s): present = %s\n", pin_configs[i].nid, desc, present & 0x80000000 ? "Yes" : "No");
+ g_free(desc);
+ }
+
+ close(fd);
+ return 0;
+}
--
2.1.2
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org