Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2011-12-11T20:27:56Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
c24c157d
Parents:
4c67e52 (diff), 9c3bba0 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/nic/ne2k/dp8390.c

    r4c67e52 r899f1a9  
    142142static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size)
    143143{
     144        size_t esize_ru = (size + 1) & ~1;
    144145        size_t esize = size & ~1;
    145146       
    146         pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff);
    147         pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff);
     147        pio_write_8(ne2k->port + DP_RBCR0, esize_ru & 0xff);
     148        pio_write_8(ne2k->port + DP_RBCR1, (esize_ru >> 8) & 0xff);
    148149        pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff);
    149150        pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff);
Note: See TracChangeset for help on using the changeset viewer.