more alsatool updates

diff --git a/alsatool b/alsatool
index e2365fa043565bb75ba71d81acff08591c2a0866..c474992a525bb47a85ed3956782eca5b4814f404 100755 (executable)
--- a/alsatool
+++ b/alsatool
@@ -427,8 +427,8 @@ def parse_log(fp):
                elif line.startswith('Author:') or line.startswith('AuthorDate:') or \
                     line.startswith('Commit:') or line.startswith('CommitDate:') or \
                     line.startswith('Merge:'):
-                       a, b = line.split(': ')
-                       commit[a.strip()] = b.strip()
+                       a = line.split(': ')
+                       commit[a[0].strip()] = (': '.join(a[1:])).strip()
                elif line.startswith('    '):
                        if len(commit['comment']) == 0 and line[4:].strip() == '':
                                continue
@@ -802,6 +802,10 @@ def import_(argv):
                                a2 = a[2].split(',')
                                b1 = b[1].split(',')
                                b2 = b[2].split(',')
+                               if len(a1) < 2:
+                                       a1.append('XXX')
+                               if len(b1) < 2:
+                                       b1.append('XXX')
                                if a1[1] != b1[1] or a2[1] != b2[1]:
                                        return False
                        elif diff1[idx] != diff2[idx]:
@@ -1038,12 +1042,16 @@ def kmirrorcheck(argv):
                os.system("git commit -m \"%s\" -e" % ''.join(msg))
 
 def kmirrormark(argv):
-       commit = argv[0]
-       fuller = parse_log(os.popen("git log --name-only --pretty=fuller --date=iso %s~1..%s" % (commit, commit)))[0]
-       git_ok_commits = read_git_ok_commits()
-       if mark_git_ok_commits(git_ok_commits, fuller):
-               msg = []
-               msg.append('git-ok-commits: added %s %s\n\n' % (fuller['commit'][:7], fuller['comment'][0].strip()))
+       msg = []
+       for commit in argv:
+               fuller = parse_log(os.popen("git log --name-only --pretty=fuller --date=iso %s~1..%s" % (commit, commit)))[0]
+               if fuller:
+                       git_ok_commits = read_git_ok_commits()
+                       if mark_git_ok_commits(git_ok_commits, fuller):
+                               msg.append('git-ok-commits: added %s %s\n' % (fuller['commit'][:7], fuller['comment'][0].replace('"', "'").strip()))
+               else:
+                       print 'Wrong commit ID: %s' % commit
+       if msg:
                msg.append('\nSigned-off-by: Jaroslav Kysela <perex@perex.cz>\n')
                os.chdir(ROOT + '/alsa')
                os.system("git add kernel-sync/git-ok-commits")

diff --git a/comments.py b/comments.py
index f1c6f4022957e567012589a528918f783c173a08..e381c18bd76005843cd8b9db640efa5ceae21945 100644 (file)
--- a/comments.py
+++ b/comments.py
@@ -44,6 +44,7 @@ COMMENT_MAP = {
         ['/arm/devdma.[ch]', 'ARM DMA routines'],
         ['/arm/aaci.[ch]', 'ARM AACI PL041 driver'],
         ['/arm/sa11xx-uda1341.(c|patch)', 'SA11xx UDA1341 driver'],
+        ['/include/pxa2xx-lib.h', 'ARM PXA2XX driver'],
         ['/arm/pxa2xx.*', 'ARM PXA2XX driver'],
         ['/arm/s3c24xx-iis.[ch]', 'ARM S3C24XX IIS driver'],
         ['/arm', 'ERROR'],
@@ -212,9 +213,9 @@ COMMENT_MAP = {
         ['/parisc/harmony.[ch]', 'PARISC Harmony driver'],
         ['/parisc/Kconfig', 'PARISC'],
         ['/parisc', 'ERROR'],
-        ['/sparc/amd7930.c', 'SPARC AMD7930 driver'],
-        ['/sparc/cs4231.c', 'SPARC cs4231 driver'],
-        ['/sparc/dbri.c', 'SPARC DBRI driver'],
+        ['/sparc/amd7930.(c|patch)', 'SPARC AMD7930 driver'],
+        ['/sparc/cs4231.(c|patch)', 'SPARC cs4231 driver'],
+        ['/sparc/dbri.(c|patch)', 'SPARC DBRI driver'],
         ['/sparc/Kconfig', 'SPARC'],
         ['/sparc', 'ERROR'],
         ['/mips/au1x00.[ch]', 'MIPS AU1x00 driver'],
@@ -237,25 +238,42 @@ COMMENT_MAP = {
         ['/include/soc.h', 'SoC Layer'],
         ['/include/soc-of-simple.h', 'SoC Layer'],
         ['/include/soc-dapm.h', 'SoC Dynamic Audio Power Management'],
+        ['/include/l3.h', 'SoC L3 bus'],
+        ['/include/uda134x.h', 'SoC Codec Philips UDA134x'],
+        ['/include/s3c24xx_uda134x.h', 'SoC Audio for the Samsung S3C24XX chips'],
+        ['/include/soc-dai.h', 'SoC Layer'],
         ['/soc/codecs/Kconfig', 'SoC Layer'],
+        ['/soc/codecs/l3.(c|h)', 'SoC L3 bus'],
         ['/soc/codecs/ac97.(c|h)', 'SoC Codec AC97'],
+        ['/soc/codecs/wm8350.(c|h)', 'SoC Codec WM8350'],
         ['/soc/codecs/wm8510.(c|h)', 'SoC Codec WM8510'],
         ['/soc/codecs/wm8560.(c|h)', 'SoC Codec WM8560'],
         ['/soc/codecs/wm8580.(c|h)', 'SoC Codec WM8580'],
+        ['/soc/codecs/wm8728.(c|h)', 'SoC Codec WM8728'],
         ['/soc/codecs/wm8731.(c|h)', 'SoC Codec WM8731'],
         ['/soc/codecs/wm8750.(c|h)', 'SoC Codec WM8750'],
         ['/soc/codecs/wm8753.(c|h)', 'SoC Codec WM8753'],
         ['/soc/codecs/wm8900.(c|h)', 'SoC Codec WM8900'],
+        ['/soc/codecs/wm8903.(c|h)', 'SoC Codec WM8903'],
+        ['/soc/codecs/wm8971.(c|h)', 'SoC Codec WM8971'],
         ['/soc/codecs/wm8990.(c|h)', 'SoC Codec WM8990'],
+        ['/soc/codecs/wm9705.(c|h)', 'SoC Codec WM9705'],
         ['/soc/codecs/wm9712.(c|h)', 'SoC Codec WM9712'],
         ['/soc/codecs/wm9713.(c|h)', 'SoC Codec WM9713'],
         ['/soc/codecs/cs4270.(c|h)', 'SoC Codec CS4270'],
         ['/soc/codecs/ad1980.(c|h)', 'SoC Codec AD1980'],
+        ['/soc/codecs/tlv320aic23.(c|h)', 'SoC Codec TLV320AIC23'],
         ['/soc/codecs/tlv320aic26.(c|h)', 'SoC Codec TLV320AIC26'],
         ['/soc/codecs/tlv320aic3x.(c|h)', 'SoC Codec TLV320AIC3X'],
+        ['/soc/codecs/uda134x.(c|h)', 'SoC Codec Philips UDA134x'],
         ['/soc/codecs/uda1380.(c|h)', 'SoC Codec Philips UDA1380'],
         ['/soc/codecs/ak4535.(c|h)', 'SoC Codec AK4535'],
+        ['/soc/codecs/ssm2602.(c|h)', 'SoC Codec SSM2602'],
+        ['/soc/codecs/ad73311.(c|h)', 'SoC Codec AD73311'],
+        ['/soc/codecs/twl4030.(c|h)', 'SoC Codec TWL4030'],
+        ['/soc/codecs/pcm3008.(c|h)', 'SoC Codec PCM3008'],
         ['/soc/codecs', 'ERROR'],
+        ['/soc/atmel/.*', 'SoC Audio for the Atmel AT32/AT91 System-on-Chip'],
         ['/soc/at32/.*', 'SoC Audio for the Atmel AT32 System-on-Chip'],
         ['/soc/at91/.*', 'SoC Audio for the Atmel AT91 System-on-Chip'],
         ['/soc/pxa/spitz.c', 'SoC PXA2xx Spitz'],
@@ -265,6 +283,9 @@ COMMENT_MAP = {
         ['/soc/pxa/tosa.c', 'SoC PXA2xx Tosa'],
         ['/soc/pxa/pxa*', 'SoC PXA2xx Core'],
         ['/soc/pxa/em-x270*', 'SoC PXA2xx EM-X270'],
+        ['/soc/pxa/palm27x*', 'SoC PXA2xx Palm T|X, T5 and LifeDrive'],
+        ['/soc/pxa/zylonite*', 'SoC PXA2xx Zylonite'],
+        ['/soc/pxa/e750_wm9705.c', 'SoC PXA2xx E750'],
         ['/soc/pxa/Kconfig', 'SoC PXA2xx Core'],
         ['/soc/s3c24xx/.*', 'SoC Audio for the Samsung S3C24XX chips'],
         ['/soc/sh/.*', 'SoC SH7760 AC97'],
@@ -272,7 +293,9 @@ COMMENT_MAP = {
         ['/soc/davinci/.*', 'SoC DaVinci'],
         ['/soc/omap/.*', 'SoC Texas Instruments OMAP'],
         ['/soc/au1x/.*', 'Au12x0/Au1550 PSC ASoC'],
+        ['/soc/blackfin/.*', 'SoC Blackfin'],
         ['/soc/soc-core.*', 'SoC Layer'],
+        ['/soc/soc-jack.*', 'SoC Layer'],
         ['/soc/Kconfig', 'SoC Layer'],
         ['/soc/soc-dapm.c', 'SoC Dynamic Audio Power Management'],
         ['/soc', 'ERROR'],
@@ -285,6 +308,7 @@ COMMENT_MAP = {
         ['/usb/usbmixer.(c|h|patch)', 'USB generic driver'],
         ['/usb/usbquirks.(c|h)', 'USB generic driver'],
         ['/usb/usbmixer_maps.c', 'USB generic driver'],
+        ['/usb/usbcompat.h', 'USB generic driver'],
         ['/usb', 'ERROR'],
         ['/include/hal2.h', 'HAL2 driver'],
         ['/hal2/.*', 'HAL2 driver'],
@@ -305,6 +329,7 @@ COMMENT_MAP = {
         ['/core/sgbuf.*', 'Memalloc module'],
         ['/core/rtctimer.*', 'RTC timer driver'],
         ['/core/hpetimer.*', 'HPE timer driver'],
+        ['/core/hrtimer.*', 'HR timer driver'],
         ['/include/timer.h', 'Timer Midlevel'],
         ['/core/timer.*', 'Timer Midlevel'],
         ['/include/rawmidi.*', 'RawMidi Midlevel'],
@@ -475,9 +500,11 @@ COMMENT_MAP = {
         ['/src/shmarea.*', 'SHM helpers'],
         ['/src/Versions', 'Core'],
         ['/modules/mixer/simple/.*', 'Simple Abstraction Mixer Modules'],
+        ['/aserver/.*', 'ALSA Server'],
         ['/doc/.*', 'Documentation'],
         ['/utils/.*', 'Utils'],
         ['/test/.*', 'Test/Example code'],
+        ['/m4/.*', 'Core'],
         ['/configure.in', 'Core'],
         ['/INSTALL', 'Documentation'],
         ['/NOTES', 'Documentation'],
@@ -527,6 +554,7 @@ COMMENT_MAP = {
         ['/pph/.*', 'Public Parrot Hack rate converter'],
         ['/rate-lavc/.*', "libavcodec's resampler"],
         ['/usb_stream/.*', 'USB stream plugin'],
+        ['/m4/.*', 'Core'],
         ['/COPYING.GPL', 'Core'],
         ['/COPYING', 'Core'],
         ['/configure.in', 'Core'],