PERFORCE change 103274 for review

[Paolo Pisati]

http://perforce.freebsd.org/chv.cgi?CH=103274

Change 103274 by piso at piso_newluxor on 2006/08/05 20:04:47

	compilation

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#10 edit
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#2 edit
.. //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#2 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#10 (text+ko) ====

@@ -1229,9 +1229,9 @@
 	 * It should be possible to run the tx clean loop without the lock.
 	 */
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-		em_rxeof(sc, sc->rx_process_limit);
-		EM_LOCK(sc);
-		em_txeof(sc);
+		em_rxeof(adapter, adapter->rx_process_limit);
+		EM_LOCK(adapter);
+		em_txeof(adapter);
 
 		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 			em_start_locked(ifp);
@@ -1279,7 +1279,7 @@
 	 * cheap, just assume that it is needed.  This also works around the
 	 * MSI message reordering errata on certain systems.
 	 */
-	em_disable_intr(sc);
+	em_disable_intr(adapter);
 
 	/* Link status change */
 	if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))
@@ -2040,8 +2040,8 @@
 	E1000_WRITE_REG(&adapter->hw, IMC, 0xffffffff);
 
 #ifdef DEVICE_POLLING
-	if (sc->int_handler_tag == NULL && (error = bus_setup_intr(dev,
-	    sc->res_interrupt, INTR_TYPE_NET | INTR_MPSAFE, NULL, em_intr, 
+	if (adapter->int_handler_tag == NULL && (error = bus_setup_intr(dev,
+	    adapter->res_interrupt, INTR_TYPE_NET | INTR_MPSAFE, NULL, em_intr, 
 	    adapter, &adapter->int_handler_tag)) != 0) {
 		device_printf(dev, "Failed to register interrupt handler");
 		return (error);
@@ -2052,9 +2052,9 @@
 	 * processing contexts.
 	 */
 	TASK_INIT(&adapter->link_task, 0, em_handle_link, adapter);
-	if ((error = bus_setup_intr(dev, sc->res_interrupt,
-	    INTR_TYPE_NET | INTR_MPSAFE, em_intr_fast, em_handle_rxtx, sc,
-	    &sc->int_handler_tag)) != 0) {
+	if ((error = bus_setup_intr(dev, adapter->res_interrupt,
+	    INTR_TYPE_NET | INTR_MPSAFE, em_intr_fast, em_handle_rxtx, adapter,
+	    &adapter->int_handler_tag)) != 0) {
 		device_printf(dev, "Failed to register fast interrupt "
 			    "handler: %d\n", error);
 		return (error);

==== //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#2 (text+ko) ====

@@ -2718,7 +2718,7 @@
 
 	i = 0;
 	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE);
-	if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, emu_intr, sc, &sc->ih)) {
+	if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE | INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) {
 		device_printf(dev, "unable to map interrupt\n");
 		goto bad;
 	}

==== //depot/projects/soc2006/intr_filter/dev/stge/if_stge.c#2 (text+ko) ====

@@ -809,7 +809,7 @@
 	 * Hookup IRQ
 	 */
 	error = bus_setup_intr(dev, sc->sc_res[1], INTR_TYPE_NET | INTR_MPSAFE,
-	    stge_intr, sc, &sc->sc_ih);
+	    NULL, stge_intr, sc, &sc->sc_ih);
 	if (error != 0) {
 		ether_ifdetach(ifp);
 		device_printf(sc->sc_dev, "couldn't set up IRQ\n");