Mercurial > ecos
changeset 1659:e2264d5f9337
* src/if_cs8900a.c: Drop "ghost" frames with zero length
| author | jlarmour |
|---|---|
| date | Thu, 27 May 2004 06:48:47 +0000 |
| parents | 79f7073a7a00 |
| children | eb74917a64e1 |
| files | packages/devs/eth/cl/cs8900a/current/ChangeLog packages/devs/eth/cl/cs8900a/current/src/if_cs8900a.c |
| diffstat | 2 files changed, 18 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/devs/eth/cl/cs8900a/current/ChangeLog +++ b/packages/devs/eth/cl/cs8900a/current/ChangeLog @@ -1,3 +1,6 @@ +2004-05-07 Bob Koninckx <bob.koninckx@o-3s.com> + * src/if_cs8900a.c: Drop "ghost" frames with zero length + 2004-04-19 Bob Koninckx <bob.koninckx@o-3s.com> * src/if_cs8900a.c: function cs8900a_int_vector, return the vector instead of a boolean.
--- a/packages/devs/eth/cl/cs8900a/current/src/if_cs8900a.c +++ b/packages/devs/eth/cl/cs8900a/current/src/if_cs8900a.c @@ -533,25 +533,30 @@ cs8900a_send(struct eth_drv_sc *sc, stru // the upper layer is ready to unload the packet, the internal function // 'cs8900a_recv' will be called to actually fetch it from the hardware. static void -cs8900a_RxEvent(struct eth_drv_sc *sc) +cs8900a_RxEvent(struct eth_drv_sc *sc, int stat) { cs8900a_priv_data_t *cpd = (cs8900a_priv_data_t *)sc->driver_private; cyg_addrword_t base = cpd->base; - cyg_uint16 stat, len; + cyg_uint16 len; - HAL_READ_UINT16(base+CS8900A_RTDATA, stat); - HAL_READ_UINT16(base+CS8900A_RTDATA, len); + if(stat & PP_RxCFG_RxOK) { + // Only start reading a message if one has been received + HAL_READ_UINT16(base+CS8900A_RTDATA, stat); + HAL_READ_UINT16(base+CS8900A_RTDATA, len); #ifdef CYGIMP_DEVS_ETH_CL_CS8900A_DATABUS_BYTE_SWAPPED - len = CYG_SWAP16(len); + len = CYG_SWAP16(len); #endif + + CYG_ASSERT(len > 0, "Zero length ethernet frame received"); #ifdef CYGDBG_IO_ETH_DRIVERS_DEBUG - if (cyg_io_eth_net_debug) { - diag_printf("RxEvent - stat: %x, len: %d\n", stat, len); + if (cyg_io_eth_net_debug) { + diag_printf("RxEvent - stat: %x, len: %d\n", stat, len); + } +#endif + (sc->funs->eth_drv->recv)(sc, len); } -#endif - (sc->funs->eth_drv->recv)(sc, len); } // This function is called as a result of the "eth_drv_recv()" call above. @@ -636,7 +641,7 @@ cs8900a_poll(struct eth_drv_sc *sc) while (event != 0) { switch (event & ISQ_EventMask) { case ISQ_RxEvent: - cs8900a_RxEvent(sc); + cs8900a_RxEvent(sc, event); break; case ISQ_TxEvent: cs8900a_TxEvent(sc, event);