X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d401e73e740bcf5e7d1b66aeae9839493a8c1686..f8903fddbc2a42d68bfe42a0fb6cf93ed3a14277:/net/3c90x.c diff --git a/net/3c90x.c b/net/3c90x.c index ea7914c..30283a2 100644 --- a/net/3c90x.c +++ b/net/3c90x.c @@ -480,6 +480,20 @@ a3c90x_transmit(struct pbuf *p) unsigned char status; static unsigned int stillwaiting = 0; unsigned int n, len; + + if (stillwaiting) + { + while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running()) + ; + if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE)) + { + outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b)); + outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w)); + } + status = inb(INF_3C90X.IOAddr + regTxStatus_b); + outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00); + stillwaiting = 0; + } _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */); @@ -514,19 +528,6 @@ a3c90x_transmit(struct pbuf *p) oneshot_start_ms(10); stillwaiting = 1; - if (stillwaiting) - { - while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running()) - ; - if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE)) - { - outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b)); - outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w)); - } - status = inb(INF_3C90X.IOAddr + regTxStatus_b); - outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00); - stillwaiting = 0; - } #if 0 /** successful completion (sans "interrupt Requested" bit) **/