Changeset 7715994 in mainline for uspace/srv/net/netif/dp8390/ne2000.c

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

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

@@ -70 +70 @@
  *  @param[in] millis The number of milliseconds to sleep.
  */
-#define milli_delay( millis )   usleep(( millis ) * 1000 )
+#define milli_delay(millis)     usleep((millis) * 1000)
 
 /** Type definition of the testing function.
  */
-_PROTOTYPE( typedef int (*testf_t), (dpeth_t *dep, int pos, u8_t *pat)  );
+_PROTOTYPE(typedef int (*testf_t), (dpeth_t *dep, int pos, u8_t *pat)   );
 
 /** First data pattern.
  */
-u8_t    pat0[]= { 0x00, 0x00, 0x00, 0x00 };
+u8_t    pat0[]= {0x00, 0x00, 0x00, 0x00};
 
 /** Second data pattern.
  */
-u8_t    pat1[]= { 0xFF, 0xFF, 0xFF, 0xFF };
+u8_t    pat1[]= {0xFF, 0xFF, 0xFF, 0xFF};
 
 /** Third data pattern.
  */
-u8_t    pat2[]= { 0xA5, 0x5A, 0x69, 0x96 };
+u8_t    pat2[]= {0xA5, 0x5A, 0x69, 0x96};
 
 /** Fourth data pattern.
  */
-u8_t    pat3[]= { 0x96, 0x69, 0x5A, 0xA5 };
+u8_t    pat3[]= {0x96, 0x69, 0x5A, 0xA5};
 
 /** Tests 8 bit NE2000 network interface.
@@ -114 +114 @@
  */
 static void ne_stop(dpeth_t *dep);
-//_PROTOTYPE( static void milli_delay, (unsigned long millis)           );
+//_PROTOTYPE(static void milli_delay, (unsigned long millis)            );
 
 /** Initializes the NE2000 network interface.
@@ -150 +150 @@
                 /* Reset the dp8390 */
                 outb_reg0(dep, DP_CR, CR_STP | CR_DM_ABORT);
-                for (i= 0; i < 0x1000 && ((inb_reg0(dep, DP_ISR) & ISR_RST) == 0); i++)
+                for (i= 0; i < 0x1000 && ((inb_reg0(dep, DP_ISR) &ISR_RST) == 0); i++)
                         ; /* Do nothing */
 
                 /* Check if the dp8390 is really there */
-                if ((inb_reg0(dep, DP_CR) & (CR_STP|CR_DM_ABORT)) !=
+                if ((inb_reg0(dep, DP_CR) &(CR_STP|CR_DM_ABORT)) !=
                         (CR_STP|CR_DM_ABORT))
                 {
@@ -186 +186 @@
                         f= test_8;
                 }
-                if (f(dep, loc1, pat0) && f(dep, loc1, pat1) &&
-                        f(dep, loc1, pat2) && f(dep, loc1, pat3) &&
-                        f(dep, loc2, pat0) && f(dep, loc2, pat1) &&
+                if (f(dep, loc1, pat0) && f(dep, loc1, pat1) && 
+                        f(dep, loc1, pat2) && f(dep, loc1, pat3) && 
+                        f(dep, loc2, pat0) && f(dep, loc2, pat1) && 
                         f(dep, loc2, pat2) && f(dep, loc2, pat3))
                 {
@@ -297 +297 @@
         outb_reg0(dep, DP_RBCR0, 4);
         outb_reg0(dep, DP_RBCR1, 0);
-        outb_reg0(dep, DP_RSAR0, pos & 0xFF);
+        outb_reg0(dep, DP_RSAR0, pos &0xFF);
         outb_reg0(dep, DP_RSAR1, pos >> 8);
         outb_reg0(dep, DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA);
@@ -306 +306 @@
         for (i= 0; i<N; i++)
         {
-                if (inb_reg0(dep, DP_ISR) & ISR_RDC)
+                if (inb_reg0(dep, DP_ISR) &ISR_RDC)
                         break;
         }
@@ -321 +321 @@
         outb_reg0(dep, DP_RBCR0, 4);
         outb_reg0(dep, DP_RBCR1, 0);
-        outb_reg0(dep, DP_RSAR0, pos & 0xFF);
+        outb_reg0(dep, DP_RSAR0, pos &0xFF);
         outb_reg0(dep, DP_RSAR1, pos >> 8);
         outb_reg0(dep, DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA);
@@ -349 +349 @@
         outb_reg0(dep, DP_RBCR0, 4);
         outb_reg0(dep, DP_RBCR1, 0);
-        outb_reg0(dep, DP_RSAR0, pos & 0xFF);
+        outb_reg0(dep, DP_RSAR0, pos &0xFF);
         outb_reg0(dep, DP_RSAR1, pos >> 8);
         outb_reg0(dep, DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA);
@@ -360 +360 @@
         for (i= 0; i<N; i++)
         {
-                if (inb_reg0(dep, DP_ISR) & ISR_RDC)
+                if (inb_reg0(dep, DP_ISR) &ISR_RDC)
                         break;
         }
@@ -375 +375 @@
         outb_reg0(dep, DP_RBCR0, 4);
         outb_reg0(dep, DP_RBCR1, 0);
-        outb_reg0(dep, DP_RSAR0, pos & 0xFF);
+        outb_reg0(dep, DP_RSAR0, pos &0xFF);
         outb_reg0(dep, DP_RSAR1, pos >> 8);
         outb_reg0(dep, DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA);