diff for duplicates of <s5hn0fdzcml.wl@alsa2.suse.de> diff --git a/a/1.txt b/N1/1.txt index 3562b26..276f256 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,32 +1,32 @@ At Thu, 17 Jul 2003 11:08:03 +0200, Ernst Persson wrote: -> +> > Hi all! -> -> Now that the 2.6.0 kernel is out I'm trying to get ALSA working on my iMac +> +> Now that the 2.6.0 kernel is out I'm trying to get ALSA working on my iMac > 266, since it's the default sound system now (and dmasound doesn't compile). -> +> > The first problem was that everything locked up when the ALSA drivers loaded. > No error message, no kernel panic, just dead. And compiling ALSA with debug > didn't help either. -> +> > After some debugging I found out that the driver crashed here, in > sound/ppc/burgundy.c in int __init snd_pmac_burgundy_init(pmac_t *chip) -> +> > #ifdef PMAC_SUPPORT_AUTOMUTE -> +> > printk(KERN_INFO "Automute Enabled.\n"); -> +> > if ((err = snd_pmac_add_automute(chip)) < 0) > return err; -> +> > chip->detect_headphone = snd_pmac_burgundy_detect_headphone; > chip->update_automute = snd_pmac_burgundy_update_automute; > snd_pmac_burgundy_update_automute(chip, 0); /* update the status only */ > #endif > So I commented out //#define PMAC_SUPPORT_AUTOMUTE in pmac.h and after that > the driver loaded without problems. -> +> > But as soon as I touch any mixer (both the oss-emulated or with alsamixer) > everything locks up again, in exactly the same way. diff --git a/a/2.txt b/N1/2.txt index eb68c14..b5918be 100644 --- a/a/2.txt +++ b/N1/2.txt @@ -17,7 +17,7 @@ diff -u -r1.9 burgundy.c + if (! timeout) + printk(KERN_DEBUG "burgundy_busy_wait: timeout\n"); } - + inline static void snd_pmac_burgundy_extend_wait(pmac_t *chip) { @@ -37,21 +37,21 @@ diff -u -r1.9 burgundy.c + if (! timeout) + printk(KERN_DEBUG "burgundy_extend_wait: timeout #2\n"); } - + static void @@ -66,7 +76,6 @@ unsigned val = 0; unsigned long flags; - + - /* should have timeouts here */ spin_lock_irqsave(&chip->reg_lock, flags); - + out_le32(&chip->awacs->codec_ctrl, addr + 0x100000); @@ -107,7 +116,6 @@ unsigned val = 0; unsigned long flags; - + - /* should have timeouts here */ spin_lock_irqsave(&chip->reg_lock, flags); - + out_le32(&chip->awacs->codec_ctrl, addr + 0x100000); diff --git a/a/content_digest b/N1/content_digest index dde606b..5249582 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "ref\0200307171108.03928.ernstp@mac.com\0" "From\0Takashi Iwai <tiwai@suse.de>\0" - "Subject\0Re: Burgundy Auto-Mute problem\0" + "Subject\0Re: [Alsa-devel] Burgundy Auto-Mute problem\0" "Date\0Thu, 17 Jul 2003 12:11:30 +0200\0" "To\0Ernst Persson <ernstp@mac.com>\0" "Cc\0alsa-devel@lists.sourceforge.net" @@ -9,33 +9,33 @@ "b\0" "At Thu, 17 Jul 2003 11:08:03 +0200,\n" "Ernst Persson wrote:\n" - "> \n" + ">\n" "> Hi all!\n" - "> \n" - "> Now that the 2.6.0 kernel is out I'm trying to get ALSA working on my iMac \n" + ">\n" + "> Now that the 2.6.0 kernel is out I'm trying to get ALSA working on my iMac\n" "> 266, since it's the default sound system now (and dmasound doesn't compile).\n" - "> \n" + ">\n" "> The first problem was that everything locked up when the ALSA drivers loaded.\n" "> No error message, no kernel panic, just dead. And compiling ALSA with debug\n" "> didn't help either.\n" - "> \n" + ">\n" "> After some debugging I found out that the driver crashed here, in\n" "> sound/ppc/burgundy.c in int __init snd_pmac_burgundy_init(pmac_t *chip)\n" - "> \n" + ">\n" "> #ifdef PMAC_SUPPORT_AUTOMUTE\n" - "> \n" + ">\n" "> \tprintk(KERN_INFO \"Automute Enabled.\\n\");\n" - "> \n" + ">\n" "> \tif ((err = snd_pmac_add_automute(chip)) < 0)\n" "> \t\treturn err;\n" - "> \n" + ">\n" "> \tchip->detect_headphone = snd_pmac_burgundy_detect_headphone;\n" "> \tchip->update_automute = snd_pmac_burgundy_update_automute;\n" "> \tsnd_pmac_burgundy_update_automute(chip, 0); /* update the status only */\n" "> #endif\n" "> So I commented out //#define PMAC_SUPPORT_AUTOMUTE in pmac.h and after that\n" "> the driver loaded without problems.\n" - "> \n" + ">\n" "> But as soon as I touch any mixer (both the oss-emulated or with alsamixer)\n" "> everything locks up again, in exactly the same way.\n" "\n" @@ -66,7 +66,7 @@ "+\tif (! timeout)\n" "+\t\tprintk(KERN_DEBUG \"burgundy_busy_wait: timeout\\n\");\n" " }\n" - " \n" + "\n" " inline static void\n" " snd_pmac_burgundy_extend_wait(pmac_t *chip)\n" " {\n" @@ -86,23 +86,23 @@ "+\tif (! timeout)\n" "+\t\tprintk(KERN_DEBUG \"burgundy_extend_wait: timeout #2\\n\");\n" " }\n" - " \n" + "\n" " static void\n" "@@ -66,7 +76,6 @@\n" " \tunsigned val = 0;\n" " \tunsigned long flags;\n" - " \n" + "\n" "-\t/* should have timeouts here */\n" " \tspin_lock_irqsave(&chip->reg_lock, flags);\n" - " \n" + "\n" " \tout_le32(&chip->awacs->codec_ctrl, addr + 0x100000);\n" "@@ -107,7 +116,6 @@\n" " \tunsigned val = 0;\n" " \tunsigned long flags;\n" - " \n" + "\n" "-\t/* should have timeouts here */\n" " \tspin_lock_irqsave(&chip->reg_lock, flags);\n" - " \n" + "\n" " \tout_le32(&chip->awacs->codec_ctrl, addr + 0x100000);" -87d3fb3ff98b829f580b3803c794a9334f618d8ee0121fc868e1d7d268bdd59b +de0a06a89d023aeb388d48600683f3449195ae0b978dc81db2602fbdce73f54a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.