Mercurial > ecos-v3_0-branch
changeset 2430:02f46cba57b5
* src/if_i82559.c (eth_dsr): Fixed the previous change which broken
linkage under some conditions.
| author | asl |
|---|---|
| date | Sat, 15 Sep 2007 13:57:39 +0000 |
| parents | b0a173ce7ffd |
| children | 399925e8f1ee |
| files | packages/devs/eth/intel/i82559/current/ChangeLog packages/devs/eth/intel/i82559/current/src/if_i82559.c |
| diffstat | 2 files changed, 11 insertions(+), 7 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,8 @@ +2007-06-12 Andrew Lunn <andrew.lunn@ascom.ch> + + * src/if_i82559.c (eth_dsr): Fixed the previous change which broken + linkage under some conditions. + 2006-11-23 David Fernandez <dfernandez@cct.co.uk> * src/if_i82559.c Modifications to remove compile warnings.
--- a/packages/devs/eth/intel/i82559/current/src/if_i82559.c +++ b/packages/devs/eth/intel/i82559/current/src/if_i82559.c @@ -907,9 +907,9 @@ static void ResetRxRing(struct i82559* p static void InitTxRing(struct i82559* p_i82559); static void ResetTxRing(struct i82559* p_i82559); -#if defined(CYGHWR_DEVS_ETH_INTEL_I82559_MISSED_INTERRUPT) \ -|| (defined(CYGNUM_DEVS_ETH_INTEL_I82559_SEPARATE_MUX_INTERRUPT) && \ - !defined(CYGPKG_IO_ETH_DRIVERS_STAND_ALONE) ) +#if defined(CYGHWR_DEVS_ETH_INTEL_I82559_MISSED_INTERRUPT) || \ + defined(CYGNUM_DEVS_ETH_INTEL_I82559_SEPARATE_MUX_INTERRUPT) || \ + !defined(CYGPKG_IO_ETH_DRIVERS_STAND_ALONE) static void eth_dsr(cyg_vector_t vector, cyg_ucount32 count, cyg_addrword_t data); #endif @@ -2713,10 +2713,9 @@ eth_mux_isr(cyg_vector_t vector, cyg_add // ------------------------------------------------------------------------ -#if defined(CYGHWR_DEVS_ETH_INTEL_I82559_MISSED_INTERRUPT) \ -|| (defined(CYGNUM_DEVS_ETH_INTEL_I82559_SEPARATE_MUX_INTERRUPT) && \ - !defined(CYGPKG_IO_ETH_DRIVERS_STAND_ALONE) ) - +#if defined(CYGHWR_DEVS_ETH_INTEL_I82559_MISSED_INTERRUPT) || \ + defined(CYGNUM_DEVS_ETH_INTEL_I82559_SEPARATE_MUX_INTERRUPT) || \ + !defined(CYGPKG_IO_ETH_DRIVERS_STAND_ALONE) static void eth_dsr(cyg_vector_t vector, cyg_ucount32 count, cyg_addrword_t data) {