Changeset fc23ef6 in mainline

Timestamp:

2011-01-06T15:05:59Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

74864ac

Parents:

2a6e4ac2

Message:

cstyle & clutter removal

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (10 diffs)
• dp8390_port.h (modified) (1 diff)
• ne2000.c (modified) (1 diff)

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

@@ -233 +233 @@
                 assert(!from_int);
 //              dep->de_flags |= DEF_PACK_SEND;
-                reply(dep, OK, FALSE);
+                reply(dep, EOK, FALSE);
 //              return;
                 return EOK;
@@ -253 +253 @@
 //              dep->de_sendmsg= *mp;
 //              dep->de_flags |= DEF_SEND_AVAIL;
-//              reply(dep, OK, FALSE);
+//              reply(dep, EOK, FALSE);
 //              return;
 //              return queue_packet(dep, packet);
@@ -318 +318 @@
                 return EOK;
         
-        reply(dep, OK, FALSE);
+        reply(dep, EOK, FALSE);
         
         assert(dep->de_mode == DEM_ENABLED);
@@ -711 +711 @@
 //                      else
                                 r = dp_pkt2user(dep, pageno, length);
-                        if (r != OK)
+                        if (r != EOK)
                                 return;
 
@@ -856 +856 @@
                 }
         }
-        return OK;
+        return EOK;
 }
 
@@ -974 +974 @@
                         //      SELF, D, (vir_bytes)&two_bytes[1], 1);
                                 SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[1]), 1);
-                        if (r != OK)
+                        if (r != EOK)
                         {
                                 panic("DP8390",
@@ -1006 +1006 @@
                         //      SELF, D, (vir_bytes)&two_bytes[0], 1);
                                 SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[0]), 1);
-                        if (r != OK)
+                        if (r != EOK)
                         {
                                 panic("DP8390",
@@ -1138 +1138 @@
                         r= sys_vircopy(SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[1]),
                                 user_proc, D, vir_user,  1);
-                        if (r != OK)
+                        if (r != EOK)
                         {
                                 panic("DP8390",
@@ -1170 +1170 @@
                         r= sys_vircopy(SELF, D, (vir_bytes)&(((u8_t *)&two_bytes)[0]),
                                 user_proc, D, vir_user,  1);
-                        if (r != OK)
+                        if (r != EOK)
                         {
                                 panic("DP8390",
@@ -1290 +1290 @@
         r= sys_vircopy(user_proc, D, user_addr,
                 SELF, D, (vir_bytes)loc_addr, count);
-        if (r != OK)
+        if (r != EOK)
                 panic("DP8390", "get_userdata: sys_vircopy failed", r);
 }

uspace/srv/hw/netif/dp8390/dp8390_port.h

@@ -50 +50 @@
 #define _PROTOTYPE(function, params) function params
 
-/** Success error code.
- */
-#define OK      EOK
-
 /** Type definition of the unsigned byte.
  */

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

@@ -16 +16 @@
 #define N  100
 
-/** Type definition of the testing function.
- */
-_PROTOTYPE(typedef int (*testf_t), (dpeth_t *dep, int pos, u8_t *pat));
+typedef int (*testf_t)(dpeth_t *dep, int pos, u8_t *pat);
 
 /** Data patterns */