Re: kernel

[Ignatios Souvatzis <is%jocelyn.rhein.de@localhost>]

On Thu, Dec 31, 1998 at 05:54:29PM +0000, Rainer Doemer wrote:
> 
> > The feature addition file (I refuse to name it "fix") is
> > 
> > ftp.netbsd.org:/pub/NetBSD/arch/amiga/misc/apollodiffs
> > ftp.de.netbsd.org:/pub/NetBSD/arch/amiga/misc/apollodiffs
> > 
> > If it does not apply cleanly... find out where the conflict is, and apply
> > the diff manually.
> 
> Your "feature addition file" did apply cleanly to the NetBSD 1.3.3
> sources. However, when compiling the file ahsc.c, I got the following
> error:
> [...]
> .../../../../arch/amiga/dev/ahsc.c: In function `ahscattach':
> .../../../../arch/amiga/dev/ahsc.c:139: structure has no member named 
> `sc_sbicp'
> *** Error code 1
> 
> Since I have no idea what's going on in that file, I just commented
> the line out:
> 
> diff ahsc.c.bak ahsc.c
> 139c139
> <       sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x41);
> ---
> > /*    sc->sc_sbicp = (sbic_regmap_p) ((int)rp + 0x41); */
> 
> This is most probably wrong (Ignatios, is it?), but at least
> the compilation could continue.

The region in question should look like this (in -current):

        sc->sc_dmamask = 0; 
 
        if (cdp < ecdp) {
                sc->sc_sbic.sbic_asr_p =  ((vu_char *)rp + 0x43);
                sc->sc_sbic.sbic_value_p =  ((vu_char *)rp + 0x47);  
                printf(": modified for Apollo cpu board\n");
        } else {
                sc->sc_sbic.sbic_asr_p =  ((vu_char *)rp + 0x41);  
                sc->sc_sbic.sbic_value_p =  ((vu_char *)rp + 0x43);
                printf("\n");
        }
 
        sc->sc_clkfreq = sbic_clock_override ? sbic_clock_override : 143;

I'll get the 1.3.3 files later and test myself what applying the diff produces,
but you can do so yourself if you want..
(See now why I didn't bother to ask the release engineer to add it to 1.3.3?)

Regards,
        -is