Changeset 122b753 in mainline for uspace/srv/hw/netif/dp8390/dp8390.c

Timestamp:

2011-01-06T17:23:58Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

40559a96

Parents:

d3a0af7

Message:

more declutter

File:

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

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

@@ -674 +674 @@
         
 //      if (!(dep->de_flags & DEF_READING))
-//              return EGENERIC;
+//              return EINVAL;
         
         packet = netif_packet_get_1(length);
@@ -771 +771 @@
         void *vir_user;
         size_t ecount;
-        int i, r;
+        int i;
         size_t bytes;
         //uint8_t two_bytes[2];
@@ -810 +810 @@
                 
                 if (odd_byte) {
-                        r = sys_vircopy(user_proc, D, vir_user,
-                        //      SELF, D, (vir_bytes) &two_bytes[1], 1);
-                                SELF, D, &(((uint8_t *) &two_bytes)[1]), 1);
-                        
-                        if (r != EOK)
-                                fprintf(stderr, "DP8390: dp_pio16_user2nic: sys_vircopy failed\n");
+                        memcpy(&(((uint8_t *) &two_bytes)[1]), vir_user, 1);
                         
                         //outw(dep->de_data_port, *(uint16_t *) two_bytes);
@@ -841 +836 @@
                         assert(bytes == 1);
                         
-                        r = sys_vircopy(user_proc, D, vir_user,
-                        //      SELF, D, (vir_bytes) &two_bytes[0], 1);
-                                SELF, D, &(((uint8_t *) &two_bytes)[0]), 1);
-                        
-                        if (r != EOK)
-                                fprintf(stderr, "DP8390: dp_pio16_user2nic: sys_vircopy failed\n");
+                        memcpy(&(((uint8_t *) &two_bytes)[0]), vir_user, 1);
                         
                         count--;
@@ -915 +905 @@
         void *vir_user;
         size_t ecount;
-        int i, r;
+        int i;
         size_t bytes;
         //uint8_t two_bytes[2];
@@ -953 +943 @@
                 
                 if (odd_byte) {
-                        //r= sys_vircopy(SELF, D, (vir_bytes)&two_bytes[1],
-                        r= sys_vircopy(SELF, D, &(((uint8_t *) &two_bytes)[1]),
-                            user_proc, D, vir_user, 1);
-                        if (r != EOK)
-                                fprintf(stderr, "DP8390: dp_pio16_nic2user: sys_vircopy failed\n");
+                        memcpy(vir_user, &(((uint8_t *) &two_bytes)[1]), 1);
                         
                         count--;
@@ -983 +969 @@
                         //*(uint16_t *) two_bytes= inw(dep->de_data_port);
                         two_bytes = inw(dep->de_data_port);
-                        //r= sys_vircopy(SELF, D, (vir_bytes) &two_bytes[0],
-                        r = sys_vircopy(SELF, D, &(((uint8_t *) &two_bytes)[0]),
-                            user_proc, D, vir_user,  1);
-                        if (r != EOK)
-                                fprintf(stderr, "DP8390: dp_pio16_nic2user: sys_vircopy failed\n");
+                        memcpy(vir_user, &(((uint8_t *) &two_bytes)[0]), 1);
                         
                         count--;