Getting the acorn32 port compiling again.
Mike Pumford <[email protected]> Sun, 12 Oct 2003 17:49:58 +0100
| Newsgroups | gmane.os.netbsd.ports.arm,gmane.os.netbsd.ports.acorn32 |
|---|---|
| Organization | None |
| Message-ID | <[email protected]> |
The attached patch allows all the kernel configurations currently available in CVS to compile again. The kernels do not run correctly but this at least gets things compiling. I will post more information on the runtime errors once I have done some more digging. Mike
atabusfix.patch
(application/octet-stream, 2.2 KB)
Index: conf/GENERIC =================================================================== RCS file: /cvsroot/src/sys/arch/acorn32/conf/GENERIC,v retrieving revision 1.29 diff -u -r1.29 GENERIC --- conf/GENERIC 2003/10/08 11:00:38 1.29 +++ conf/GENERIC 2003/10/10 19:35:00 @@ -230,7 +230,7 @@ #wdc* at pioc? offset 0x0170 irq -1 atabus* at wdc? channel ? -wd* at atabus? ? drive ? +wd* at atabus? drive ? atapibus* at atabus? cd* at atapibus? drive ? sd* at atapibus? drive ? @@ -293,7 +293,7 @@ ss* at scsibus? target ? lun ? # SCSI scanner dtide* at podulebus? # D.T. Software IDE card -atabus* at dtide? channel +atabus* at dtide? channel ? hcide* at podulebus? # HCCS IDE card atabus* at hcide? channel ? Index: podulebus/icside.c =================================================================== RCS file: /cvsroot/src/sys/arch/acorn32/podulebus/icside.c,v retrieving revision 1.14 diff -u -r1.14 icside.c --- podulebus/icside.c 2003/10/08 11:01:16 1.14 +++ podulebus/icside.c 2003/10/10 19:35:00 @@ -305,7 +305,7 @@ /* Enable interrupts */ bus_space_write_1(iot, icp->ic_irqioh, 0, 0); /* Call common attach routines */ - wdcattach(self); + wdcattach(cp); } } Index: podulebus/rapide.c =================================================================== RCS file: /cvsroot/src/sys/arch/acorn32/podulebus/rapide.c,v retrieving revision 1.13 diff -u -r1.13 rapide.c --- podulebus/rapide.c 2003/10/08 11:01:16 1.13 +++ podulebus/rapide.c 2003/10/10 19:35:01 @@ -304,7 +304,7 @@ bus_space_write_1(iot, sc->sc_ctlioh, IRQ_MASK_REGISTER_OFFSET, sc->sc_intr_enable_mask); /* XXX - Issue 1 cards will need to clear any pending interrupts */ - wdcattach(self); + wdcattach(cp); } } Index: podulebus/simide.c =================================================================== RCS file: /cvsroot/src/sys/arch/acorn32/podulebus/simide.c,v retrieving revision 1.12 diff -u -r1.12 simide.c --- podulebus/simide.c 2003/10/08 11:01:16 1.12 +++ podulebus/simide.c 2003/10/10 19:35:01 @@ -292,7 +292,7 @@ sc->sc_ctl_reg |= scp->sc_irqmask; bus_space_write_1(sc->sc_ctliot, sc->sc_ctlioh, CONTROL_REGISTER_OFFSET, sc->sc_ctl_reg); - wdcattach(self); + wdcattach(cp); } }