31c31
< __FBSDID("$FreeBSD: head/sys/dev/gem/if_gem.c 164931 2006-12-06 02:04:25Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/gem/if_gem.c 169269 2007-05-04 19:15:28Z phk $");
57a58
> #include <sys/rman.h>
260c261
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_FIFO_SIZE);
---
> bus_read_4(sc->sc_res[0], GEM_RX_FIFO_SIZE);
263c264
< v = bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_FIFO_SIZE);
---
> v = bus_read_4(sc->sc_res[0], GEM_TX_FIFO_SIZE);
318c319
< bus_space_write_4(sc->sc_bustag, sc->sc_h, GEM_MIF_CONFIG,
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG,
562c563
< reg = bus_space_read_4(sc->sc_bustag, sc->sc_h, r);
---
> reg = bus_read_4(sc->sc_res[0], r);
573,574d573
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
583c582
< bus_space_write_4(t, h, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX);
---
> bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX | GEM_RESET_TX);
671,672d669
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
679c676
< bus_space_write_4(t, h, GEM_RX_CONFIG, 0);
---
> bus_write_4(sc->sc_res[0], GEM_RX_CONFIG, 0);
688c685
< bus_space_write_4(t, h, GEM_RESET, GEM_RESET_RX);
---
> bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX);
705,706d701
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
714c709
< bus_space_write_4(t, h, GEM_TX_CONFIG, 0);
---
> bus_write_4(sc->sc_res[0], GEM_TX_CONFIG, 0);
723c718
< bus_space_write_4(t, h, GEM_RESET, GEM_RESET_TX);
---
> bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_TX);
726c721
< if ((bus_space_read_4(t, h, GEM_RESET) & GEM_RESET_TX) == 0)
---
> if ((bus_read_4(sc->sc_res[0], GEM_RESET) & GEM_RESET_TX) == 0)
742,743d736
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
747c740
< cfg = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG);
---
> cfg = bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG);
749c742
< bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, cfg);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CONFIG, cfg);
762,763d754
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
767c758
< cfg = bus_space_read_4(t, h, GEM_MAC_TX_CONFIG);
---
> cfg = bus_read_4(sc->sc_res[0], GEM_MAC_TX_CONFIG);
769c760
< bus_space_write_4(t, h, GEM_MAC_TX_CONFIG, cfg);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_CONFIG, cfg);
885,886d875
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
922,923c911,912
< bus_space_write_4(t, h, GEM_TX_RING_PTR_HI, 0);
< bus_space_write_4(t, h, GEM_TX_RING_PTR_LO, GEM_CDTXADDR(sc, 0));
---
> bus_write_4(sc->sc_res[0], GEM_TX_RING_PTR_HI, 0);
> bus_write_4(sc->sc_res[0], GEM_TX_RING_PTR_LO, GEM_CDTXADDR(sc, 0));
925,926c914,915
< bus_space_write_4(t, h, GEM_RX_RING_PTR_HI, 0);
< bus_space_write_4(t, h, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0));
---
> bus_write_4(sc->sc_res[0], GEM_RX_RING_PTR_HI, 0);
> bus_write_4(sc->sc_res[0], GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0));
933c922
< bus_space_write_4(t, h, GEM_INTMASK,
---
> bus_write_4(sc->sc_res[0], GEM_INTMASK,
940c929
< bus_space_write_4(t, h, GEM_MAC_RX_MASK,
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_MASK,
942,943c931,932
< bus_space_write_4(t, h, GEM_MAC_TX_MASK, 0xffff); /* XXXX */
< bus_space_write_4(t, h, GEM_MAC_CONTROL_MASK, 0); /* XXXX */
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_MASK, 0xffff); /* XXXX */
> bus_write_4(sc->sc_res[0], GEM_MAC_CONTROL_MASK, 0); /* XXXX */
949c938
< bus_space_write_4(t, h, GEM_TX_CONFIG,
---
> bus_write_4(sc->sc_res[0], GEM_TX_CONFIG,
959c948
< bus_space_write_4(t, h, GEM_RX_CONFIG,
---
> bus_write_4(sc->sc_res[0], GEM_RX_CONFIG,
967c956
< bus_space_write_4(t, h, GEM_RX_PAUSE_THRESH,
---
> bus_write_4(sc->sc_res[0], GEM_RX_PAUSE_THRESH,
970c959
< bus_space_write_4(t, h, GEM_RX_BLANKING, (6<<12)|6);
---
> bus_write_4(sc->sc_res[0], GEM_RX_BLANKING, (6<<12)|6);
976c965
< v = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG);
978c967
< bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CONFIG, v);
983c972
< bus_space_write_4(t, h, GEM_RX_KICK, GEM_NRXDESC-4);
---
> bus_write_4(sc->sc_res[0], GEM_RX_KICK, GEM_NRXDESC-4);
1049,1050d1037
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
1058,1060c1045,1047
< bus_space_write_4(t, h, GEM_MAC_IPG0, 0);
< bus_space_write_4(t, h, GEM_MAC_IPG1, 8);
< bus_space_write_4(t, h, GEM_MAC_IPG2, 4);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_IPG0, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_IPG1, 8);
> bus_write_4(sc->sc_res[0], GEM_MAC_IPG2, 4);
1062c1049
< bus_space_write_4(t, h, GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN);
1064c1051
< bus_space_write_4(t, h, GEM_MAC_MAC_MAX_FRAME,
---
> bus_write_4(sc->sc_res[0], GEM_MAC_MAC_MAX_FRAME,
1068,1070c1055,1057
< bus_space_write_4(t, h, GEM_MAC_PREAMBLE_LEN, 0x7);
< bus_space_write_4(t, h, GEM_MAC_JAM_SIZE, 0x4);
< bus_space_write_4(t, h, GEM_MAC_ATTEMPT_LIMIT, 0x10);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_PREAMBLE_LEN, 0x7);
> bus_write_4(sc->sc_res[0], GEM_MAC_JAM_SIZE, 0x4);
> bus_write_4(sc->sc_res[0], GEM_MAC_ATTEMPT_LIMIT, 0x10);
1072,1073c1059,1060
< bus_space_write_4(t, h, GEM_MAC_CONTROL_TYPE, 0x8088);
< bus_space_write_4(t, h, GEM_MAC_RANDOM_SEED,
---
> bus_write_4(sc->sc_res[0], GEM_MAC_CONTROL_TYPE, 0x8088);
> bus_write_4(sc->sc_res[0], GEM_MAC_RANDOM_SEED,
1077,1079c1064,1066
< bus_space_write_4(t, h, GEM_MAC_ADDR3, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR4, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR5, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR3, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR4, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR5, 0);
1082,1084c1069,1071
< bus_space_write_4(t, h, GEM_MAC_ADDR6, 0x0001);
< bus_space_write_4(t, h, GEM_MAC_ADDR7, 0xc200);
< bus_space_write_4(t, h, GEM_MAC_ADDR8, 0x0180);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR6, 0x0001);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR7, 0xc200);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR8, 0x0180);
1087,1089c1074,1076
< bus_space_write_4(t, h, GEM_MAC_ADDR_FILTER0, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR_FILTER1, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR_FILTER2, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR_FILTER0, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR_FILTER1, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR_FILTER2, 0);
1091,1092c1078,1079
< bus_space_write_4(t, h, GEM_MAC_ADR_FLT_MASK1_2, 0);
< bus_space_write_4(t, h, GEM_MAC_ADR_FLT_MASK0, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADR_FLT_MASK1_2, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADR_FLT_MASK0, 0);
1098,1108c1085,1095
< bus_space_write_4(t, h, GEM_MAC_NORM_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_FIRST_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_EXCESS_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_LATE_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_DEFER_TMR_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_PEAK_ATTEMPTS, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_FRAME_COUNT, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_LEN_ERR_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_ALIGN_ERR, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_CRC_ERR_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_CODE_VIOL, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_EXCESS_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_DEFER_TMR_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_PEAK_ATTEMPTS, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_FRAME_COUNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_LEN_ERR_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_ALIGN_ERR, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CRC_ERR_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CODE_VIOL, 0);
1112c1099
< bus_space_write_4(t, h, GEM_MAC_SEND_PAUSE_CMD, 0x1BF0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_SEND_PAUSE_CMD, 0x1BF0);
1114c1101
< bus_space_write_4(t, h, GEM_MAC_SEND_PAUSE_CMD, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_SEND_PAUSE_CMD, 0);
1120,1122c1107,1109
< bus_space_write_4(t, h, GEM_MAC_ADDR0, (laddr[4]<<8)|laddr[5]);
< bus_space_write_4(t, h, GEM_MAC_ADDR1, (laddr[2]<<8)|laddr[3]);
< bus_space_write_4(t, h, GEM_MAC_ADDR2, (laddr[0]<<8)|laddr[1]);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR0, (laddr[4]<<8)|laddr[5]);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR1, (laddr[2]<<8)|laddr[3]);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR2, (laddr[0]<<8)|laddr[1]);
1127c1114
< sc->sc_mif_config = bus_space_read_4(t, h, GEM_MIF_CONFIG);
---
> sc->sc_mif_config = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1134c1121
< bus_space_write_4(t, h, GEM_MAC_XIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_XIF_CONFIG, v);
1207c1194
< bus_space_write_4(sc->sc_bustag, sc->sc_h, GEM_TX_KICK,
---
> bus_write_4(sc->sc_res[0], GEM_TX_KICK,
1243,1244d1229
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mac = sc->sc_h;
1258,1261c1243,1246
< bus_space_read_4(t, mac, GEM_MAC_NORM_COLL_CNT) +
< bus_space_read_4(t, mac, GEM_MAC_FIRST_COLL_CNT) +
< bus_space_read_4(t, mac, GEM_MAC_EXCESS_COLL_CNT) +
< bus_space_read_4(t, mac, GEM_MAC_LATE_COLL_CNT);
---
> bus_read_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT) +
> bus_read_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT) +
> bus_read_4(sc->sc_res[0], GEM_MAC_EXCESS_COLL_CNT) +
> bus_read_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT);
1266,1269c1251,1254
< bus_space_write_4(t, mac, GEM_MAC_NORM_COLL_CNT, 0);
< bus_space_write_4(t, mac, GEM_MAC_FIRST_COLL_CNT, 0);
< bus_space_write_4(t, mac, GEM_MAC_EXCESS_COLL_CNT, 0);
< bus_space_write_4(t, mac, GEM_MAC_LATE_COLL_CNT, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_EXCESS_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT, 0);
1301c1286
< txlast = bus_space_read_4(t, mac, GEM_TX_COMPLETION);
---
> txlast = bus_read_4(sc->sc_res[0], GEM_TX_COMPLETION);
1343,1344c1328,1329
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_STATE_MACHINE),
< ((long long) bus_space_read_4(sc->sc_bustag, sc->sc_h,
---
> bus_read_4(sc->sc_res[0], GEM_TX_STATE_MACHINE),
> ((long long) bus_read_4(sc->sc_res[0],
1346c1331
< bus_space_read_4(sc->sc_bustag, sc->sc_h,
---
> bus_read_4(sc->sc_res[0],
1348c1333
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_COMPLETION));
---
> bus_read_4(sc->sc_res[0], GEM_TX_COMPLETION));
1388,1389d1372
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
1407c1390
< rxcomp = bus_space_read_4(t, h, GEM_RX_COMPLETION);
---
> rxcomp = bus_read_4(sc->sc_res[0], GEM_RX_COMPLETION);
1491c1474
< bus_space_write_4(t, h, GEM_RX_KICK, GEM_PREVRX(i));
---
> bus_write_4(sc->sc_res[0], GEM_RX_KICK, GEM_PREVRX(i));
1496c1479
< sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION));
---
> sc->sc_rxptr, bus_read_4(sc->sc_res[0], GEM_RX_COMPLETION));
1574,1575d1556
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t seb = sc->sc_h;
1579c1560
< status = bus_space_read_4(t, seb, GEM_STATUS);
---
> status = bus_read_4(sc->sc_res[0], GEM_STATUS);
1597c1578
< int txstat = bus_space_read_4(t, seb, GEM_MAC_TX_STATUS);
---
> int txstat = bus_read_4(sc->sc_res[0], GEM_MAC_TX_STATUS);
1605c1586
< int rxstat = bus_space_read_4(t, seb, GEM_MAC_RX_STATUS);
---
> int rxstat = bus_read_4(sc->sc_res[0], GEM_MAC_RX_STATUS);
1629,1631c1610,1612
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_CONFIG),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_STATUS),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_CONFIG));
---
> bus_read_4(sc->sc_res[0], GEM_RX_CONFIG),
> bus_read_4(sc->sc_res[0], GEM_MAC_RX_STATUS),
> bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG));
1634,1636c1615,1617
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_CONFIG),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_TX_STATUS),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_TX_CONFIG));
---
> bus_read_4(sc->sc_res[0], GEM_TX_CONFIG),
> bus_read_4(sc->sc_res[0], GEM_MAC_TX_STATUS),
> bus_read_4(sc->sc_res[0], GEM_MAC_TX_CONFIG));
1657,1658d1637
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mif = sc->sc_h;
1661c1640
< sc->sc_mif_config = bus_space_read_4(t, mif, GEM_MIF_CONFIG);
---
> sc->sc_mif_config = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1663c1642
< bus_space_write_4(t, mif, GEM_MIF_CONFIG, sc->sc_mif_config);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, sc->sc_mif_config);
1686,1687d1664
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mif = sc->sc_h;
1697c1674
< v = bus_space_read_4(t, mif, GEM_MIF_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1703c1680
< bus_space_write_4(t, mif, GEM_MIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, v);
1710c1687
< bus_space_write_4(t, mif, GEM_MIF_FRAME, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_FRAME, v);
1713c1690
< v = bus_space_read_4(t, mif, GEM_MIF_FRAME);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_FRAME);
1728,1729d1704
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mif = sc->sc_h;
1739c1714
< v = bus_space_read_4(t, mif, GEM_MIF_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1745c1720
< bus_space_write_4(t, mif, GEM_MIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, v);
1753c1728
< bus_space_write_4(t, mif, GEM_MIF_FRAME, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_FRAME, v);
1756c1731
< v = bus_space_read_4(t, mif, GEM_MIF_FRAME);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_FRAME);
1773,1774d1747
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mac = sc->sc_h;
1785c1758
< bus_space_write_4(t, mac, GEM_MAC_TX_CONFIG, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_CONFIG, 0);
1792c1765
< bus_space_write_4(t, mac, GEM_MAC_TX_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_CONFIG, v);
1799c1772
< sc->sc_mif_config = bus_space_read_4(t, mac, GEM_MIF_CONFIG);
---
> sc->sc_mif_config = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1817c1790
< bus_space_write_4(t, mac, GEM_MAC_XIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_XIF_CONFIG, v);
1914,1915d1886
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
1924c1895
< v = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG);
1977c1948
< bus_space_write_4(t, h,
---
> bus_write_4(sc->sc_res[0],
1983c1954
< bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CONFIG, v);
< __FBSDID("$FreeBSD: head/sys/dev/gem/if_gem.c 164931 2006-12-06 02:04:25Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/gem/if_gem.c 169269 2007-05-04 19:15:28Z phk $");
57a58
> #include <sys/rman.h>
260c261
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_FIFO_SIZE);
---
> bus_read_4(sc->sc_res[0], GEM_RX_FIFO_SIZE);
263c264
< v = bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_FIFO_SIZE);
---
> v = bus_read_4(sc->sc_res[0], GEM_TX_FIFO_SIZE);
318c319
< bus_space_write_4(sc->sc_bustag, sc->sc_h, GEM_MIF_CONFIG,
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG,
562c563
< reg = bus_space_read_4(sc->sc_bustag, sc->sc_h, r);
---
> reg = bus_read_4(sc->sc_res[0], r);
573,574d573
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
583c582
< bus_space_write_4(t, h, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX);
---
> bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX | GEM_RESET_TX);
671,672d669
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
679c676
< bus_space_write_4(t, h, GEM_RX_CONFIG, 0);
---
> bus_write_4(sc->sc_res[0], GEM_RX_CONFIG, 0);
688c685
< bus_space_write_4(t, h, GEM_RESET, GEM_RESET_RX);
---
> bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX);
705,706d701
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
714c709
< bus_space_write_4(t, h, GEM_TX_CONFIG, 0);
---
> bus_write_4(sc->sc_res[0], GEM_TX_CONFIG, 0);
723c718
< bus_space_write_4(t, h, GEM_RESET, GEM_RESET_TX);
---
> bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_TX);
726c721
< if ((bus_space_read_4(t, h, GEM_RESET) & GEM_RESET_TX) == 0)
---
> if ((bus_read_4(sc->sc_res[0], GEM_RESET) & GEM_RESET_TX) == 0)
742,743d736
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
747c740
< cfg = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG);
---
> cfg = bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG);
749c742
< bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, cfg);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CONFIG, cfg);
762,763d754
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
767c758
< cfg = bus_space_read_4(t, h, GEM_MAC_TX_CONFIG);
---
> cfg = bus_read_4(sc->sc_res[0], GEM_MAC_TX_CONFIG);
769c760
< bus_space_write_4(t, h, GEM_MAC_TX_CONFIG, cfg);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_CONFIG, cfg);
885,886d875
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
922,923c911,912
< bus_space_write_4(t, h, GEM_TX_RING_PTR_HI, 0);
< bus_space_write_4(t, h, GEM_TX_RING_PTR_LO, GEM_CDTXADDR(sc, 0));
---
> bus_write_4(sc->sc_res[0], GEM_TX_RING_PTR_HI, 0);
> bus_write_4(sc->sc_res[0], GEM_TX_RING_PTR_LO, GEM_CDTXADDR(sc, 0));
925,926c914,915
< bus_space_write_4(t, h, GEM_RX_RING_PTR_HI, 0);
< bus_space_write_4(t, h, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0));
---
> bus_write_4(sc->sc_res[0], GEM_RX_RING_PTR_HI, 0);
> bus_write_4(sc->sc_res[0], GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0));
933c922
< bus_space_write_4(t, h, GEM_INTMASK,
---
> bus_write_4(sc->sc_res[0], GEM_INTMASK,
940c929
< bus_space_write_4(t, h, GEM_MAC_RX_MASK,
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_MASK,
942,943c931,932
< bus_space_write_4(t, h, GEM_MAC_TX_MASK, 0xffff); /* XXXX */
< bus_space_write_4(t, h, GEM_MAC_CONTROL_MASK, 0); /* XXXX */
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_MASK, 0xffff); /* XXXX */
> bus_write_4(sc->sc_res[0], GEM_MAC_CONTROL_MASK, 0); /* XXXX */
949c938
< bus_space_write_4(t, h, GEM_TX_CONFIG,
---
> bus_write_4(sc->sc_res[0], GEM_TX_CONFIG,
959c948
< bus_space_write_4(t, h, GEM_RX_CONFIG,
---
> bus_write_4(sc->sc_res[0], GEM_RX_CONFIG,
967c956
< bus_space_write_4(t, h, GEM_RX_PAUSE_THRESH,
---
> bus_write_4(sc->sc_res[0], GEM_RX_PAUSE_THRESH,
970c959
< bus_space_write_4(t, h, GEM_RX_BLANKING, (6<<12)|6);
---
> bus_write_4(sc->sc_res[0], GEM_RX_BLANKING, (6<<12)|6);
976c965
< v = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG);
978c967
< bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CONFIG, v);
983c972
< bus_space_write_4(t, h, GEM_RX_KICK, GEM_NRXDESC-4);
---
> bus_write_4(sc->sc_res[0], GEM_RX_KICK, GEM_NRXDESC-4);
1049,1050d1037
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
1058,1060c1045,1047
< bus_space_write_4(t, h, GEM_MAC_IPG0, 0);
< bus_space_write_4(t, h, GEM_MAC_IPG1, 8);
< bus_space_write_4(t, h, GEM_MAC_IPG2, 4);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_IPG0, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_IPG1, 8);
> bus_write_4(sc->sc_res[0], GEM_MAC_IPG2, 4);
1062c1049
< bus_space_write_4(t, h, GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN);
1064c1051
< bus_space_write_4(t, h, GEM_MAC_MAC_MAX_FRAME,
---
> bus_write_4(sc->sc_res[0], GEM_MAC_MAC_MAX_FRAME,
1068,1070c1055,1057
< bus_space_write_4(t, h, GEM_MAC_PREAMBLE_LEN, 0x7);
< bus_space_write_4(t, h, GEM_MAC_JAM_SIZE, 0x4);
< bus_space_write_4(t, h, GEM_MAC_ATTEMPT_LIMIT, 0x10);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_PREAMBLE_LEN, 0x7);
> bus_write_4(sc->sc_res[0], GEM_MAC_JAM_SIZE, 0x4);
> bus_write_4(sc->sc_res[0], GEM_MAC_ATTEMPT_LIMIT, 0x10);
1072,1073c1059,1060
< bus_space_write_4(t, h, GEM_MAC_CONTROL_TYPE, 0x8088);
< bus_space_write_4(t, h, GEM_MAC_RANDOM_SEED,
---
> bus_write_4(sc->sc_res[0], GEM_MAC_CONTROL_TYPE, 0x8088);
> bus_write_4(sc->sc_res[0], GEM_MAC_RANDOM_SEED,
1077,1079c1064,1066
< bus_space_write_4(t, h, GEM_MAC_ADDR3, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR4, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR5, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR3, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR4, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR5, 0);
1082,1084c1069,1071
< bus_space_write_4(t, h, GEM_MAC_ADDR6, 0x0001);
< bus_space_write_4(t, h, GEM_MAC_ADDR7, 0xc200);
< bus_space_write_4(t, h, GEM_MAC_ADDR8, 0x0180);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR6, 0x0001);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR7, 0xc200);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR8, 0x0180);
1087,1089c1074,1076
< bus_space_write_4(t, h, GEM_MAC_ADDR_FILTER0, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR_FILTER1, 0);
< bus_space_write_4(t, h, GEM_MAC_ADDR_FILTER2, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR_FILTER0, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR_FILTER1, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR_FILTER2, 0);
1091,1092c1078,1079
< bus_space_write_4(t, h, GEM_MAC_ADR_FLT_MASK1_2, 0);
< bus_space_write_4(t, h, GEM_MAC_ADR_FLT_MASK0, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADR_FLT_MASK1_2, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADR_FLT_MASK0, 0);
1098,1108c1085,1095
< bus_space_write_4(t, h, GEM_MAC_NORM_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_FIRST_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_EXCESS_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_LATE_COLL_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_DEFER_TMR_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_PEAK_ATTEMPTS, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_FRAME_COUNT, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_LEN_ERR_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_ALIGN_ERR, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_CRC_ERR_CNT, 0);
< bus_space_write_4(t, h, GEM_MAC_RX_CODE_VIOL, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_EXCESS_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_DEFER_TMR_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_PEAK_ATTEMPTS, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_FRAME_COUNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_LEN_ERR_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_ALIGN_ERR, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CRC_ERR_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CODE_VIOL, 0);
1112c1099
< bus_space_write_4(t, h, GEM_MAC_SEND_PAUSE_CMD, 0x1BF0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_SEND_PAUSE_CMD, 0x1BF0);
1114c1101
< bus_space_write_4(t, h, GEM_MAC_SEND_PAUSE_CMD, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_SEND_PAUSE_CMD, 0);
1120,1122c1107,1109
< bus_space_write_4(t, h, GEM_MAC_ADDR0, (laddr[4]<<8)|laddr[5]);
< bus_space_write_4(t, h, GEM_MAC_ADDR1, (laddr[2]<<8)|laddr[3]);
< bus_space_write_4(t, h, GEM_MAC_ADDR2, (laddr[0]<<8)|laddr[1]);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR0, (laddr[4]<<8)|laddr[5]);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR1, (laddr[2]<<8)|laddr[3]);
> bus_write_4(sc->sc_res[0], GEM_MAC_ADDR2, (laddr[0]<<8)|laddr[1]);
1127c1114
< sc->sc_mif_config = bus_space_read_4(t, h, GEM_MIF_CONFIG);
---
> sc->sc_mif_config = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1134c1121
< bus_space_write_4(t, h, GEM_MAC_XIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_XIF_CONFIG, v);
1207c1194
< bus_space_write_4(sc->sc_bustag, sc->sc_h, GEM_TX_KICK,
---
> bus_write_4(sc->sc_res[0], GEM_TX_KICK,
1243,1244d1229
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mac = sc->sc_h;
1258,1261c1243,1246
< bus_space_read_4(t, mac, GEM_MAC_NORM_COLL_CNT) +
< bus_space_read_4(t, mac, GEM_MAC_FIRST_COLL_CNT) +
< bus_space_read_4(t, mac, GEM_MAC_EXCESS_COLL_CNT) +
< bus_space_read_4(t, mac, GEM_MAC_LATE_COLL_CNT);
---
> bus_read_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT) +
> bus_read_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT) +
> bus_read_4(sc->sc_res[0], GEM_MAC_EXCESS_COLL_CNT) +
> bus_read_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT);
1266,1269c1251,1254
< bus_space_write_4(t, mac, GEM_MAC_NORM_COLL_CNT, 0);
< bus_space_write_4(t, mac, GEM_MAC_FIRST_COLL_CNT, 0);
< bus_space_write_4(t, mac, GEM_MAC_EXCESS_COLL_CNT, 0);
< bus_space_write_4(t, mac, GEM_MAC_LATE_COLL_CNT, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_NORM_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_FIRST_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_EXCESS_COLL_CNT, 0);
> bus_write_4(sc->sc_res[0], GEM_MAC_LATE_COLL_CNT, 0);
1301c1286
< txlast = bus_space_read_4(t, mac, GEM_TX_COMPLETION);
---
> txlast = bus_read_4(sc->sc_res[0], GEM_TX_COMPLETION);
1343,1344c1328,1329
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_STATE_MACHINE),
< ((long long) bus_space_read_4(sc->sc_bustag, sc->sc_h,
---
> bus_read_4(sc->sc_res[0], GEM_TX_STATE_MACHINE),
> ((long long) bus_read_4(sc->sc_res[0],
1346c1331
< bus_space_read_4(sc->sc_bustag, sc->sc_h,
---
> bus_read_4(sc->sc_res[0],
1348c1333
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_COMPLETION));
---
> bus_read_4(sc->sc_res[0], GEM_TX_COMPLETION));
1388,1389d1372
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
1407c1390
< rxcomp = bus_space_read_4(t, h, GEM_RX_COMPLETION);
---
> rxcomp = bus_read_4(sc->sc_res[0], GEM_RX_COMPLETION);
1491c1474
< bus_space_write_4(t, h, GEM_RX_KICK, GEM_PREVRX(i));
---
> bus_write_4(sc->sc_res[0], GEM_RX_KICK, GEM_PREVRX(i));
1496c1479
< sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION));
---
> sc->sc_rxptr, bus_read_4(sc->sc_res[0], GEM_RX_COMPLETION));
1574,1575d1556
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t seb = sc->sc_h;
1579c1560
< status = bus_space_read_4(t, seb, GEM_STATUS);
---
> status = bus_read_4(sc->sc_res[0], GEM_STATUS);
1597c1578
< int txstat = bus_space_read_4(t, seb, GEM_MAC_TX_STATUS);
---
> int txstat = bus_read_4(sc->sc_res[0], GEM_MAC_TX_STATUS);
1605c1586
< int rxstat = bus_space_read_4(t, seb, GEM_MAC_RX_STATUS);
---
> int rxstat = bus_read_4(sc->sc_res[0], GEM_MAC_RX_STATUS);
1629,1631c1610,1612
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_CONFIG),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_STATUS),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_CONFIG));
---
> bus_read_4(sc->sc_res[0], GEM_RX_CONFIG),
> bus_read_4(sc->sc_res[0], GEM_MAC_RX_STATUS),
> bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG));
1634,1636c1615,1617
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_CONFIG),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_TX_STATUS),
< bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_TX_CONFIG));
---
> bus_read_4(sc->sc_res[0], GEM_TX_CONFIG),
> bus_read_4(sc->sc_res[0], GEM_MAC_TX_STATUS),
> bus_read_4(sc->sc_res[0], GEM_MAC_TX_CONFIG));
1657,1658d1637
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mif = sc->sc_h;
1661c1640
< sc->sc_mif_config = bus_space_read_4(t, mif, GEM_MIF_CONFIG);
---
> sc->sc_mif_config = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1663c1642
< bus_space_write_4(t, mif, GEM_MIF_CONFIG, sc->sc_mif_config);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, sc->sc_mif_config);
1686,1687d1664
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mif = sc->sc_h;
1697c1674
< v = bus_space_read_4(t, mif, GEM_MIF_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1703c1680
< bus_space_write_4(t, mif, GEM_MIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, v);
1710c1687
< bus_space_write_4(t, mif, GEM_MIF_FRAME, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_FRAME, v);
1713c1690
< v = bus_space_read_4(t, mif, GEM_MIF_FRAME);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_FRAME);
1728,1729d1704
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mif = sc->sc_h;
1739c1714
< v = bus_space_read_4(t, mif, GEM_MIF_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1745c1720
< bus_space_write_4(t, mif, GEM_MIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, v);
1753c1728
< bus_space_write_4(t, mif, GEM_MIF_FRAME, v);
---
> bus_write_4(sc->sc_res[0], GEM_MIF_FRAME, v);
1756c1731
< v = bus_space_read_4(t, mif, GEM_MIF_FRAME);
---
> v = bus_read_4(sc->sc_res[0], GEM_MIF_FRAME);
1773,1774d1747
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t mac = sc->sc_h;
1785c1758
< bus_space_write_4(t, mac, GEM_MAC_TX_CONFIG, 0);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_CONFIG, 0);
1792c1765
< bus_space_write_4(t, mac, GEM_MAC_TX_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_TX_CONFIG, v);
1799c1772
< sc->sc_mif_config = bus_space_read_4(t, mac, GEM_MIF_CONFIG);
---
> sc->sc_mif_config = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
1817c1790
< bus_space_write_4(t, mac, GEM_MAC_XIF_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_XIF_CONFIG, v);
1914,1915d1886
< bus_space_tag_t t = sc->sc_bustag;
< bus_space_handle_t h = sc->sc_h;
1924c1895
< v = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG);
---
> v = bus_read_4(sc->sc_res[0], GEM_MAC_RX_CONFIG);
1977c1948
< bus_space_write_4(t, h,
---
> bus_write_4(sc->sc_res[0],
1983c1954
< bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v);
---
> bus_write_4(sc->sc_res[0], GEM_MAC_RX_CONFIG, v);