35c35
< __FBSDID("$FreeBSD: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c 264601 2014-04-17 12:33:26Z bz $");
---
> __FBSDID("$FreeBSD: head/sys/dev/netfpga10g/nf10bmac/if_nf10bmac_fdt.c 265766 2014-05-09 12:59:38Z bz $");
88c88
< * TX (size 0xc), RX (size 0xc), LOOP (size 0x4).
---
> * LOOP (size 0x1f), TX (0x2f), RX (0x2f), INTR (0xf).
90a91,108
> /*
> * LOOP memory region (this could be a general control region).
> * 0x00: 32bit register to enable a Y-"lopback".
> */
> sc->nf10bmac_ctrl_rid = 0;
> sc->nf10bmac_ctrl_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
> &sc->nf10bmac_ctrl_rid, RF_ACTIVE);
> if (sc->nf10bmac_ctrl_res == NULL) {
> device_printf(dev, "failed to map memory for CTRL region\n");
> error = ENXIO;
> goto err;
> }
> if (bootverbose)
> device_printf(sc->nf10bmac_dev, "CTRL region at mem %p-%p\n",
> (void *)rman_get_start(sc->nf10bmac_ctrl_res),
> (void *)(rman_get_start(sc->nf10bmac_ctrl_res) +
> rman_get_size(sc->nf10bmac_ctrl_res)));
>
94,95c112,113
< * 0x04: 32bit FIFO metadata,
< * 0x08: 32bit packet length.
---
> * 0x08: 32bit FIFO metadata,
> * 0x10: 32bit packet length.
97c115
< sc->nf10bmac_tx_mem_rid = 0;
---
> sc->nf10bmac_tx_mem_rid = 1;
114,115c132,133
< * 0x04: 32bit FIFO metadata,
< * 0x08: 32bit packet length.
---
> * 0x08: 32bit FIFO metadata,
> * 0x10: 32bit packet length.
117c135
< sc->nf10bmac_rx_mem_rid = 1;
---
> sc->nf10bmac_rx_mem_rid = 2;
132,133c150,152
< * LOOP memory region (this could be a general control region).
< * 0x00: 32bit register to enable a Y-"lopback".
---
> * Interrupt handling registers.
> * 0x00: 32bit register to clear (and disable) the RX interrupt.
> * 0x08: 32bit register to enable or disable the RX interrupt.
135,139c154,158
< sc->nf10bmac_mem_rid = 2;
< sc->nf10bmac_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
< &sc->nf10bmac_mem_rid, RF_ACTIVE);
< if (sc->nf10bmac_mem_res == NULL) {
< device_printf(dev, "failed to map memory for CTRL region\n");
---
> sc->nf10bmac_intr_rid = 3;
> sc->nf10bmac_intr_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
> &sc->nf10bmac_intr_rid, RF_ACTIVE);
> if (sc->nf10bmac_intr_res == NULL) {
> device_printf(dev, "failed to map memory for INTR region\n");
144,147c163,166
< device_printf(sc->nf10bmac_dev, "CTRL region at mem %p-%p\n",
< (void *)rman_get_start(sc->nf10bmac_mem_res),
< (void *)(rman_get_start(sc->nf10bmac_mem_res) +
< rman_get_size(sc->nf10bmac_mem_res)));
---
> device_printf(sc->nf10bmac_dev, "INTR region at mem %p-%p\n",
> (void *)rman_get_start(sc->nf10bmac_intr_res),
> (void *)(rman_get_start(sc->nf10bmac_intr_res) +
> rman_get_size(sc->nf10bmac_intr_res)));
148a168,172
> /* (Optional) RX and TX IRQ. */
> sc->nf10bmac_rx_irq_rid = 0;
> sc->nf10bmac_rx_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
> &sc->nf10bmac_rx_irq_rid, RF_ACTIVE | RF_SHAREABLE);
>