Advanced Linux Sound Architecture

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  da28a6e0bfe2e2199e19db7baf5c47a909c01014 (commit)
      from  cb0da292a78f2bb0afbede12c49140c983c3360b (commit)

- Log -----------------------------------------------------------------
commit da28a6e0bfe2e2199e19db7baf5c47a909c01014
Author:     Jaroslav Kysela <perex@...>
AuthorDate: Mon Mar 28 11:33:02 2011 +0200
Commit:     Jaroslav Kysela <perex@...>
CommitDate: Mon Mar 28 11:33:02 2011 +0200

    hda_analyzer: Add export function (button) to generate a python script
    
    Signed-off-by: Jaroslav Kysela <perex@...>

-----------------------------------------------------------------------

Diffstat:
 hda-analyzer/hda_analyzer.py |   65 ++++++++++-
 hda-analyzer/hda_codec.py    |  287 ++++++++++++++++++++++++++++++++++++------
 2 files changed, 310 insertions(+), 42 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/hda-analyzer/hda_analyzer.py b/hda-analyzer/hda_analyzer.py
index 5c78ca9..bc4285a 100755
--- a/hda-analyzer/hda_analyzer.py
+++ b/hda-analyzer/hda_analyzer.py
@@ -33,7 +33,7 @@ import gobject
 import gtk
 import pango
 
-from hda_codec import HDACodec, HDA_card_list, \
+from hda_codec import HDACodec, HDA_card_list, HDA_Exporter_pyscript, \
                       EAPDBTL_BITS, PIN_WIDGET_CONTROL_BITS, \
                       PIN_WIDGET_CONTROL_VREF, DIG1_BITS, GPIO_IDS, \
                       HDA_INPUT, HDA_OUTPUT
@@ -121,6 +121,16 @@ def read_nodes(proc_files):
       cnt += 1
   return cnt    
 
+def save_to_file(filename, txt, mode=None):
+  try:
+    fp = open(filename, "w+")
+    fp.write(txt)
+    fp.close()
+    if mode:
+      os.chmod(filename, 0755)
+  except:
+    print "Unable to save text to '%s'" % filename
+
 (
     TITLE_COLUMN,
     CARD_COLUMN,
@@ -168,6 +178,10 @@ class HDAAnalyzer(gtk.Window):
     button.connect("clicked", self.__diff_clicked)
     self.tooltips.set_tip(button, "Show settings diff for selected codec.")
     hbox1.pack_start(button)
+    button = gtk.Button("Exp")
+    button.connect("clicked", self.__export_clicked)
+    self.tooltips.set_tip(button, "Export settings differences for selected codec.\nGenerates a python script.")
+    hbox1.pack_start(button)
     button = gtk.Button("Graph")
     button.connect("clicked", self.__graph_clicked)
     self.tooltips.set_tip(button, "Show graph for selected codec.")
@@ -266,6 +280,55 @@ mailing list, too.
     dialog.run()
     dialog.destroy()
     
+  def __export_clicked(self, button):
+    if not self.codec:
+      self.simple_dialog(gtk.MESSAGE_WARNING, "Please, select a codec in left codec/node tree.")
+      return
+    exporter = HDA_Exporter_pyscript()
+    self.codec.export(exporter)
+    dialog = gtk.Dialog(exporter.title(), self,
+                        gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
+                        (gtk.STOCK_OK, gtk.RESPONSE_OK,
+                         gtk.STOCK_SAVE_AS, gtk.RESPONSE_YES))
+    text_view = gtk.TextView()
+    text_view.set_border_width(4)
+    fontName = get_fixed_font()
+    text_view.modify_font(fontName)
+    str = exporter.text(self.codec)
+    buffer = gtk.TextBuffer(None)
+    iter = buffer.get_iter_at_offset(0)
+    buffer.insert(iter, str[:-1])
+    text_view.set_buffer(buffer)
+    text_view.set_editable(False)
+    text_view.set_cursor_visible(False)
+    dialog.vbox.pack_start(text_view, False, False)
+    dialog.show_all()
+    r = dialog.run()
+    dialog.destroy()
+    if r == gtk.RESPONSE_YES:
+      sdialog = gtk.FileChooserDialog('Save %s as...' % exporter.stitle(),
+                    self, gtk.FILE_CHOOSER_ACTION_SAVE,
+                     (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                      gtk.STOCK_SAVE, gtk.RESPONSE_OK))
+      sdialog.set_default_response(gtk.RESPONSE_OK)
+
+      filter = gtk.FileFilter()
+      filter.set_name("Python Scripts")
+      filter.add_mime_type("text/x-python")
+      filter.add_mime_type("text/x-python-script")
+      filter.add_pattern("*.py")
+      sdialog.add_filter(filter)
+
+      filter = gtk.FileFilter()
+      filter.set_name("All files")
+      filter.add_pattern("*")
+      sdialog.add_filter(filter)
+
+      sr = sdialog.run()
+      if sr == gtk.RESPONSE_OK:
+        save_to_file(sdialog.get_filename(), str, 0755)
+      sdialog.destroy()
+    
   def __graph_clicked(self, button):
     if not self.codec:
       self.simple_dialog(gtk.MESSAGE_WARNING, "Please, select a codec in left codec/node tree.")
diff --git a/hda-analyzer/hda_codec.py b/hda-analyzer/hda_codec.py
index 1036a56..eb36cdc 100644
--- a/hda-analyzer/hda_codec.py
+++ b/hda-analyzer/hda_codec.py
@@ -366,6 +366,15 @@ class HDAAmpVal:
     for idx in range(len(self.vals)):
       self.__write_val(idx)
 
+  def export(self):
+    vals = self.vals[:]
+    self.codec.export_start(True)
+    self.revert()
+    self.codec.export_end()
+    self.vals = vals
+    for idx in range(len(self.vals)):
+      self.__write_val(idx)    
+
   def get_val(self, idx):
     if self.stereo:
       return [self.vals[idx*2], self.vals[idx*2+1]]
@@ -446,6 +455,9 @@ class HDANode:
     self.origin_pinctls = None
     self.origin_vol_knb = None
     self.origin_sdi_select = None
+
+    self.disable_reread = False
+
     self.reread()
     
   def wtype_name(self):
@@ -468,8 +480,24 @@ class HDANode:
     if self.active_connection != None:
       changed = self.active_connection != val 
       self.codec.rw(self.nid, VERBS['SET_CONNECT_SEL'], val)
-      self.active_connection = self.codec.rw(self.nid, VERBS['GET_CONNECT_SEL'], 0)
+      if not self.disable_reread:
+        self.active_connection = self.codec.rw(self.nid, VERBS['GET_CONNECT_SEL'], 0)
+      else:
+        self.active_connection = val
     return changed
+
+  def reread_pwr(self, value=None):
+      if value is None:
+        pwr = self.codec.rw(self.nid, VERBS['GET_POWER_STATE'], 0)
+      else:
+        pwr = value
+      self.pwr = pwr
+      if self.origin_pwr is None:
+        self.origin_pwr = pwr
+      self.pwr_setting = pwr & 0x0f
+      self.pwr_actual = (pwr >> 4) & 0x0f
+      self.pwr_setting_name = self.pwr_setting < 4 and POWER_STATES[self.pwr_setting] or "UNKNOWN"
+      self.pwr_actual_name = self.pwr_actual < 4 and POWER_STATES[self.pwr_actual] or "UNKNOWN"
     
   def reread(self):
   
@@ -590,28 +618,24 @@ class HDANode:
       for a in range(len(POWER_STATES)):
         if pwr & (1 << a):
           self.pwr_states.append(POWER_STATES[a])
-      pwr = self.codec.rw(self.nid, VERBS['GET_POWER_STATE'], 0)
-      self.pwr = pwr
-      if self.origin_pwr == None:
-        self.origin_pwr = pwr
-      self.pwr_setting = pwr & 0x0f
-      self.pwr_actual = (pwr >> 4) & 0x0f
-      self.pwr_setting_name = self.pwr_setting < 4 and POWER_STATES[self.pwr_setting] or "UNKNOWN"
-      self.pwr_actual_name = self.pwr_actual < 4 and POWER_STATES[self.pwr_actual] or "UNKNOWN"
+      self.reread_pwr()
     # NID 0x20 == Realtek Define Registers
     if self.codec.vendor_id == 0x10ec and self.nid == 0x20:
       self.realtek_coeff_proc = self.codec.rw(self.nid, VERBS['GET_PROC_COEF'], 0)
       self.realtek_coeff_index = self.codec.rw(self.nid, VERBS['GET_COEF_INDEX'], 0)
 
-  def reread_eapdbtl(self):
+  def reread_eapdbtl(self, value=None):
     self.pincap_eapdbtl = []
     self.pincap_eapdbtls = 0
     if not 'EAPD' in self.pincap:
       return
-    val = self.codec.rw(self.nid, VERBS['GET_EAPD_BTLENABLE'], 0)
+    if value is None:
+      val = self.codec.rw(self.nid, VERBS['GET_EAPD_BTLENABLE'], 0)
+    else:
+      val = value
     self.pincap_eapdbtls = val
-    if self.origin_pincap_eapdbtls == None:
-     self.origin_pincap_eapdbtls = val
+    if self.origin_pincap_eapdbtls is None:
+      self.origin_pincap_eapdbtls = val
     for name in EAPDBTL_BITS:
       bit = EAPDBTL_BITS[name]
       if val & (1 << bit): self.pincap_eapdbtl.append(name)
@@ -628,10 +652,13 @@ class HDANode:
     self.reread_eapdbtl()
     return changed
 
-  def reread_pin_widget_control(self):
-    pinctls = self.codec.rw(self.nid, VERBS['GET_PIN_WIDGET_CONTROL'], 0)
+  def reread_pin_widget_control(self, value=None):
+    if value is None:
+      pinctls = self.codec.rw(self.nid, VERBS['GET_PIN_WIDGET_CONTROL'], 0)
+    else:
+      pinctls = value
     self.pinctls = pinctls
-    if self.origin_pinctls == None:
+    if self.origin_pinctls is None:
       self.origin_pinctls = pinctls
     self.pinctl = []
     for name in PIN_WIDGET_CONTROL_BITS:
@@ -659,10 +686,13 @@ class HDANode:
     self.reread_pin_widget_control()
     return changed
 
-  def reread_vol_knb(self):
-    cap = self.codec.rw(self.nid, VERBS['GET_VOLUME_KNOB_CONTROL'], 0)
+  def reread_vol_knb(self, value=None):
+    if value is None:
+      cap = self.codec.rw(self.nid, VERBS['GET_VOLUME_KNOB_CONTROL'], 0)
+    else:
+      cap = value
     self.vol_knb = cap
-    if self.origin_vol_knb == None:
+    if self.origin_vol_knb is None:
       self.origin_vol_knb = cap
     self.vol_knb_direct = (cap >> 7) & 1
     self.vol_knb_val = cap & 0x7f
@@ -683,12 +713,15 @@ class HDANode:
     self.reread_vol_knb()
     return changed
 
-  def reread_sdi_select(self):
+  def reread_sdi_select(self, value=None):
     self.sdi_select = None
     if self.wtype_id == 'AUD_IN' and self.aud_channel == 0:
-      sdi = self.codec.rw(self.nid, VERBS['GET_SDI_SELECT'], 0)
+      if value is None:
+        sdi = self.codec.rw(self.nid, VERBS['GET_SDI_SELECT'], 0)
+      else:
+        sdi = value
       self.sdi_select = sdi & 0x0f
-      if self.origin_sdi_select == None:
+      if self.origin_sdi_select is None:
         self.origin_sdi_select = sdi
 
   def sdi_select_set_value(self, value):
@@ -700,14 +733,17 @@ class HDANode:
       self.reread_sdi_select()
     return changed
 
-  def reread_dig1(self):
+  def reread_dig1(self, value=None):
     self.dig1 = []
     self.dig1_category = None
     if not self.digital:
       return
-    digi1 = self.codec.rw(self.nid, VERBS['GET_DIGI_CONVERT_1'], 0)
+    if value is None:
+      digi1 = self.codec.rw(self.nid, VERBS['GET_DIGI_CONVERT_1'], 0)
+    else:
+      digi1 = value
     self.digi1 = digi1
-    if self.origin_digi1 == None:
+    if self.origin_digi1 is None:
       self.origin_digi1 = digi1
     for name in DIG1_BITS:
       bit = DIG1_BITS[name]
@@ -732,25 +768,78 @@ class HDANode:
     self.reread_dig1()
     return changed
 
-  def revert(self):
-    if self.origin_active_connection != None:
+  def revert(self, export=False):
+    if not self.origin_active_connection is None:
       self.set_active_connection(self.origin_active_connection)
-    if self.origin_pwr != None:
+    if not self.origin_pwr is None:
       self.codec.rw(self.nid, VERBS['SET_POWER_STATE'], self.origin_pwr)
-    if self.in_amp:
-      self.amp_vals_in.revert()
-    if self.out_amp:
-      self.amp_vals_out.revert()
-    if self.origin_pincap_eapdbtls != None:
+      self.reread_pwr(self.origin_pwr)
+    if not self.origin_pinctls is None:
+      self.codec.rw(self.nid, VERBS['SET_PIN_WIDGET_CONTROL'], self.origin_pinctls)
+      self.reread_pin_widget_control(self.origin_pinctls)
+    if not export:
+      if self.in_amp:
+        self.amp_vals_in.revert()
+      if self.out_amp:
+        self.amp_vals_out.revert()
+    if not self.origin_pincap_eapdbtls is None:
       self.codec.rw(self.nid, VERBS['SET_EAPD_BTLENABLE'], self.origin_pincap_eapdbtls)
-    if self.origin_vol_knb != None:
+      self.reread_eapdbtl(self.origin_pincap_eapdbtls)
+    if not self.origin_vol_knb is None:
       self.codec.rw(self.nid, VERBS['SET_VOLUME_KNOB_CONTROL'], self.origin_vol_knb)
-    if self.origin_sdi_select != None:
+      self.set_vol_knb(self.origin_vol_knb)
+    if not self.origin_sdi_select is None:
       self.codec.rw(self.nid, VERBS['SET_SDI_SELECT'], self.origin_sdi_select)
-    if self.origin_digi1 != None:
+      self.reread_sdi_select(self.origin_sdi_select)
+    if not self.origin_digi1 is None:
       self.codec.rw(self.nid, VERBS['SET_DIGI_CONVERT_1'], self.origin_digi1 & 0xff)
       self.codec.rw(self.nid, VERBS['SET_DIGI_CONVERT_2'], (self.origin_digi1 >> 8) & 0xff)
-    self.reread()
+      self.reread_dig1(self.origin_digi1)
+
+  def export(self):
+    
+    def getit(cur, orig):
+      if orig is None:
+        return None
+      return getattr(self, cur)
+  
+    self.disable_reread = True
+    active_connection = getit('active_connection', self.origin_active_connection)
+    pwr = getit('pwr', self.origin_pwr)
+    pinctls = getit('pinctls', self.origin_pinctls)
+    pincap_eapdbtls = getit('pincap_eapdbtls', self.origin_pincap_eapdbtls)
+    vol_knb = getit('vol_knb', self.origin_vol_knb)
+    sdi_select = getit('sdi_select', self.origin_sdi_select)
+    digi1 = getit('digi1', self.origin_digi1)
+    self.codec.export_start(True)
+    self.revert(export=True)
+    self.codec.export_end()
+    if not self.origin_active_connection is None:
+      self.set_active_connection(active_connection)
+    if not self.origin_pwr is None:
+      self.codec.rw(self.nid, VERBS['SET_POWER_STATE'], pwr)
+      self.reread_pwr(pwr)
+    if not self.origin_pinctls is None:
+      self.codec.rw(self.nid, VERBS['SET_PIN_WIDGET_CONTROL'], pinctls)
+      self.reread_pin_widget_control(pinctls)
+    if self.in_amp:
+      self.amp_vals_in.export()
+    if self.out_amp:
+      self.amp_vals_out.export()
+    if not self.origin_pincap_eapdbtls is None:
+      self.codec.rw(self.nid, VERBS['SET_EAPD_BTLENABLE'], pincap_eapdbtls)
+      self.reread_eapdbtl(pincap_eapdbtls)
+    if not self.origin_vol_knb is None:
+      self.codec.rw(self.nid, VERBS['SET_VOLUME_KNOB_CONTROL'], vol_knb)
+      self.set_vol_knb(vol_knb)
+    if not self.origin_sdi_select is None:
+      self.codec.rw(self.nid, VERBS['SET_SDI_SELECT'], sdi_select)
+      self.reread_sdi_select(sdi_select)
+    if not self.origin_digi1 is None:
+      self.codec.rw(self.nid, VERBS['SET_DIGI_CONVERT_1'], digi1 & 0xff)
+      self.codec.rw(self.nid, VERBS['SET_DIGI_CONVERT_2'], (digi1 >> 8) & 0xff)
+      self.reread_dig1(digi1)    
+    self.disable_reread = False
 
   def get_device(self):
     return self.codec.get_device(self.nid)
@@ -827,6 +916,7 @@ class HDAGPIO:
     self.codec = codec
     self.nid = nid
     self.originval = None
+    self.disable_reread = False
     self.reread()
 
   def reread(self):
@@ -844,7 +934,8 @@ class HDAGPIO:
 
   def write(self, name):
     self.codec.rw(self.nid, GPIO_IDS[name][1], self.val[name])
-    self.read(name)
+    if not self.disable_reread:
+      self.read(name)
 
   def set(self, name, bit, val):
     old = self.test(name, bit)
@@ -862,6 +953,17 @@ class HDAGPIO:
       self.val[i] = self.originval[i]
       self.write(i)
 
+  def export(self):
+    self.disable_reread = True
+    vals = self.val.copy()
+    self.codec.export_start(True)
+    self.revert()
+    self.codec.export_end()
+    self.val = vals
+    for i in GPIO_IDS:
+      self.write(i)
+    self.disable_reread = False
+  
 class HDACard:
 
   def __init__(self, card, ctl_fd=None):
@@ -895,6 +997,8 @@ class HDACodec:
     self.fd = None
     self.hwaccess = True
     ctl_fd = None
+    self.exporter = None
+    self.exporta = []
     if type(1) == type(card):
       self.device = device
       self.card = card
@@ -926,9 +1030,12 @@ class HDACodec:
 
   def rw(self, nid, verb, param):
     """do elementary read/write operation"""
-    verb = (nid << 24) | (verb << 8) | param
-    res = ioctl(self.fd, IOCTL_VERB_WRITE, struct.pack('II', verb, 0))
-    return struct.unpack('II', res)[1]
+    if not self.exporter:
+      verb = (nid << 24) | (verb << 8) | param
+      res = ioctl(self.fd, IOCTL_VERB_WRITE, struct.pack('II', verb, 0))
+      return struct.unpack('II', res)[1]
+    else:
+      return self.exporter.rw(self.exporta and self.exporta[-1] or False, nid, verb, param)
     
   def get_wcap(self, nid):
     """get cached widget capabilities"""
@@ -990,6 +1097,20 @@ class HDACodec:
     for nid in self.nodes:
       self.nodes[nid].revert()
 
+  def export_start(self, mode):
+    self.exporta.append(mode)
+
+  def export_end(self):
+    self.exporta.pop()
+
+  def export(self, exporter):
+    self.exporter = exporter
+    if not self.gpio is None:
+      self.gpio.export()
+    for nid in self.nodes:
+      self.nodes[nid].export()
+    self.exporter = None
+
   def get_node(self, nid):
     if nid == self.afg:
       return HDARootNode(self, "Audio Root Node")
@@ -1616,6 +1737,90 @@ class HDACodec:
       print "****"
     return res
 
+class HDA_Exporter_pyscript:
+
+  def __init__(self):
+    self.old_verbs = {}
+    self.new_verbs = {}
+
+  def title(self):
+    return 'Export to Python Script'
+
+  def stitle(self):
+    return "pyscript"
+    
+  def rw(self, old, nid, verb, param):
+    if verb & 0x0800:
+      raise ValueError, "read: nid=0x%x, verb=0x%x, param=0x%x" % (nid, verb, param)
+    #print "old = 0x%x, nid = 0x%x, verb = 0x%x, param = 0x%x" % (old, nid, verb, param)
+    verb |= param >> 8
+    if old:
+      if not nid in self.old_verbs:
+        self.old_verbs[nid] = {}
+      self.old_verbs[nid][verb] = param
+    else:
+      if not nid in self.new_verbs:
+        self.new_verbs[nid] = {}
+      self.new_verbs[nid][verb] = param
+
+  def text(self, codec):
+    text = ''
+    nids = self.new_verbs.keys()[:]
+    for nid in nids:
+      for verb in self.new_verbs[nid]:
+        old = self.old_verbs[nid][verb]
+        new = self.new_verbs[nid][verb]
+        if old != new:
+          verb1 = verb & ~(new >> 8)
+          pack = (nid << 24) | (verb << 8) | new
+          for k, v in VERBS.items():
+            if v == verb1:
+              txt = k
+              break
+          s1 = new < 256 and ("  0x%02x" % new) or ("0x%04x" % new)
+          text += "set(0x%02x, 0x%03x, %s) # 0x%08x (%s)\n" % (nid, verb1, s1, pack, txt)
+    if not text:
+      text = '# no change'
+    else:
+      text = """\
+#!/usr/bin/env python
+
+import os
+import struct
+from fcntl import ioctl
+
+def __ioctl_val(val):
+  # workaround for OverFlow bug in python 2.4
+  if val & 0x80000000:
+    return -((val^0xffffffff)+1)
+  return val
+
+IOCTL_INFO = __ioctl_val(0x80dc4801)
+IOCTL_PVERSION = __ioctl_val(0x80044810)
+IOCTL_VERB_WRITE = __ioctl_val(0xc0084811)
+
+def set(nid, verb, param):
+  verb = (nid << 24) | (verb << 8) | param
+  res = ioctl(FD, IOCTL_VERB_WRITE, struct.pack('II', verb, 0))  
+
+FD = os.open("%s", os.O_RDONLY)
+info = struct.pack('Ii64s80si64s', 0, 0, '', '', 0, '')
+res = ioctl(FD, IOCTL_INFO, info)
+name = struct.unpack('Ii64s80si64s', res)[3]
+if not name.startswith('HDA Codec'):
+  raise IOError, "unknown HDA hwdep interface"
+res = ioctl(FD, IOCTL_PVERSION, struct.pack('I', 0))
+version = struct.unpack('I', res)
+if version < 0x00010000:	# 1.0.0
+  raise IOError, "unknown HDA hwdep version"
+
+# initialization sequence starts here...
+
+%s
+os.close(FD)
+""" % ("/dev/snd/hwC%sD%s" % (codec.card, codec.device), text)
+    return text
+
 def HDA_card_list():
   from dircache import listdir
   result = []
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  cb0da292a78f2bb0afbede12c49140c983c3360b \
  da28a6e0bfe2e2199e19db7baf5c47a909c01014

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  af0bf78505be9473c7ce276f91942a5d8f1ad41c (commit)
      from  5a6ca47cb95ef2b79b3ef5631c45704ddb869385 (commit)

- Log -----------------------------------------------------------------
commit af0bf78505be9473c7ce276f91942a5d8f1ad41c
Author:     David Henningsson <david.henningsson@...>
AuthorDate: Wed Oct 12 19:37:57 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Wed Oct 12 20:14:13 2011 +0200

    aplay: Fix spelling error
    
    BugLink: https://bugs.launchpad.net/bugs/816388
    Reported-by: Chad Dunlap <cldunlap1@...>
    Signed-off-by: David Henningsson <david.henningsson@...>
    Signed-off-by: Clemens Ladisch <clemens@...>

-----------------------------------------------------------------------

Diffstat:
 aplay/aplay.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/aplay/aplay.c b/aplay/aplay.c
index 07e6bc0..5ab63a9 100644
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -209,7 +209,7 @@ _("Usage: %s [OPTION]... [FILE]...\n"
 "    --disable-format    disable automatic format conversions\n"
 "    --disable-softvol   disable software volume control (softvol)\n"
 "    --test-position     test ring buffer position\n"
-"    --test-coef=#	 test coeficient for ring buffer position (default 8)\n"
+"    --test-coef=#       test coefficient for ring buffer position (default 8)\n"
 "                        expression for validation is: coef * (buffer_size / 2)\n"
 "    --test-nowait       do not wait for ring buffer - eats whole CPU\n"
 "    --max-file-time=#   start another output file when the old file has recorded\n"
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  5a6ca47cb95ef2b79b3ef5631c45704ddb869385 \
  af0bf78505be9473c7ce276f91942a5d8f1ad41c

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  5a6ca47cb95ef2b79b3ef5631c45704ddb869385 (commit)
      from  e80b015689ce7a632c8cf57a29bd703eef4edbbc (commit)

- Log -----------------------------------------------------------------
commit 5a6ca47cb95ef2b79b3ef5631c45704ddb869385
Author:     Clemens Ladisch <clemens@...>
AuthorDate: Fri Oct 7 23:16:35 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Fri Oct 7 23:40:08 2011 +0200

    alsactl: add support for recreating enumerated user controls
    
    Signed-off-by: Clemens Ladisch <clemens@...>

-----------------------------------------------------------------------

Diffstat:
 alsactl/state.c |   77 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 configure.in    |    4 ++-
 2 files changed, 72 insertions(+), 9 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/alsactl/state.c b/alsactl/state.c
index 7422deb..a8b5bd3 100644
--- a/alsactl/state.c
+++ b/alsactl/state.c
@@ -847,6 +847,49 @@ static int get_comment_range(snd_config_t *n, int ctype,
 	return 0;
 }
 
+struct string_array {
+	unsigned int count;
+	const char **strings;
+};
+
+static int get_comment_items(snd_config_t *n, struct string_array *items)
+{
+	snd_config_iterator_t it, next;
+	unsigned int i;
+	int err;
+
+	snd_config_for_each(it, next, n) {
+		snd_config_t *item = snd_config_iterator_entry(it);
+		const char *id;
+		unsigned int numid;
+
+		if (snd_config_get_id(item, &id) < 0)
+			return -EINVAL;
+		numid = atoi(id);
+		if (numid > 999999)
+			return -EINVAL;
+
+		if (numid >= items->count) {
+			const char **strings = realloc(items->strings, (numid + 1) * sizeof(char *));
+			if (!strings)
+				return -ENOMEM;
+			for (i = items->count; i < numid + 1; ++i)
+				strings[i] = NULL;
+			items->count = numid + 1;
+			items->strings = strings;
+		}
+		err = snd_config_get_string(item, &items->strings[numid]);
+		if (err < 0)
+			return err;
+	}
+
+	for (i = 0; i < items->count; ++i)
+		if (!items->strings[i])
+			return -EINVAL;
+
+	return 0;
+}
+
 static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_config_t *conf)
 {
 	snd_ctl_elem_id_t *id;
@@ -854,12 +897,15 @@ static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_co
 	long imin, imax, istep;
 	snd_ctl_elem_type_t ctype;
 	unsigned int count;
+	struct string_array enum_items;
 	int err;
 	unsigned int *tlv;
 
 	imin = imax = istep = 0;
 	count = 0;
 	ctype = SND_CTL_ELEM_TYPE_NONE;
+	enum_items.count = 0;
+	enum_items.strings = NULL;
 	tlv = NULL;
 	snd_config_for_each(i, next, conf) {
 		snd_config_t *n = snd_config_iterator_entry(i);
@@ -869,31 +915,39 @@ static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_co
 		if (strcmp(id, "type") == 0) {
 			err = get_comment_type(n);
 			if (err < 0)
-				return err;
+				goto error;
 			ctype = err;
 			continue;
 		}
 		if (strcmp(id, "range") == 0) {
 			err = get_comment_range(n, ctype, &imin, &imax, &istep);
 			if (err < 0)
-				return err;
+				goto error;
 			continue;
 		}
 		if (strcmp(id, "count") == 0) {
 			long v;
 			if ((err = snd_config_get_integer(n, &v)) < 0)
-				return err;
+				goto error;
 			count = v;
 			continue;
 		}
+		if (strcmp(id, "item") == 0) {
+			err = get_comment_items(n, &enum_items);
+			if (err < 0)
+				goto error;
+			continue;
+		}
 		if (strcmp(id, "tlv") == 0) {
 			const char *s;
 			if ((err = snd_config_get_string(n, &s)) < 0)
-				return -EINVAL;
+				goto error;
 			if (tlv)
 				free(tlv);
-			if ((tlv = str_to_tlv(s)) == NULL)
-				return -EINVAL;
+			if ((tlv = str_to_tlv(s)) == NULL) {
+				err = -EINVAL;
+				goto error;
+			}
 			continue;
 		}
 	}
@@ -904,8 +958,10 @@ static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_co
 		count = 1;
 	switch (ctype) {
 	case SND_CTL_ELEM_TYPE_INTEGER:
-		if (imin > imax || istep > imax - imin)
-			return -EINVAL;
+		if (imin > imax || istep > imax - imin) {
+			err = -EINVAL;
+			goto error;
+		}
 		err = snd_ctl_elem_add_integer(handle, id, count, imin, imax, istep);
 		if (err < 0)
 			goto error;
@@ -915,6 +971,10 @@ static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_co
 	case SND_CTL_ELEM_TYPE_BOOLEAN:
 		err = snd_ctl_elem_add_boolean(handle, id, count);
 		break;
+	case SND_CTL_ELEM_TYPE_ENUMERATED:
+		err = snd_ctl_elem_add_enumerated(handle, id, count,
+						  enum_items.count, enum_items.strings);
+		break;
 	case SND_CTL_ELEM_TYPE_IEC958:
 		err = snd_ctl_elem_add_iec958(handle, id);
 		break;
@@ -925,6 +985,7 @@ static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_co
 
  error:
 	free(tlv);
+	free(enum_items.strings);
 	if (err < 0)
 		return err;
 	return snd_ctl_elem_info(handle, info);
diff --git a/configure.in b/configure.in
index b28af80..f72da63 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,9 @@ AC_PROG_INSTALL
 AC_PROG_MKDIR_P
 AC_PROG_LN_S
 AC_PROG_SED
-AM_PATH_ALSA(1.0.16)
+AM_PATH_ALSA(1.0.24)
+AC_CHECK_FUNC([snd_ctl_elem_add_enumerated],
+	      , [AC_ERROR([No user enum control support in alsa-lib])])
 
 dnl Check components
 AC_CHECK_HEADERS([alsa/pcm.h], [have_pcm="yes"], [have_pcm="no"],
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  e80b015689ce7a632c8cf57a29bd703eef4edbbc \
  5a6ca47cb95ef2b79b3ef5631c45704ddb869385

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  15c6f832968c1f69a7c744f7051e4fc622acd62f (commit)
      from  567cc19a883f9799737bc03881589ae3f331273f (commit)

- Log -----------------------------------------------------------------
commit 15c6f832968c1f69a7c744f7051e4fc622acd62f
Author:     Clemens Ladisch <clemens@...>
AuthorDate: Fri Oct 7 22:46:51 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Fri Oct 7 23:38:55 2011 +0200

    control: add snd_ctl_elem_add_enumerated()
    
    Handling of user control elements was implemented for all types except
    BYTES and ENUMERATED.  Enumerated user controls will be needed for the
    device-specific mixers of upcoming FireWire drivers.
    
    Signed-off-by: Clemens Ladisch <clemens@...>

-----------------------------------------------------------------------

Diffstat:
 include/control.h        |    1 +
 include/sound/asound.h   |    6 ++-
 src/control/control.c    |   69 ++++++++++++++++++++++++++++++++++++++++++++++
 src/control/control_hw.c |   10 ++++++
 4 files changed, 84 insertions(+), 2 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/include/control.h b/include/control.h
index f265e34..488629d 100644
--- a/include/control.h
+++ b/include/control.h
@@ -418,6 +418,7 @@ void snd_ctl_elem_info_set_index(snd_ctl_elem_info_t *obj, unsigned int val);
 int snd_ctl_elem_add_integer(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int count, long imin, long imax, long istep);
 int snd_ctl_elem_add_integer64(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int count, long long imin, long long imax, long long istep);
 int snd_ctl_elem_add_boolean(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int count);
+int snd_ctl_elem_add_enumerated(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id, unsigned int count, unsigned int items, const char *const names[]);
 int snd_ctl_elem_add_iec958(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id);
 int snd_ctl_elem_remove(snd_ctl_t *ctl, snd_ctl_elem_id_t *id);
 
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 5dddd87..07c03fa 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -26,10 +26,10 @@
 #if defined(LINUX) || defined(__LINUX__) || defined(__linux__)
 
 #include <linux/ioctl.h>
+#include <linux/types.h>
 
 #ifdef __KERNEL__
 
-#include <linux/types.h>
 #include <linux/time.h>
 #include <asm/byteorder.h>
 
@@ -734,7 +734,7 @@ struct sndrv_timer_tread {
  *                                                                          *
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)
+#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 7)
 
 struct sndrv_ctl_card_info {
 	int card;			/* card number */
@@ -833,6 +833,8 @@ struct sndrv_ctl_elem_info {
 			unsigned int items;	/* R: number of items */
 			unsigned int item;	/* W: item number */
 			char name[64];		/* R: value name */
+			__u64 names_ptr;	/* W: names list (ELEM_ADD only) */
+			unsigned int names_length;
 		} enumerated;
 		unsigned char reserved[128];
 	} value;
diff --git a/src/control/control.c b/src/control/control.c
index cd17c6f..a0965c6 100644
--- a/src/control/control.c
+++ b/src/control/control.c
@@ -42,6 +42,7 @@ and IEC958 structure.
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <string.h>
@@ -359,6 +360,74 @@ int snd_ctl_elem_add_boolean(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id,
 }
 
 /**
+ * \brief Create and add a user-defined control element of type enumerated.
+ * \param[in] ctl Control device handle.
+ * \param[in] id ID of the new control element.
+ * \param[in] count Number of element values.
+ * \param[in] items Range of possible values (0 ... \a items - 1).
+ * \param[in] names An array containing \a items strings.
+ * \return Zero on success, otherwise a negative error code.
+ *
+ * This function creates a user element, i.e., a control element that is not
+ * controlled by the control device's driver but that is just stored together
+ * with the other elements of \a ctl.
+ *
+ * The fields of \a id, except numid, must be set to unique values that
+ * identify the new element.
+ *
+ * The new element is locked; its value is initialized as zero.
+ *
+ * \par Errors:
+ * <dl>
+ * <dt>-EBUSY<dd>A control element with ID \a id already exists.
+ * <dt>-EINVAL<dd>\a count is not at least one or greater than 128, or \a items
+ * 	is not at least one, or a string in \a names is empty or longer than 63
+ * 	bytes, or the strings in \a names require more than 64 KB storage.
+ * <dt>-ENOMEM<dd>Out of memory, or there are too many user control elements.
+ * <dt>-ENXIO<dd>This driver does not support (enumerated) user controls.
+ * <dt>-ENODEV<dd>Device unplugged.
+ * </dl>
+ *
+ * \par Compatibility:
+ * snd_ctl_elem_add_enumerated() was introduced in ALSA 1.0.25.
+ */
+int snd_ctl_elem_add_enumerated(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id,
+				unsigned int count, unsigned int items,
+				const char *const names[])
+{
+	snd_ctl_elem_info_t *info;
+	unsigned int i, bytes;
+	char *buf, *p;
+	int err;
+
+	assert(ctl && id && id->name[0] && names);
+
+	snd_ctl_elem_info_alloca(&info);
+	info->id = *id;
+	info->type = SND_CTL_ELEM_TYPE_ENUMERATED;
+	info->count = count;
+	info->value.enumerated.items = items;
+
+	bytes = 0;
+	for (i = 0; i < items; ++i)
+		bytes += strlen(names[i]) + 1;
+	buf = malloc(bytes);
+	if (!buf)
+		return -ENOMEM;
+	info->value.enumerated.names_ptr = (uintptr_t)buf;
+	info->value.enumerated.names_length = bytes;
+	p = buf;
+	for (i = 0; i < items; ++i)
+		p = stpcpy(p, names[i]) + 1;
+
+	err = ctl->ops->element_add(ctl, info);
+
+	free(buf);
+
+	return err;
+}
+
+/**
  * \brief Create and add an user IEC958 CTL element
  * \param ctl CTL handle
  * \param id CTL element info to add
diff --git a/src/control/control_hw.c b/src/control/control_hw.c
index 16c4987..1920c99 100644
--- a/src/control/control_hw.c
+++ b/src/control/control_hw.c
@@ -148,6 +148,11 @@ static int snd_ctl_hw_elem_info(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
 static int snd_ctl_hw_elem_add(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
 {
 	snd_ctl_hw_t *hw = handle->private_data;
+
+	if (info->type == SNDRV_CTL_ELEM_TYPE_ENUMERATED &&
+	    hw->protocol < SNDRV_PROTOCOL_VERSION(2, 0, 7))
+		return -ENXIO;
+
 	if (ioctl(hw->fd, SNDRV_CTL_IOCTL_ELEM_ADD, info) < 0)
 		return -errno;
 	return 0;
@@ -156,6 +161,11 @@ static int snd_ctl_hw_elem_add(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
 static int snd_ctl_hw_elem_replace(snd_ctl_t *handle, snd_ctl_elem_info_t *info)
 {
 	snd_ctl_hw_t *hw = handle->private_data;
+
+	if (info->type == SNDRV_CTL_ELEM_TYPE_ENUMERATED &&
+	    hw->protocol < SNDRV_PROTOCOL_VERSION(2, 0, 7))
+		return -ENXIO;
+
 	if (ioctl(hw->fd, SNDRV_CTL_IOCTL_ELEM_REPLACE, info) < 0)
 		return -errno;
 	return 0;
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  567cc19a883f9799737bc03881589ae3f331273f \
  15c6f832968c1f69a7c744f7051e4fc622acd62f

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  e6fe5aef5693962850742f450067da64da3bbc13 (commit)
      from  c035877c260e3755b7416c425fd69e4e888b034b (commit)

- Log -----------------------------------------------------------------
commit e6fe5aef5693962850742f450067da64da3bbc13
Author:     Clemens Ladisch <clemens@...>
AuthorDate: Fri Oct 7 22:38:59 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Fri Oct 7 23:36:20 2011 +0200

    ALSA: control: add support for ENUMERATED user space controls
    
    Handling of user control elements was implemented for all types except
    ENUMERATED.  This type will be needed for the device-specific mixers of
    upcoming FireWire drivers.
    
    Signed-off-by: Clemens Ladisch <clemens@...>

-----------------------------------------------------------------------

Diffstat:
 include/sound/asound.h      |    4 ++-
 sound/core/control.c        |   80 ++++++++++++++++++++++++++++++++++++++++--
 sound/core/control_compat.c |    4 ++
 3 files changed, 83 insertions(+), 5 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 5d6074f..a2e4ff5 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -706,7 +706,7 @@ struct snd_timer_tread {
  *                                                                          *
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)
+#define SNDRV_CTL_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 7)
 
 struct snd_ctl_card_info {
 	int card;			/* card number */
@@ -803,6 +803,8 @@ struct snd_ctl_elem_info {
 			unsigned int items;	/* R: number of items */
 			unsigned int item;	/* W: item number */
 			char name[64];		/* R: value name */
+			__u64 names_ptr;	/* W: names list (ELEM_ADD only) */
+			unsigned int names_length;
 		} enumerated;
 		unsigned char reserved[128];
 	} value;
diff --git a/sound/core/control.c b/sound/core/control.c
index f8c5be4..471d836 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -989,7 +989,6 @@ struct user_element {
 	void *tlv_data;			/* TLV data */
 	unsigned long tlv_data_size;	/* TLV data size */
 	void *priv_data;		/* private data (like strings for enumerated type) */
-	unsigned long priv_data_size;	/* size of private data in bytes */
 };
 
 static int snd_ctl_elem_user_info(struct snd_kcontrol *kcontrol,
@@ -1001,6 +1000,28 @@ static int snd_ctl_elem_user_info(struct snd_kcontrol *kcontrol,
 	return 0;
 }
 
+static int snd_ctl_elem_user_enum_info(struct snd_kcontrol *kcontrol,
+				       struct snd_ctl_elem_info *uinfo)
+{
+	struct user_element *ue = kcontrol->private_data;
+	const char *names;
+	unsigned int item;
+
+	item = uinfo->value.enumerated.item;
+
+	*uinfo = ue->info;
+
+	item = min(item, uinfo->value.enumerated.items - 1);
+	uinfo->value.enumerated.item = item;
+
+	names = ue->priv_data;
+	for (; item > 0; --item)
+		names += strlen(names) + 1;
+	strcpy(uinfo->value.enumerated.name, names);
+
+	return 0;
+}
+
 static int snd_ctl_elem_user_get(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol)
 {
@@ -1055,11 +1076,46 @@ static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kcontrol,
 	return change;
 }
 
+static int snd_ctl_elem_init_enum_names(struct user_element *ue)
+{
+	char *names, *p;
+	size_t buf_len, name_len;
+	unsigned int i;
+
+	if (ue->info.value.enumerated.names_length > 64 * 1024)
+		return -EINVAL;
+
+	names = memdup_user(
+		(const void __user *)ue->info.value.enumerated.names_ptr,
+		ue->info.value.enumerated.names_length);
+	if (IS_ERR(names))
+		return PTR_ERR(names);
+
+	/* check that there are enough valid names */
+	buf_len = ue->info.value.enumerated.names_length;
+	p = names;
+	for (i = 0; i < ue->info.value.enumerated.items; ++i) {
+		name_len = strnlen(p, buf_len);
+		if (name_len == 0 || name_len >= 64 || name_len == buf_len) {
+			kfree(names);
+			return -EINVAL;
+		}
+		p += name_len + 1;
+		buf_len -= name_len + 1;
+	}
+
+	ue->priv_data = names;
+	ue->info.value.enumerated.names_ptr = 0;
+
+	return 0;
+}
+
 static void snd_ctl_elem_user_free(struct snd_kcontrol *kcontrol)
 {
 	struct user_element *ue = kcontrol->private_data;
-	if (ue->tlv_data)
-		kfree(ue->tlv_data);
+
+	kfree(ue->tlv_data);
+	kfree(ue->priv_data);
 	kfree(ue);
 }
 
@@ -1101,7 +1157,10 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,
 	memcpy(&kctl.id, &info->id, sizeof(info->id));
 	kctl.count = info->owner ? info->owner : 1;
 	access |= SNDRV_CTL_ELEM_ACCESS_USER;
-	kctl.info = snd_ctl_elem_user_info;
+	if (info->type == SNDRV_CTL_ELEM_TYPE_ENUMERATED)
+		kctl.info = snd_ctl_elem_user_enum_info;
+	else
+		kctl.info = snd_ctl_elem_user_info;
 	if (access & SNDRV_CTL_ELEM_ACCESS_READ)
 		kctl.get = snd_ctl_elem_user_get;
 	if (access & SNDRV_CTL_ELEM_ACCESS_WRITE)
@@ -1122,6 +1181,11 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,
 		if (info->count > 64)
 			return -EINVAL;
 		break;
+	case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
+		private_size = sizeof(unsigned int);
+		if (info->count > 128 || info->value.enumerated.items == 0)
+			return -EINVAL;
+		break;
 	case SNDRV_CTL_ELEM_TYPE_BYTES:
 		private_size = sizeof(unsigned char);
 		if (info->count > 512)
@@ -1143,9 +1207,17 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file,
 	ue->info.access = 0;
 	ue->elem_data = (char *)ue + sizeof(*ue);
 	ue->elem_data_size = private_size;
+	if (ue->info.type == SNDRV_CTL_ELEM_TYPE_ENUMERATED) {
+		err = snd_ctl_elem_init_enum_names(ue);
+		if (err < 0) {
+			kfree(ue);
+			return err;
+		}
+	}
 	kctl.private_free = snd_ctl_elem_user_free;
 	_kctl = snd_ctl_new(&kctl, access);
 	if (_kctl == NULL) {
+		kfree(ue->priv_data);
 		kfree(ue);
 		return -ENOMEM;
 	}
diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 4268744..2bb95a7 100644
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -83,6 +83,8 @@ struct snd_ctl_elem_info32 {
 			u32 items;
 			u32 item;
 			char name[64];
+			u64 names_ptr;
+			u32 names_length;
 		} enumerated;
 		unsigned char reserved[128];
 	} value;
@@ -372,6 +374,8 @@ static int snd_ctl_elem_add_compat(struct snd_ctl_file *file,
 				   &data32->value.enumerated,
 				   sizeof(data->value.enumerated)))
 			goto error;
+		data->value.enumerated.names_ptr =
+			(uintptr_t)compat_ptr(data->value.enumerated.names_ptr);
 		break;
 	default:
 		break;
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  c035877c260e3755b7416c425fd69e4e888b034b \
  e6fe5aef5693962850742f450067da64da3bbc13

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  567cc19a883f9799737bc03881589ae3f331273f (commit)
       via  9736511b36a1536251589def209ed0381ae1514d (commit)
      from  fef6e6fd580073e0c0696105f808145561990b75 (commit)

- Log -----------------------------------------------------------------
commit 567cc19a883f9799737bc03881589ae3f331273f
Author:     Clemens Ladisch <clemens@...>
AuthorDate: Wed Oct 5 10:40:48 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Wed Oct 5 11:01:38 2011 +0200

    asound.h: cosmetic changes for consistency with kernel asound.h
    
    Change some whitespace and comments to remove spurious differences
    between the alsa-lib and kernel versions of asound.h.
    
    Signed-off-by: Clemens Ladisch <clemens@...>

commit 9736511b36a1536251589def209ed0381ae1514d
Author:     Clemens Ladisch <clemens@...>
AuthorDate: Wed Oct 5 10:14:56 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Wed Oct 5 11:01:33 2011 +0200

    asound.h: update for latest kernel
    
    Refresh asound.h to be up to date with its kernel source.
    
    Signed-off-by: Clemens Ladisch <clemens@...>

-----------------------------------------------------------------------

Diffstat:
 include/sound/asound.h |   79 ++++++++++++++++++++++--------------------------
 1 files changed, 36 insertions(+), 43 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 17dfe8f..5dddd87 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -113,9 +113,11 @@ enum sndrv_hwdep_iface {
 	SNDRV_HWDEP_IFACE_USX2Y_PCM,	/* Tascam US122, US224 & US428 rawusb pcm */
 	SNDRV_HWDEP_IFACE_PCXHR,	/* Digigram PCXHR */
 	SNDRV_HWDEP_IFACE_SB_RC,	/* SB Extigy/Audigy2NX remote control */
+	SNDRV_HWDEP_IFACE_HDA,		/* HD-audio */
+	SNDRV_HWDEP_IFACE_USB_STREAM,	/* direct access to usb stream */
 
 	/* Don't forget to change the following: */
-	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_SB_RC
+	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USB_STREAM
 };
 
 struct sndrv_hwdep_info {
@@ -158,7 +160,7 @@ enum {
  *                                                                           *
  *****************************************************************************/
 
-#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 9)
+#define SNDRV_PCM_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 10)
 
 typedef unsigned long sndrv_pcm_uframes_t;
 typedef long sndrv_pcm_sframes_t;
@@ -233,7 +235,11 @@ enum sndrv_pcm_format {
 	SNDRV_PCM_FORMAT_S18_3BE,	/* in three bytes */
 	SNDRV_PCM_FORMAT_U18_3LE,	/* in three bytes */
 	SNDRV_PCM_FORMAT_U18_3BE,	/* in three bytes */
-	SNDRV_PCM_FORMAT_LAST = SNDRV_PCM_FORMAT_U18_3BE,
+	SNDRV_PCM_FORMAT_G723_24,	/* 8 samples in 3 bytes */
+	SNDRV_PCM_FORMAT_G723_24_1B,	/* 1 sample in 1 byte */
+	SNDRV_PCM_FORMAT_G723_40,	/* 8 Samples in 5 bytes */
+	SNDRV_PCM_FORMAT_G723_40_1B,	/* 1 sample in 1 byte */
+	SNDRV_PCM_FORMAT_LAST = SNDRV_PCM_FORMAT_G723_40_1B,
 
 #ifdef SNDRV_LITTLE_ENDIAN
 	SNDRV_PCM_FORMAT_S16 = SNDRV_PCM_FORMAT_S16_LE,
@@ -308,7 +314,7 @@ union sndrv_pcm_sync_id {
 struct sndrv_pcm_info {
 	unsigned int device;		/* RO/WR (control): device number */
 	unsigned int subdevice;		/* RO/WR (control): subdevice number */
-	int stream;			/* RO/WR (control): stream number */
+	int stream;			/* RO/WR (control): stream direction */
 	int card;			/* R: card number */
 	unsigned char id[64];		/* ID (user selectable) */
 	unsigned char name[80];		/* name of this device */
@@ -345,8 +351,8 @@ enum sndrv_pcm_hw_param {
 	SNDRV_PCM_HW_PARAM_LAST_INTERVAL = SNDRV_PCM_HW_PARAM_TICK_TIME
 };
 
-#define SNDRV_PCM_HW_PARAMS_NORESAMPLE	(1<<0)  /* avoid rate resampling */
-#define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER	(1<<1)  /* export buffer */
+#define SNDRV_PCM_HW_PARAMS_NORESAMPLE	(1<<0)	/* avoid rate resampling */
+#define SNDRV_PCM_HW_PARAMS_EXPORT_BUFFER	(1<<1)	/* export buffer */
 #define SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP	(1<<2)	/* disable period wakeups */
 
 struct sndrv_interval {
@@ -466,9 +472,9 @@ struct sndrv_xfern {
 
 
 enum {
-        SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /* gettimeofday equivalent */
-        SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,        /* posix_clock_monotonic equivalent */
-        SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,
+	SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0,	/* gettimeofday equivalent */
+	SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,	/* posix_clock_monotonic equivalent */
+	SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC,
 };
 
 enum {
@@ -571,7 +577,7 @@ enum {
  *  Timer section - /dev/snd/timer
  */
 
-#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 5)
+#define SNDRV_TIMER_VERSION		SNDRV_PROTOCOL_VERSION(2, 0, 6)
 
 enum sndrv_timer_class {
 	SNDRV_TIMER_CLASS_NONE = -1,
@@ -769,14 +775,14 @@ enum sndrv_ctl_elem_iface {
 #define SNDRV_CTL_ELEM_ACCESS_READWRITE		(SNDRV_CTL_ELEM_ACCESS_READ|SNDRV_CTL_ELEM_ACCESS_WRITE)
 #define SNDRV_CTL_ELEM_ACCESS_VOLATILE		(1<<2)	/* control value may be changed without a notification */
 #define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP		(1<<3)	/* when was control changed */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_READ		(1<<4)	/* TLV read is supported */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE		(1<<5)	/* TLV write is supported */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_READ		(1<<4)	/* TLV read is possible */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE		(1<<5)	/* TLV write is possible */
 #define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE	(SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
 #define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND	(1<<6)	/* TLV command is possible */
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE		(1<<8)	/* control does actually nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK		(1<<9)	/* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER		(1<<10)	/* write lock owner */
-#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* flag only for kernel */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK	(1<<28)	/* kernel use a TLV callback */ 
 #define SNDRV_CTL_ELEM_ACCESS_USER		(1<<29) /* user space element */
 /* bits 30 and 31 are obsoleted (for indirect access) */
 
@@ -793,7 +799,7 @@ struct sndrv_ctl_elem_id {
 	int iface;			/* interface identifier */
 	unsigned int device;		/* device/client number */
 	unsigned int subdevice;		/* subdevice (substream) number */
-        unsigned char name[44];		/* ASCII name of item */
+	unsigned char name[44];		/* ASCII name of item */
 	unsigned int index;		/* index of item */
 };
 
@@ -832,41 +838,41 @@ struct sndrv_ctl_elem_info {
 	} value;
 	union {
 		unsigned short d[4];		/* dimensions */
-		unsigned short *d_ptr;		/* (obsolete) indirect */
+		unsigned short *d_ptr;		/* indirect - obsoleted */
 	} dimen;
 	unsigned char reserved[64-4*sizeof(unsigned short)];
 };
 
 struct sndrv_ctl_elem_value {
 	struct sndrv_ctl_elem_id id;	/* W: element ID */
-	unsigned int indirect: 1;	/* (obsolete) W: use indirect pointer (xxx_ptr member) */
-        union {
+	unsigned int indirect: 1;	/* W: indirect access - obsoleted */
+	union {
 		union {
 			long value[128];
-			long *value_ptr;	/* obsolete */
+			long *value_ptr;	/* obsoleted */
 		} integer;
 		union {
 			long long value[64];
-			long long *value_ptr;	/* obsolete */
+			long long *value_ptr;	/* obsoleted */
 		} integer64;
 		union {
 			unsigned int item[128];
-			unsigned int *item_ptr;	/* obsolete */
+			unsigned int *item_ptr;	/* obsoleted */
 		} enumerated;
 		union {
 			unsigned char data[512];
-			unsigned char *data_ptr;	/* obsolete */
+			unsigned char *data_ptr;	/* obsoleted */
 		} bytes;
 		struct sndrv_aes_iec958 iec958;
-        } value;                /* RO */
+	} value;		/* RO */
 	struct timespec tstamp;
-        unsigned char reserved[128-sizeof(struct timespec)];
+	unsigned char reserved[128-sizeof(struct timespec)];
 };
 
 struct sndrv_ctl_tlv {
-	unsigned int numid;     /* control element numeric identification */
-        unsigned int length;    /* in bytes aligned to 4 */
-        unsigned int tlv[0];    /* first TLV */
+	unsigned int numid;	/* control element numeric identification */
+	unsigned int length;	/* in bytes aligned to 4 */
+	unsigned int tlv[0];	/* first TLV */
 };
 
 enum {
@@ -909,17 +915,18 @@ enum sndrv_ctl_event_type {
 #define SNDRV_CTL_EVENT_MASK_VALUE	(1<<0)	/* element value was changed */
 #define SNDRV_CTL_EVENT_MASK_INFO	(1<<1)	/* element info was changed */
 #define SNDRV_CTL_EVENT_MASK_ADD	(1<<2)	/* element was added */
+#define SNDRV_CTL_EVENT_MASK_TLV	(1<<3)	/* element TLV tree was changed */
 #define SNDRV_CTL_EVENT_MASK_REMOVE	(~0U)	/* element was removed */
 
 struct sndrv_ctl_event {
-	int type;				/* event type - SNDRV_CTL_EVENT_* */
+	int type;	/* event type - SNDRV_CTL_EVENT_* */
 	union {
 		struct {
 			unsigned int mask;
 			struct sndrv_ctl_elem_id id;
 		} elem;
-                unsigned char data8[60];
-        } data;
+		unsigned char data8[60];
+	} data;
 };
 
 /*
@@ -940,18 +947,4 @@ struct sndrv_ctl_event {
 #define SNDRV_CTL_NAME_IEC958_PCM_STREAM		"PCM Stream"
 #define SNDRV_CTL_NAME_IEC958(expl,direction,what)	"IEC958 " expl SNDRV_CTL_NAME_##direction SNDRV_CTL_NAME_IEC958_##what
 
-/*
- *
- */
-
-struct sndrv_xferv {
-	const struct iovec *vector;
-	unsigned long count;
-};
-
-enum {
-	SNDRV_IOCTL_READV = _IOW('K', 0x00, struct sndrv_xferv),
-	SNDRV_IOCTL_WRITEV = _IOW('K', 0x01, struct sndrv_xferv),
-};
-
 #endif /* __SOUND_ASOUND_H */
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  fef6e6fd580073e0c0696105f808145561990b75 \
  567cc19a883f9799737bc03881589ae3f331273f

Hello,

This is an automated email from the git hooks/update script, it was
generated because a ref change was pushed to the repository.

Updating branch, master,
       via  c035877c260e3755b7416c425fd69e4e888b034b (commit)
      from  14d1242f90e008ef62ff057b2630831e9c66d80d (commit)

- Log -----------------------------------------------------------------
commit c035877c260e3755b7416c425fd69e4e888b034b
Author:     Stefan Richter <stefanr@...>
AuthorDate: Sat Aug 27 16:45:28 2011 +0200
Commit:     Clemens Ladisch <clemens@...>
CommitDate: Mon Oct 3 23:17:47 2011 +0200

    ALSA: firewire-speakers: fix locking
    
    There is a lock inversion between fwspk->mutex and pcm->open_mutex
    reported by lockdep when fwspk_hw_free is called.
    
    Fixed by copying the fix from the same former issue in the isight
    sound driver (commit f3f7c1837f6bcae3601fc535b339426868bf1549
    "ALSA: isight: fix locking").
    
    Signed-off-by: Stefan Richter <stefanr@...>
    Signed-off-by: Clemens Ladisch <clemens@...>

-----------------------------------------------------------------------

Diffstat:
 sound/firewire/speakers.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Patch -------------- (max 1500 lines)
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index 3fc257d..cbe6bb9 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -778,9 +778,10 @@ static int __devexit fwspk_remove(struct device *dev)
 {
 	struct fwspk *fwspk = dev_get_drvdata(dev);
 
-	mutex_lock(&fwspk->mutex);
 	amdtp_out_stream_pcm_abort(&fwspk->stream);
 	snd_card_disconnect(fwspk->card);
+
+	mutex_lock(&fwspk->mutex);
 	fwspk_stop_stream(fwspk);
 	mutex_unlock(&fwspk->mutex);
 
@@ -796,8 +797,8 @@ static void fwspk_bus_reset(struct fw_unit *unit)
 	fcp_bus_reset(fwspk->unit);
 
 	if (cmp_connection_update(&fwspk->connection) < 0) {
-		mutex_lock(&fwspk->mutex);
 		amdtp_out_stream_pcm_abort(&fwspk->stream);
+		mutex_lock(&fwspk->mutex);
 		fwspk_stop_stream(fwspk);
 		mutex_unlock(&fwspk->mutex);
 		return;
------- End of patch

hooks/update
---
Git Source Code Management System
hooks/update refs/heads/master \
  14d1242f90e008ef62ff057b2630831e9c66d80d \
  c035877c260e3755b7416c425fd69e4e888b034b