Changeset 37f0a29 in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

Timestamp:

2011-01-06T18:24:32Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b187536

Parents:

096234b

Message:

cleanup

File:

• uspace/srv/hw/netif/dp8390/dp8390.c (modified) (10 diffs)

uspace/srv/hw/netif/dp8390/dp8390.c

@@ -59 +59 @@
 static void dp_pio16_nic2user(dpeth_t *dep, int nic_addr, void *buf, size_t offset, size_t size);
 static void conf_hw(dpeth_t *dep);
-static void reply(dpeth_t *dep, int err, int may_block);
 static void insb(port_t port, void *buf, size_t size);
 static void insw(port_t port, void *buf, size_t size);
@@ -83 +82 @@
                 return EXDEV;
         
-        if (dep->de_mode == DEM_SINK) {
-//              strncpy((char *) dep->de_address.ea_addr, "ZDP", 6);
-//              dep->de_address.ea_addr[5] = port;
-//              reply_mess.m_type = DL_CONF_REPLY;
-//              reply_mess.m3_i1 = mp->DL_PORT;
-//              reply_mess.m3_i2 = DE_PORT_NR;
-//              *(ether_addr_t *) reply_mess.m3_ca1 = dep->de_address;
-//              mess_reply(mp, &reply_mess);
-//              return;
-                return EOK;
-        }
-        
         assert(dep->de_mode == DEM_ENABLED);
         assert(dep->de_flags & DEF_ENABLED);
@@ -123 +110 @@
 void do_stop(dpeth_t *dep)
 {
-        if ((dep->de_mode != DEM_SINK)
-            && (dep->de_mode == DEM_ENABLED)
+        if ((dep->de_mode == DEM_ENABLED)
             && (dep->de_flags & DEF_ENABLED)) {
                 outb_reg0(dep, DP_CR, CR_STP | CR_DM_ABORT);
@@ -161 +147 @@
         int sendq_head;
 /*      dpeth_t *dep;
-
+        
         port = mp->DL_PORT;
         count = mp->DL_COUNT;
@@ -169 +155 @@
         dep->de_client= mp->DL_PROC;
 */
-        if (dep->de_mode == DEM_SINK) {
-                assert(!from_int);
-//              dep->de_flags |= DEF_PACK_SEND;
-                reply(dep, EOK, false);
-//              return;
-                return EOK;
-        }
         
         assert(dep->de_mode == DEM_ENABLED);
-        assert(dep->de_flags &DEF_ENABLED);
+        assert(dep->de_flags & DEF_ENABLED);
         
         if ((dep->packet_queue) && (!from_int)) {
@@ -192 +171 @@
 //              dep->de_sendmsg= *mp;
 //              dep->de_flags |= DEF_SEND_AVAIL;
-//              reply(dep, EOK, false);
 //              return;
 //              return queue_packet(dep, packet);
@@ -244 +222 @@
         
 //      dep->de_flags |= DEF_PACK_SEND;
-        
-        /*
-         * If the interrupt handler called, don't send a reply. The reply
-         * will be sent after all interrupts are handled.
-         */
-        if (from_int)
-                return EOK;
-        
-        reply(dep, EOK, false);
-        
-        assert(dep->de_mode == DEM_ENABLED);
-        assert(dep->de_flags & DEF_ENABLED);
         
         return EOK;
@@ -540 +506 @@
                  * are delivered.
                  */
-                printf("<reset>\n");
                 dp_reset(dep);
         }
@@ -692 +657 @@
         }
         
-        dep->de_read_s = length;
         dep->de_flags |= DEF_PACK_RECV;
 //      dep->de_flags &= ~DEF_READING;
@@ -836 +800 @@
 }
 
-static void reply(dpeth_t *dep, int err, int may_block)
-{
-/*      message reply;
-        int status;
-        int r;
-        
-        status = 0;
-        if (dep->de_flags &DEF_PACK_SEND)
-                status |= DL_PACK_SEND;
-        
-        if (dep->de_flags &DEF_PACK_RECV)
-                status |= DL_PACK_RECV;
-        
-        reply.m_type = DL_TASK_REPLY;
-        reply.DL_PORT = dep - de_table;
-        reply.DL_PROC = dep->de_client;
-        reply.DL_STAT = status | ((u32_t) err << 16);
-        reply.DL_COUNT = dep->de_read_s;
-        reply.DL_CLCK = 0;  *//* Don't know */
-        
-/*      r = send(dep->de_client, &reply);
-        if (r == ELOCKED && may_block) {
-                printf("send locked\n");
-                return;
-        }
-        
-        if (r < 0)
-                fprintf(stderr, "dp8390: send failed\n");
-        
-*/      dep->de_read_s = 0;
-//      dep->de_flags &= ~(DEF_PACK_SEND | DEF_PACK_RECV);
-}
-
 static void insb(port_t port, void *buf, size_t size)
 {