[alsa-devel] [PATCH] sbawe: fix memory detection

[Takashi Iwai]

At Sun, 20 Dec 2009 20:15:19 +0100,
Krzysztof Helt wrote:
> 
> From: Krzysztof Helt <krzysztof.h1 at wp.pl>
> 
> Memory amount is increased before a successful write-read
> sequence is done. Thus, 512 kB of onboard memory is detected
> on memoryless cards like SB32.
> 
> Move the increasing of memory counter after successful read
> is done.
> 
> Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>

Thanks, applied.


Takashi


> ---
>  sound/isa/sb/emu8000.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/sound/isa/sb/emu8000.c b/sound/isa/sb/emu8000.c
> index 96678d5..751762f 100644
> --- a/sound/isa/sb/emu8000.c
> +++ b/sound/isa/sb/emu8000.c
> @@ -393,8 +393,6 @@ size_dram(struct snd_emu8000 *emu)
>  
>  	while (size < EMU8000_MAX_DRAM) {
>  
> -		size += 512 * 1024;  /* increment 512kbytes */
> -
>  		/* Write a unique data on the test address.
>  		 * if the address is out of range, the data is written on
>  		 * 0x200000(=EMU8000_DRAM_OFFSET).  Then the id word is
> @@ -414,7 +412,9 @@ size_dram(struct snd_emu8000 *emu)
>  		/*snd_emu8000_read_wait(emu);*/
>  		EMU8000_SMLD_READ(emu); /* discard stale data  */
>  		if (EMU8000_SMLD_READ(emu) != UNIQUE_ID2)
> -			break; /* we must have wrapped around */
> +			break; /* no memory at this address */
> +
> +		size += 512 * 1024;  /* increment 512kbytes */
>  
>  		snd_emu8000_read_wait(emu);
>  
> -- 
> 1.6.4
> 
> 
> ----------------------------------------------------------------------
> Sypie, sypie, ale czy sypac bedzie nadal?
> Sprawdz pogode >> http://link.interia.pl/f2530
> 
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>