static struct nic nic;
static txdesc_t txdesc;
static rxdesc_t rxdesc;
+static struct pbuf *currecv;
#define _outl(v,a) outl((a),(v))
*** size - size of the non-header part of the packet that needs transmitted;
*** pkt - the pointer to the packet data itself.
***/
-static void
-a3c90x_transmit(struct pbuf *p)
+static void _transmit(struct pbuf *p)
{
unsigned char status;
static struct pbuf *oldpbuf = NULL;
/** set notification for transmission completion (bit 15) **/
txdesc.hdr = (len) | 0x8000;
- outputf("3c90x: Sending %d byte %d seg packet", len, n);
-
/** Send the packet **/
outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc));
_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
#endif
}
-
-
-/*** a3c90x_poll: exported routine that waits for a certain length of time
- *** for a packet, and if it sees none, returns 0. This routine should
- *** copy the packet to nic->packet if it gets a packet and set the size
- *** in nic->packetlen. Return 1 if a packet was found.
- ***/
-static struct pbuf * a3c90x_poll(struct nic *nic)
+/* _setup_recv allocates and sets a pbuf from lwIP as the active receive
+ * packet chain for the 3c90x. The 3c90x must not be trying to receive
+ * when _setup_recv is being called.
+ */
+static void _setup_recv(struct nic *nic)
{
- int i, errcode;
struct pbuf *p, *q;
+ int i;
- /* Upload engine acks rxComplete for us later. */
- if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & 0x0010))
- return NULL;
+ rxdesc.status = 0; /* Clear it out in the very beginning. */
p = pbuf_alloc(PBUF_RAW, 1536 /* XXX magic Max len */, PBUF_POOL);
if (!p)
{
outputf("3c90x: out of memory for packet?");
- return NULL;
+ currecv = p;
+ return;
}
-
- /* We don't need to acknowledge rxComplete -- the upload engine does
- * it for us.
- */
-
- /** Build the up-load descriptor **/
+
rxdesc.next = 0;
rxdesc.status = 0;
for (i = 0, q = p; q; q = q->next, i++)
rxdesc.segments[i].addr = v2p(q->payload);
rxdesc.segments[i].len = q->len | (q->next ? 0 : (1 << 31));
}
-
- /** Submit the upload descriptor to the NIC **/
+
outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdesc));
+
+ currecv = p;
+}
- /** Wait for upload completion (upComplete(15) or upError (14)) **/
- for (i = 0; i < 40000; i++) /* XXX What is this shit?! */
- ;
- while((rxdesc.status & ((1<<14) | (1<<15))) == 0)
- for (i = 0; i < 40000; i++)
- ;
-
+/*** a3c90x_poll: exported routine that waits for a certain length of time
+ *** for a packet, and if it sees none, returns 0. This routine should
+ *** copy the packet to nic->packet if it gets a packet and set the size
+ *** in nic->packetlen. Return 1 if a packet was found.
+ ***/
+static struct pbuf * _recv(struct nic *nic)
+{
+ int errcode;
+ struct pbuf *p;
+
+ if (!currecv)
+ _setup_recv(nic);
+
+ /* Nothing to do? */
+ if ((rxdesc.status & ((1<<14) | (1<<15))) == 0)
+ return NULL;
+
+ p = currecv;
+
/** Check for Error (else we have good packet) **/
if (rxdesc.status & (1<<14))
{
outputf("3C90X: Oversized Frame (%hX)",errcode>>16);
else
outputf("3C90X: Packet error (%hX)",errcode>>16);
+
+ pbuf_free(p); /* Bounce the old one before setting it up again. */
+ _setup_recv(nic);
return NULL;
}
- /* Resize the packet to how large it actually is. */
- pbuf_realloc(p, rxdesc.status & 0x1FFF);
+ pbuf_realloc(p, rxdesc.status & 0x1FFF); /* Resize the packet to how large it actually is. */
+ _setup_recv(nic); /* ..and light the NIC up again. */
return p;
}
linktype = 0x0008;
if (mopt & 0x01)
{
- outputf("%s100Base-T4",(c++)?", ":"");
+ outputf(" 100Base-T4");
linktype = 0x0006;
}
if (mopt & 0x04)
{
- outputf("%s100Base-FX",(c++)?", ":"");
+ outputf(" 100Base-FX");
linktype = 0x0005;
}
if (mopt & 0x10)
{
- outputf("%s10Base-2",(c++)?", ":"");
+ outputf(" 10Base-2");
linktype = 0x0003;
}
if (mopt & 0x20)
{
- outputf("%sAUI",(c++)?", ":"");
+ outputf(" AUI");
linktype = 0x0001;
}
if (mopt & 0x40)
{
- outputf("%sMII",(c++)?", ":"");
+ outputf(" MII");
linktype = 0x0006;
}
if ((mopt & 0xA) == 0xA)
{
- outputf("%s10Base-T / 100Base-TX",(c++)?", ":"");
+ outputf(" 10Base-T / 100Base-TX");
linktype = 0x0008;
}
else if ((mopt & 0xA) == 0x2)
{
- outputf("%s100Base-TX",(c++)?", ":"");
+ outputf(" 100Base-TX");
linktype = 0x0008;
}
else if ((mopt & 0xA) == 0x8)
{
- outputf("%s10Base-T",(c++)?", ":"");
+ outputf(" 10Base-T");
linktype = 0x0008;
}
- outputf(".");
/** Determine transceiver type to use, depending on value stored in
** eeprom 0x16
/** Set the RX filter = receive only individual pkts & multicast & bcast. **/
_issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
_issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);
-
+
+ /* Now stick a packet in the queue. */
+ _setup_recv(&nic);
/**
** set Indication and Interrupt flags , acknowledge any IRQ's
_issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
/* * Set our exported functions **/
- nic.recv = a3c90x_poll;
- nic.transmit = a3c90x_transmit;
+ nic.recv = _recv;
+ nic.transmit = _transmit;
memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
eth_register(&nic);
git.joshuawise.com / netwatch.git / blobdiff