Mercurial > flash_v2
changeset 359:8b024937045d
* src/if_i82559.c (pci_init_find_82559s): Changed scope of
max_interrupt_handle since its needed in other places.
* src/if_i82559.c (i82559_stop): Corrected wrong name of variable
in a diag_printf function.
| author | asl |
|---|---|
| date | Sun, 06 Oct 2002 13:18:28 +0000 |
| parents | ff7641b16d2a |
| children | a0b2c020f136 |
| files | packages/devs/eth/intel/i82559/current/ChangeLog packages/devs/eth/intel/i82559/current/src/if_i82559.c |
| diffstat | 2 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/devs/eth/intel/i82559/current/ChangeLog +++ b/packages/devs/eth/intel/i82559/current/ChangeLog @@ -1,3 +1,10 @@ +2002-10-06 Andrew Lunn <andrew.lunn@ascom.ch> + + * src/if_i82559.c (pci_init_find_82559s): Changed scope of + max_interrupt_handle since its needed in other places. + * src/if_i82559.c (i82559_stop): Corrected wrong name of variable + in a diag_printf function. + 2002-06-14 Gary Thomas <gary@chez-thomas.org> * src/if_i82559.c:
--- a/packages/devs/eth/intel/i82559/current/src/if_i82559.c +++ b/packages/devs/eth/intel/i82559/current/src/if_i82559.c @@ -1720,7 +1720,8 @@ i82559_stop( struct eth_drv_sc *sc ) #ifdef DEBUG_82559 os_printf("Stop: TxDone %d %x: KEY %x TxCB %x\n", - p_i82559->index, (int)p_i82559, key, p_txcb ); + p_i82559->index, (int)p_i82559, key, + p_i82559->tx_ring[ tx_descriptor_remove ]); #endif // tx_done() can now cope with a NULL key, no guard needed here (sc->funs->eth_drv->tx_done)( sc, key, 1 /* status */ ); @@ -2773,6 +2774,10 @@ pci_init_find_82559s( void ) int device_index; int found_devices = 0; +#ifdef CYGNUM_DEVS_ETH_INTEL_I82559_SEPARATE_MUX_INTERRUPT + static cyg_handle_t mux_interrupt_handle = 0; + #endif + #ifdef DEBUG db_printf("pci_init_find_82559s()\n"); #endif @@ -2849,7 +2854,6 @@ pci_init_find_82559s( void ) // with a rotation of interrupt lines in the different // slots. { - static cyg_handle_t mux_interrupt_handle = 0; static cyg_interrupt mux_interrupt_object; if ( ! mux_interrupt_handle ) {