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

Timestamp:

2011-12-10T08:29:44Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d9f8dd13

Parents:

b8b1e631 (diff), 87955bfb (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

@@ -142 +142 @@
 static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size)
 {
+        size_t esize_ru = (size + 1) & ~1;
         size_t esize = size & ~1;
         
-        pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff);
-        pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff);
+        pio_write_8(ne2k->port + DP_RBCR0, esize_ru & 0xff);
+        pio_write_8(ne2k->port + DP_RBCR1, (esize_ru >> 8) & 0xff);
         pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff);
         pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff);