[wellylug] SAA7134

[David Antliff]

On Mon, 3 May 2004, Ewen McNeill wrote:
>
> The section that you quote does also appear in the 2.4.26 patch, however
> it appears _immediately_after_ the section that the patch applies to (but
> for the one word patch -- s/failed/skipped/ -- in one of the messages).
> Hence I suspect that the patch should apply against the 2.6.5 code
> as well without changes.

There seems to be an extra loop in your original source:

	for (retries = 3; retries > 0 && 0 == carrier; retries--)...

This doesn't exist in the 2.6.5 driver as far as I can see:


Line 499 starts immediately below:
	tvaudio_setmode(dev,&tvaudio[0],NULL);
	for (i = 0; i < MAX_SCAN; i++) {
		if (!carr_scan[i])
			continue;
		carr_vals[i] = tvaudio_checkcarrier(dev,carr_scan[i]);
		if (dev->thread.scan1 != dev->thread.scan2)
			goto restart;
	}
	for (carrier = 0, max1 = 0, max2 = 0, i = 0; i < MAX_SCAN; i++) {
		if (!carr_scan[i])
			continue;
		if (max1 < carr_vals[i]) {
			max2 = max1;
			max1 = carr_vals[i];
			carrier = carr_scan[i];
		} else if (max2 < carr_vals[i]) {
			max2 = carr_vals[i];
		}
	}


I can see what you're doing however so I'm going to perform some hackage
myself and see how I go. I certainly do get the audiocarrier moving to
6.0MHz when the problem occurs.


Cheers,
David.