#include <pci-bother.h>
#include <minilib.h>
#include <output.h>
+#include <paging.h>
#define XCVR_MAGIC (0x5A00)
/** any single transmission fails after 16 collisions or other errors
** this is the number of times to retry the transmission -- this should
** be plenty
**/
-#define XMIT_RETRIES 250
+#define XMIT_RETRIES 5
/*** Register definitions for the 3c905 ***/
enum Registers
#define INT_CMDINPROGRESS (1<<12)
#define INT_WINDOWNUMBER (7<<13)
+/* These structures are all 64-bit aligned, as needed for bus-mastering I/O. */
+typedef struct {
+ unsigned int addr;
+ unsigned int len;
+} segment_t __attribute__ ((aligned(8)));
-/*** TX descriptor ***/
-typedef struct
- {
- unsigned int DnNextPtr;
- unsigned int FrameStartHeader;
- unsigned int HdrAddr;
- unsigned int HdrLength;
- unsigned int DataAddr;
- unsigned int DataLength;
- }
- TXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+typedef struct {
+ unsigned int next;
+ unsigned int hdr;
+ segment_t segments[64 /* XXX magic */];
+} txdesc_t __attribute__ ((aligned(8)));
/*** RX descriptor ***/
-typedef struct
- {
- unsigned int UpNextPtr;
- unsigned int UpPktStatus;
- unsigned int DataAddr;
- unsigned int DataLength;
- }
- RXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+typedef struct {
+ unsigned int next;
+ unsigned int status;
+ segment_t segments[64];
+} rxdesc_t __attribute__ ((aligned(8)));
/*** Global variables ***/
static struct
unsigned char CurrentWindow;
unsigned int IOAddr;
unsigned char HWAddr[ETH_ALEN];
- TXD TransmitDPD;
- RXD ReceiveUPD;
}
INF_3C90X;
+
static struct nic nic;
+static txdesc_t txdesc;
+static rxdesc_t rxdesc;
+static struct pbuf *currecv;
+
#define _outl(v,a) outl((a),(v))
#define _outw(v,a) outw((a),(v))
#define _outb(v,a) outb((a),(v))
-/*** a3c90x_internal_IssueCommand: sends a command to the 3c90x card
- ***/
-static int
-a3c90x_internal_IssueCommand(int ioaddr, int cmd, int param)
- {
- unsigned int val;
-
- /** Build the cmd. **/
- val = cmd;
- val <<= 11;
- val |= param;
-
- /** Send the cmd to the cmd register **/
- _outw(val, ioaddr + regCommandIntStatus_w);
+static int _issue_command(int ioaddr, int cmd, int param)
+{
+ outw(ioaddr + regCommandIntStatus_w, (cmd << 11) | param);
- /** Wait for the cmd to complete, if necessary **/
- while (inw(ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+ while (inw(ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+ ;
- return 0;
- }
+ return 0;
+}
/*** a3c90x_internal_SetWindow: selects a register window set.
***/
-static int
-a3c90x_internal_SetWindow(int ioaddr, int window)
- {
-
- /** Window already as set? **/
- if (INF_3C90X.CurrentWindow == window) return 0;
+static int _set_window(int ioaddr, int window)
+{
+ if (INF_3C90X.CurrentWindow == window)
+ return 0;
- /** Issue the window command. **/
- a3c90x_internal_IssueCommand(ioaddr, cmdSelectRegisterWindow, window);
+ _issue_command(ioaddr, cmdSelectRegisterWindow, window);
INF_3C90X.CurrentWindow = window;
- return 0;
- }
+ return 0;
+}
/*** a3c90x_internal_ReadEeprom - read data from the serial eeprom.
unsigned short val;
/** Select correct window **/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winEepromBios0);
+ _set_window(INF_3C90X.IOAddr, winEepromBios0);
/** Make sure the eeprom isn't busy **/
do
a3c90x_internal_WriteEepromWord(int ioaddr, int address, unsigned short value)
{
/** Select register window **/
- a3c90x_internal_SetWindow(ioaddr, winEepromBios0);
+ _set_window(ioaddr, winEepromBios0);
/** Verify Eeprom not busy **/
while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
***/
static void a3c90x_reset(void)
{
-#ifdef CFG_3C90X_PRESERVE_XCVR
- int cfg;
- /** Read the current InternalConfig value. **/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
- cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
-#endif
-
/** Send the reset command to the card **/
- outputf("Issuing RESET:");
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdGlobalReset, 0);
-
- /** wait for reset command to complete **/
- while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+ outputf("3c90x: issuing RESET");
+ _issue_command(INF_3C90X.IOAddr, cmdGlobalReset, 0);
/** global reset command resets station mask, non-B revision cards
** require explicit reset of values
**/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+ _set_window(INF_3C90X.IOAddr, winAddressing2);
_outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
_outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
_outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
-#ifdef CFG_3C90X_PRESERVE_XCVR
- /** Re-set the original InternalConfig value from before reset **/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
- _outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
-
- /** enable DC converter for 10-Base-T **/
- if ((cfg&0x0300) == 0x0300)
- {
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
- }
-#endif
-
/** Issue transmit reset, wait for command completion **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxReset, 0);
- while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
- ;
+ _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);
if (! INF_3C90X.isBrev)
_outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+ _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
/**
** reset of the receiver on B-revision cards re-negotiates the link
** takes several seconds (a computer eternity)
**/
if (INF_3C90X.isBrev)
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x04);
+ _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x04);
else
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x00);
- while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
- ;
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
+ _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x00);
+ while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+ ;
+ _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
- cmdSetInterruptEnable, 0);
+ _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
/** enable rxComplete and txComplete **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
- cmdSetIndicationEnable, 0x0014);
+ _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014);
/** acknowledge any pending status flags **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
- cmdAcknowledgeInterrupt, 0x661);
+ _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
return;
}
*** pkt - the pointer to the packet data itself.
***/
static void
-a3c90x_transmit(const char *dest_addr, unsigned int proto,
- unsigned int size, const char *pkt)
- {
-
- struct eth_hdr
- {
- unsigned char dst_addr[ETH_ALEN];
- unsigned char src_addr[ETH_ALEN];
- unsigned short type;
- } hdr;
-
- unsigned char status;
- unsigned i, retries;
-
- for (retries=0; retries < XMIT_RETRIES ; retries++)
+a3c90x_transmit(struct pbuf *p)
+{
+ unsigned char status;
+ static struct pbuf *oldpbuf = NULL;
+ unsigned int n, len;
+
+ if (oldpbuf)
{
- /** Stall the download engine **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdStallCtl, 2);
-
- /** Make sure the card is not waiting on us **/
- inw(INF_3C90X.IOAddr + regCommandIntStatus_w);
- inw(INF_3C90X.IOAddr + regCommandIntStatus_w);
-
- while (inw(INF_3C90X.IOAddr+regCommandIntStatus_w) &
- INT_CMDINPROGRESS)
- ;
-
- /** Set the ethernet packet type **/
- hdr.type = htons(proto);
-
- /** Copy the destination address **/
- memcpy(hdr.dst_addr, dest_addr, ETH_ALEN);
+ 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);
+ pbuf_free(oldpbuf);
+ oldpbuf = NULL;
+ }
- /** Copy our MAC address **/
- memcpy(hdr.src_addr, INF_3C90X.HWAddr, ETH_ALEN);
+ _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
/** Setup the DPD (download descriptor) **/
- INF_3C90X.TransmitDPD.DnNextPtr = 0;
+ txdesc.next = 0;
+ len = 0;
+ n = 0;
+ oldpbuf = p;
+ for (; p; p = p->next)
+ {
+ txdesc.segments[n].addr = v2p(p->payload);
+ txdesc.segments[n].len = p->len | (p->next ? 0 : (1 << 31));
+ len += p->len;
+ pbuf_ref(p);
+ n++;
+ }
/** set notification for transmission completion (bit 15) **/
- INF_3C90X.TransmitDPD.FrameStartHeader = (size + sizeof(hdr)) | 0x8000;
- INF_3C90X.TransmitDPD.HdrAddr = virt_to_bus(&hdr);
- INF_3C90X.TransmitDPD.HdrLength = sizeof(hdr);
- INF_3C90X.TransmitDPD.DataAddr = virt_to_bus(pkt);
- INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
+ txdesc.hdr = (len) | 0x8000;
+
+ outputf("3c90x: Sending %d byte %d seg packet", len, n);
/** Send the packet **/
- _outl(virt_to_bus(&(INF_3C90X.TransmitDPD)),
- INF_3C90X.IOAddr + regDnListPtr_l);
-
- /** End Stall and Wait for upload to complete. **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdStallCtl, 3);
- while(inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0)
- ;
-
- /** Wait for NIC Transmit to Complete **/
- oneshot_start_ms(10); /* Give it 10 ms */
- while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004) &&
- oneshot_running())
+ outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc));
+ _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
+
+ oneshot_start_ms(10);
+ while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running())
;
+ if (!oneshot_running())
+ {
+ outputf("3c90x: Download engine pointer timeout");
+ return;
+ }
- if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004))
- {
- outputf("3C90X: Tx Timeout");
- continue;
- }
-
- status = inb(INF_3C90X.IOAddr + regTxStatus_b);
-
- /** acknowledge transmit interrupt by writing status **/
- _outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
-
+#if 0
/** successful completion (sans "interrupt Requested" bit) **/
if ((status & 0xbf) == 0x80)
- return;
+ return;
- outputf("3C90X: Status (%hhX)", status);
+ outputf("3c90x: Status (%hhX)", status);
/** check error codes **/
if (status & 0x02)
- {
- outputf("3C90X: Tx Reclaim Error (%hhX)", status);
- a3c90x_reset();
- }
- else if (status & 0x04)
- {
- outputf("3C90X: Tx Status Overflow (%hhX)", status);
- for (i=0; i<32; i++)
- _outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
- /** must re-enable after max collisions before re-issuing tx **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
- }
- else if (status & 0x08)
- {
- outputf("3C90X: Tx Max Collisions (%hhX)", status);
- /** must re-enable after max collisions before re-issuing tx **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
- }
- else if (status & 0x10)
- {
- outputf("3C90X: Tx Underrun (%hhX)", status);
- a3c90x_reset();
- }
- else if (status & 0x20)
- {
- outputf("3C90X: Tx Jabber (%hhX)", status);
- a3c90x_reset();
- }
- else if ((status & 0x80) != 0x80)
- {
- outputf("3C90X: Internal Error - Incomplete Transmission (%hhX)",
- status);
- a3c90x_reset();
- }
+ {
+ outputf("3c90x: Tx Reclaim Error (%hhX)", status);
+ a3c90x_reset();
+ } else if (status & 0x04) {
+ outputf("3c90x: Tx Status Overflow (%hhX)", status);
+ for (i=0; i<32; i++)
+ _outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
+ /** must re-enable after max collisions before re-issuing tx **/
+ _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
+ } else if (status & 0x08) {
+ outputf("3c90x: Tx Max Collisions (%hhX)", status);
+ /** must re-enable after max collisions before re-issuing tx **/
+ _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
+ } else if (status & 0x10) {
+ outputf("3c90x: Tx Underrun (%hhX)", status);
+ a3c90x_reset();
+ } else if (status & 0x20) {
+ outputf("3c90x: Tx Jabber (%hhX)", status);
+ a3c90x_reset();
+ } else if ((status & 0x80) != 0x80) {
+ outputf("3c90x: Internal Error - Incomplete Transmission (%hhX)", status);
+ a3c90x_reset();
}
+#endif
+}
- /** failed after RETRY attempts **/
- outputf("Failed to send after %d retries", retries);
- return;
-
- }
-
-
+/* _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)
+{
+ struct pbuf *p, *q;
+ int i;
+
+ 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?");
+ currecv = p;
+ return;
+ }
+
+ 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));
+ }
+
+ outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdesc));
+
+ currecv = p;
+}
/*** 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 int
-a3c90x_poll(struct nic *nic, int retrieve)
- {
- int i, errcode;
-
- if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0010))
- {
- return 0;
- }
-
- if ( ! retrieve ) return 1;
-
- /** we don't need to acknowledge rxComplete -- the upload engine
- ** does it for us.
- **/
-
- /** Build the up-load descriptor **/
- INF_3C90X.ReceiveUPD.UpNextPtr = 0;
- INF_3C90X.ReceiveUPD.UpPktStatus = 0;
- INF_3C90X.ReceiveUPD.DataAddr = virt_to_bus(nic->packet);
- INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
-
- /** Submit the upload descriptor to the NIC **/
- _outl(virt_to_bus(&(INF_3C90X.ReceiveUPD)),
- INF_3C90X.IOAddr + regUpListPtr_l);
-
- /** Wait for upload completion (upComplete(15) or upError (14)) **/
- for(i=0;i<40000;i++);
- while((INF_3C90X.ReceiveUPD.UpPktStatus & ((1<<14) | (1<<15))) == 0)
- for(i=0;i<40000;i++);
-
- /** Check for Error (else we have good packet) **/
- if (INF_3C90X.ReceiveUPD.UpPktStatus & (1<<14))
+static struct pbuf * a3c90x_poll(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))
{
- errcode = INF_3C90X.ReceiveUPD.UpPktStatus;
- if (errcode & (1<<16))
- outputf("3C90X: Rx Overrun (%hX)",errcode>>16);
- else if (errcode & (1<<17))
- outputf("3C90X: Runt Frame (%hX)",errcode>>16);
- else if (errcode & (1<<18))
- outputf("3C90X: Alignment Error (%hX)",errcode>>16);
- else if (errcode & (1<<19))
- outputf("3C90X: CRC Error (%hX)",errcode>>16);
- else if (errcode & (1<<20))
- outputf("3C90X: Oversized Frame (%hX)",errcode>>16);
- else
- outputf("3C90X: Packet error (%hX)",errcode>>16);
- return 0;
+ errcode = rxdesc.status;
+ if (errcode & (1<<16))
+ outputf("3C90X: Rx Overrun (%hX)",errcode>>16);
+ else if (errcode & (1<<17))
+ outputf("3C90X: Runt Frame (%hX)",errcode>>16);
+ else if (errcode & (1<<18))
+ outputf("3C90X: Alignment Error (%hX)",errcode>>16);
+ else if (errcode & (1<<19))
+ outputf("3C90X: CRC Error (%hX)",errcode>>16);
+ else if (errcode & (1<<20))
+ 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;
}
- /** Ok, got packet. Set length in nic->packetlen. **/
- nic->packetlen = (INF_3C90X.ReceiveUPD.UpPktStatus & 0x1FFF);
-
- return 1;
- }
-
-
+ 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;
+}
/*** a3c90x_disable: exported routine to disable the card. What's this for?
*** the eepro100.c driver didn't have one, so I just left this one empty too.
"effects. See 3c90x.txt for info.");
}
#endif
- {
- unsigned int tmp;
- for (tmp = 0; tmp < 0x10; tmp+= 4)
- outputf("EEPROM adr %02x, data %04x %04x %04x %04x",
- tmp, eeprom[tmp], eeprom[tmp+1], eeprom[tmp+2], eeprom[tmp+3]);
- }
-
- /* Some type A... */
/** Retrieve the Hardware address and print it on the screen. **/
INF_3C90X.HWAddr[0] = eeprom[HWADDR_OFFSET + 0]>>8;
/** 3C556: Invert MII power **/
if (INF_3C90X.is3c556) {
unsigned int tmp;
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+ _set_window(INF_3C90X.IOAddr, winAddressing2);
tmp = inw(INF_3C90X.IOAddr + regResetOptions_2_w);
tmp |= 0x4000;
_outw(tmp, INF_3C90X.IOAddr + regResetOptions_2_w);
}
/* Test if the link is good, if not continue */
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winDiagnostics4);
+ _set_window(INF_3C90X.IOAddr, winDiagnostics4);
mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w);
if((mstat & (1<<11)) == 0) {
outputf("Valid link not established");
}
/** Program the MAC address into the station address registers **/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+ _set_window(INF_3C90X.IOAddr, winAddressing2);
_outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
_outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
_outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
** Uses Media Option command on B revision, Reset Option on non-B
** revision cards -- same register address
**/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+ _set_window(INF_3C90X.IOAddr, winTxRxOptions3);
mopt = inw(INF_3C90X.IOAddr + regResetMediaOptions_3_w);
/** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/
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
/** enable DC converter for 10-Base-T **/
if (linktype == 0x0003)
{
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
+ _issue_command(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
}
/** Set the link to the type we just determined. **/
- a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+ _set_window(INF_3C90X.IOAddr, winTxRxOptions3);
cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
cfg &= ~(0xF<<20);
cfg |= (linktype<<20);
_outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
/** Now that we set the xcvr type, reset the Tx and Rx, re-enable. **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxReset, 0x00);
- while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
- ;
-
+ _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);
if (!INF_3C90X.isBrev)
_outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+ _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
/**
** reset of the receiver on B-revision cards re-negotiates the link
** takes several seconds (a computer eternity)
**/
if (INF_3C90X.isBrev)
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x04);
+ _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x04);
else
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x00);
- while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
- ;
+ _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x00);
/** Set the RX filter = receive only individual pkts & multicast & bcast. **/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
-
+ _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
**/
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
- cmdSetIndicationEnable, 0x0014);
- a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
- cmdAcknowledgeInterrupt, 0x661);
+ _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
+ _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014);
+ _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
/* * Set our exported functions **/
- nic.poll = a3c90x_poll;
+ nic.recv = a3c90x_poll;
nic.transmit = a3c90x_transmit;
+ memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
eth_register(&nic);
return 1;
git.joshuawise.com / netwatch.git / blobdiff