dmasound module on PowerBook

dmasound module on PowerBook

[Geert Uytterhoeven]

In arch/ppc/kernel/feature.c, we have

    #ifdef CONFIG_PMAC_PBOOK
    #ifdef CONFIG_DMASOUND_MODULE
	    /* On PowerBooks, we disable the sound chip when dmasound is a module
	     * */
	    if (controller_count && find_devices("via-pmu") != NULL) {
		    feature_clear(controllers[0].device, FEATURE_Sound_power);
		    feature_clear(controllers[0].device, FEATURE_Sound_CLK_enable);
	    }
    #endif
    #endif

Shouldn't the sound chip be disabled if dmasound is not compiled at all, i.e.
#if defined(CONFIG_PMAC_PBOOK) && !defined(CONFIG_DMASOUND)?

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- Linux/{m68k~Amiga,PPC~CHRP} -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: dmasound module on PowerBook

[Michel Lanners]

On  26 Mar, this message from Geert Uytterhoeven echoed through cyberspace:
>
> In arch/ppc/kernel/feature.c, we have
>
>     #ifdef CONFIG_PMAC_PBOOK
>     #ifdef CONFIG_DMASOUND_MODULE
> 	    /* On PowerBooks, we disable the sound chip when dmasound is a module
> 	     * */
> 	    if (controller_count && find_devices("via-pmu") != NULL) {
> 		    feature_clear(controllers[0].device, FEATURE_Sound_power);
> 		    feature_clear(controllers[0].device, FEATURE_Sound_CLK_enable);
> 	    }
>     #endif
>     #endif
>
> Shouldn't the sound chip be disabled if dmasound is not compiled at all, i.e.
> #if defined(CONFIG_PMAC_PBOOK) && !defined(CONFIG_DMASOUND)?

or rather

#if defined(CONFIG_PMAC_PBOOK) && !(defined(CONFIG_DMASOUND_AMIGA)||defined(CONFIG_DMASOUND_.. others))

since CONFIG_DMASOUND is gone...

And anyhow, CONFIG_DMASOUND_MODULE needs to be replaced with something
else, since it seems to be gone as well?

Michel

-------------------------------------------------------------------------
Michel Lanners                 |  " Read Philosophy.  Study Art.
23, Rue Paul Henkes            |    Ask Questions.  Make Mistakes.
L-1710 Luxembourg              |
email   mlan@cpu.lu            |
http://www.cpu.lu/~mlan        |                     Learn Always. "


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: dmasound module on PowerBook

[Geert Uytterhoeven]

On Sun, 26 Mar 2000, Michel Lanners wrote:
> On  26 Mar, this message from Geert Uytterhoeven echoed through cyberspace:
> > In arch/ppc/kernel/feature.c, we have
> >
> >     #ifdef CONFIG_PMAC_PBOOK
> >     #ifdef CONFIG_DMASOUND_MODULE
> > 	    /* On PowerBooks, we disable the sound chip when dmasound is a module
> > 	     * */
> > 	    if (controller_count && find_devices("via-pmu") != NULL) {
> > 		    feature_clear(controllers[0].device, FEATURE_Sound_power);
> > 		    feature_clear(controllers[0].device, FEATURE_Sound_CLK_enable);
> > 	    }
> >     #endif
> >     #endif
> >
> > Shouldn't the sound chip be disabled if dmasound is not compiled at all, i.e.
> > #if defined(CONFIG_PMAC_PBOOK) && !defined(CONFIG_DMASOUND)?
>
> or rather
>
> #if defined(CONFIG_PMAC_PBOOK) && !(defined(CONFIG_DMASOUND_AMIGA)||defined(CONFIG_DMASOUND_.. others))

Why the others? They don't matter for PowerBook anyway.

> since CONFIG_DMASOUND is gone...
>
> And anyhow, CONFIG_DMASOUND_MODULE needs to be replaced with something
> else, since it seems to be gone as well?

The *_MODULE defines are derived from the * defines. Hence it's
CONFIG_DMASOUND_AWACS_MODULE now.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: dmasound module on PowerBook

[Benjamin Herrenschmidt]

On Sun, Mar 26, 2000, Geert Uytterhoeven <geert@linux-m68k.org> wrote:

>In arch/ppc/kernel/feature.c, we have
>
>    #ifdef CONFIG_PMAC_PBOOK
>    #ifdef CONFIG_DMASOUND_MODULE
>	    /* On PowerBooks, we disable the sound chip when dmasound is a module
>	     * */
>	    if (controller_count && find_devices("via-pmu") != NULL) {
>		    feature_clear(controllers[0].device, FEATURE_Sound_power);
>		    feature_clear(controllers[0].device, FEATURE_Sound_CLK_enable);
>	    }
>    #endif
>    #endif
>
>Shouldn't the sound chip be disabled if dmasound is not compiled at all, i.e.
>#if defined(CONFIG_PMAC_PBOOK) && !defined(CONFIG_DMASOUND)?

It need to be disabled when it's not compiled at all or when it's in a
module (the module knows how to power it back up when insmod'ed). So yes,
this code won't handle the case where it's not compiled at all and needs
fixing.


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/