rfb data

[netwatch.git] / net / 3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index 83a30efc67c8a4efad12655b40ccb467b3f0f589..40edafecd7653c2d39073f1fc9638cde5bbb6d5b 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -224,8 +224,6 @@ typedef struct
     {
     unsigned int       DnNextPtr;
     unsigned int       FrameStartHeader;
     {
     unsigned int       DnNextPtr;
     unsigned int       FrameStartHeader;

-    unsigned int       HdrAddr;
-    unsigned int       HdrLength;

     unsigned int       DataAddr;
     unsigned int       DataLength;
     }
     unsigned int       DataAddr;
     unsigned int       DataLength;
     }


@@ -475,16 +473,8 @@ static void a3c90x_reset(void)
  *** pkt - the pointer to the packet data itself.
  ***/
 static void
  *** 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)
+a3c90x_transmit(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 int i, retries;
 
        unsigned char status;
        unsigned int i, retries;
 


@@ -495,21 +485,15 @@ a3c90x_transmit(const char *dest_addr, unsigned int proto,
                
                _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
                
                _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 

-               hdr.type = htons(proto);
-               memcpy(hdr.dst_addr, dest_addr, ETH_ALEN);
-               memcpy(hdr.src_addr, INF_3C90X.HWAddr, ETH_ALEN);
-

                /** Setup the DPD (download descriptor) **/
                INF_3C90X.TransmitDPD.DnNextPtr = 0;
                /** set notification for transmission completion (bit 15) **/
                /** Setup the DPD (download descriptor) **/
                INF_3C90X.TransmitDPD.DnNextPtr = 0;
                /** 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.FrameStartHeader = (size) | 0x8000;
+               INF_3C90X.TransmitDPD.DataAddr = v2p((void*)pkt);

                INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
 
                /** Send the packet **/
                INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
 
                /** Send the packet **/

-               outl(INF_3C90X.IOAddr + regDnListPtr_l, virt_to_bus(&(INF_3C90X.TransmitDPD)));
+               outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(INF_3C90X.TransmitDPD)));

                _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
                
                oneshot_start_ms(100);
                _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
                
                oneshot_start_ms(100);


@@ -594,11 +578,11 @@ a3c90x_poll(struct nic *nic, int retrieve)
     /** Build the up-load descriptor **/
     INF_3C90X.ReceiveUPD.UpNextPtr = 0;
     INF_3C90X.ReceiveUPD.UpPktStatus = 0;
     /** 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.DataAddr = v2p(nic->packet);

     INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
 
     /** Submit the upload descriptor to the NIC **/
     INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
 
     /** Submit the upload descriptor to the NIC **/

-    _outl(virt_to_bus(&(INF_3C90X.ReceiveUPD)),
+    _outl(v2p(&(INF_3C90X.ReceiveUPD)),

          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/
          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/


@@ -937,6 +921,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     /* * Set our exported functions **/
     nic.poll     = a3c90x_poll;
     nic.transmit = a3c90x_transmit;
     /* * Set our exported functions **/
     nic.poll     = a3c90x_poll;
     nic.transmit = a3c90x_transmit;

+    memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);

     eth_register(&nic);
 
     return 1;
     eth_register(&nic);
 
     return 1;