On Mon, 23 Feb 2004 cube@cubidou.net wrote:

> Well, what do you have at line 514 of dev/pci/auich.c, then? :)

arg! It seems that the update of this file this morning went bad ... :

line 514 :
<<<<<<< auich.c
        /* Reset codec and AC'97 */
        auich_reset_codec(sc);
        status = bus_space_read_4(sc->iot, sc->aud_ioh, ICH_GSTS);
        if (!sc->sc_ignore_codecready && !(status & ICH_PCR)) { /* reset
failure */
                        /* It never return ICH_PCR in some cases */
                if (d->quirks & QUIRK_IGNORE_CODEC_READY_MAYBE) {
                        sc->sc_ignore_codecready = TRUE;
                } else {
                        return;
                }
        }

=======
>>>>>>> 1.58

and line 630 :
<<<<<<< auich.c
        for (i = 500000; i-- &&
               !(bus_space_read_4(sc->iot, sc->aud_ioh, ICH_GSTS) &
ICH_PCR);
             DELAY(1));                             /*  or ICH_SCR? */
        if (!sc->sc_ignore_codecready && (i <= 0))
=======
        for (i = 500000; i >= 0; i--) {
                status = bus_space_read_4(sc->iot, sc->aud_ioh, ICH_GSTS);
                if (status & (ICH_PCR | ICH_SCR | ICH_S2CR))
                        break;
                DELAY(1);
        }
        if (i <= 0) {
>>>>>>> 1.58

I think I had to modify this file monthes ago in order to get the sound on
my machine...

I will remove the code I had to add, but I cannot test a new kernel
compilation, as my tools are broken :o(

----
Florence HENRY
florence.henry@obspm.fr