Changeset b828907 in mainline for uspace/drv/nic/ne2k/dp8390.c

Timestamp:

2012-07-20T20:29:54Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

34bc2fe

Parents:

4cdac68 (diff), 6de2d766 (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 with mainline

File:

• uspace/drv/nic/ne2k/dp8390.c (modified) (1 diff)

uspace/drv/nic/ne2k/dp8390.c

@@ -201 +201 @@
         /* Check if the DP8390 is really there */
         uint8_t val = pio_read_8(ne2k->port + DP_CR);
-        if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
+        if ((val & (CR_STP | CR_TXP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT))
                 return EXDEV;