diff options
| author | Olivier Houchard <cognet@FreeBSD.org> | 2005-03-17 00:43:57 +0000 |
|---|---|---|
| committer | Olivier Houchard <cognet@FreeBSD.org> | 2005-03-17 00:43:57 +0000 |
| commit | 4290208c2484f576eefa948af66e0e7a6d05e28b (patch) | |
| tree | cadd6f03a0bf1d7ef3deaa677eb7fb7d8643edcf /sys/arm/xscale/i80321 | |
| parent | 2eeafe13a6213bbbab45835b1e1a63e98ada932c (diff) | |
| download | src-test2-4290208c2484f576eefa948af66e0e7a6d05e28b.tar.gz src-test2-4290208c2484f576eefa948af66e0e7a6d05e28b.zip | |
Notes
Diffstat (limited to 'sys/arm/xscale/i80321')
| -rw-r--r-- | sys/arm/xscale/i80321/i80321.c | 24 | ||||
| -rw-r--r-- | sys/arm/xscale/i80321/iq80321.c | 9 |
2 files changed, 17 insertions, 16 deletions
diff --git a/sys/arm/xscale/i80321/i80321.c b/sys/arm/xscale/i80321/i80321.c index b468c36ff94f..23d25a110fc3 100644 --- a/sys/arm/xscale/i80321/i80321.c +++ b/sys/arm/xscale/i80321/i80321.c @@ -114,14 +114,14 @@ i80321_attach(struct i80321_softc *sc) sc->sc_iwin[0].iwin_xlate); if (sc->sc_is_host) { bus_space_write_4(sc->sc_st, sc->sc_atu_sh, - PCIR_MAPS, sc->sc_iwin[0].iwin_base_lo); + PCIR_BARS, sc->sc_iwin[0].iwin_base_lo); bus_space_write_4(sc->sc_st, sc->sc_atu_sh, - PCIR_MAPS + 0x04, sc->sc_iwin[0].iwin_base_hi); + PCIR_BARS + 0x04, sc->sc_iwin[0].iwin_base_hi); } else { sc->sc_iwin[0].iwin_base_lo = bus_space_read_4(sc->sc_st, - sc->sc_atu_sh, PCIR_MAPS); + sc->sc_atu_sh, PCIR_BARS); sc->sc_iwin[0].iwin_base_hi = bus_space_read_4(sc->sc_st, - sc->sc_atu_sh, PCIR_MAPS + 0x04); + sc->sc_atu_sh, PCIR_BARS + 0x04); sc->sc_iwin[0].iwin_base_lo = PCI_MAPREG_MEM_ADDR(sc->sc_iwin[0].iwin_base_lo); } @@ -132,14 +132,14 @@ i80321_attach(struct i80321_softc *sc) /* no xlate for window 1 */ if (sc->sc_is_host) { bus_space_write_4(sc->sc_st, sc->sc_atu_sh, - PCIR_MAPS + 0x08, sc->sc_iwin[1].iwin_base_lo); + PCIR_BARS + 0x08, sc->sc_iwin[1].iwin_base_lo); bus_space_write_4(sc->sc_st, sc->sc_atu_sh, - PCIR_MAPS + 0x0c, sc->sc_iwin[1].iwin_base_hi); + PCIR_BARS + 0x0c, sc->sc_iwin[1].iwin_base_hi); } else { sc->sc_iwin[1].iwin_base_lo = bus_space_read_4(sc->sc_st, - sc->sc_atu_sh, PCIR_MAPS + 0x08); + sc->sc_atu_sh, PCIR_BARS + 0x08); sc->sc_iwin[1].iwin_base_hi = bus_space_read_4(sc->sc_st, - sc->sc_atu_sh, PCIR_MAPS + 0x0c); + sc->sc_atu_sh, PCIR_BARS + 0x0c); sc->sc_iwin[1].iwin_base_lo = PCI_MAPREG_MEM_ADDR(sc->sc_iwin[1].iwin_base_lo); } @@ -151,14 +151,14 @@ i80321_attach(struct i80321_softc *sc) if (sc->sc_is_host) { bus_space_write_4(sc->sc_st, sc->sc_atu_sh, - PCIR_MAPS + 0x10, sc->sc_iwin[2].iwin_base_lo); + PCIR_BARS + 0x10, sc->sc_iwin[2].iwin_base_lo); bus_space_write_4(sc->sc_st, sc->sc_atu_sh, - PCIR_MAPS + 0x14, sc->sc_iwin[2].iwin_base_hi); + PCIR_BARS + 0x14, sc->sc_iwin[2].iwin_base_hi); } else { sc->sc_iwin[2].iwin_base_lo = bus_space_read_4(sc->sc_st, - sc->sc_atu_sh, PCIR_MAPS + 0x10); + sc->sc_atu_sh, PCIR_BARS + 0x10); sc->sc_iwin[2].iwin_base_hi = bus_space_read_4(sc->sc_st, - sc->sc_atu_sh, PCIR_MAPS + 0x14); + sc->sc_atu_sh, PCIR_BARS + 0x14); sc->sc_iwin[2].iwin_base_lo = PCI_MAPREG_MEM_ADDR(sc->sc_iwin[2].iwin_base_lo); } diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c index 750ce2241821..661bf05c3e1a 100644 --- a/sys/arm/xscale/i80321/iq80321.c +++ b/sys/arm/xscale/i80321/iq80321.c @@ -154,10 +154,10 @@ iq80321_attach(device_t dev) * different. This is pretty fragile, but it's not clear what * would work better. */ - b0l = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_MAPS+0x0); - b0u = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_MAPS+0x4); - b1l = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_MAPS+0x8); - b1u = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_MAPS+0xc); + b0l = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_BARS+0x0); + b0u = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_BARS+0x4); + b1l = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_BARS+0x8); + b1u = bus_space_read_4(sc->sc_st, sc->sc_atu_sh, PCIR_BARS+0xc); #define PCI_MAPREG_MEM_ADDR_MASK 0xfffffff0 b0l &= PCI_MAPREG_MEM_ADDR_MASK; b0u &= PCI_MAPREG_MEM_ADDR_MASK; @@ -258,6 +258,7 @@ iq80321_attach(device_t dev) device_add_child(dev, "pcib", busno); bus_generic_probe(dev); bus_generic_attach(dev); + printf("attach\n"); return (0); } |