Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>

Browse Source 
* libchip/network/greth.c: Misc. hacks to allow compilation on
	16bit targets.
This commit is contained in:
Ralf Corsepius
2010-05-31 13:27:07 +00:00
parent 2d76aa85de
commit c48572d96b
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/ChangeLog
View File

@@ -1,3 +1,8 @@
2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
* libchip/network/greth.c: Misc. hacks to allow compilation on
16bit targets.
2010-05-31 Ralf Corsépius <ralf.corsepius@rtems.org>
PR 1531/newlib

19
c/src/libchip/network/greth.c
View File

@@ -169,7 +169,7 @@ static char *almalloc(int sz)
{
char *tmp;
tmp = calloc(1,2*sz);
tmp = (char *) (((int)tmp+sz) & ~(sz -1));
tmp = (char *) (((uintptr_t)tmp+sz) & ~(sz -1));
return(tmp);
}
@@ -416,8 +416,8 @@ auto_neg_done:
sc->tx_dptr = 0;
sc->tx_cnt = 0;
sc->rx_ptr = 0;
regs->txdesc = (int) sc->txdesc;
regs->rxdesc = (int) sc->rxdesc;
regs->txdesc = (uintptr_t) sc->txdesc;
regs->rxdesc = (uintptr_t) sc->rxdesc;
sc->rxmbuf = calloc(sc->rxbufs, sizeof(*sc->rxmbuf));
sc->txmbuf = calloc(sc->txbufs, sizeof(*sc->txmbuf));
@@ -452,9 +452,16 @@ auto_neg_done:
/* set ethernet address. */
regs->mac_addr_msb =
sc->arpcom.ac_enaddr[0] << 8 | sc->arpcom.ac_enaddr[1];
regs->mac_addr_lsb =
sc->arpcom.ac_enaddr[2] << 24 | sc->arpcom.ac_enaddr[3] << 16 |
sc->arpcom.ac_enaddr[4] << 8 | sc->arpcom.ac_enaddr[5];
uint32_t mac_addr_lsb;
mac_addr_lsb = sc->arpcom.ac_enaddr[2];
mac_addr_lsb <<= 8;
mac_addr_lsb |= sc->arpcom.ac_enaddr[3];
mac_addr_lsb <<= 8;
mac_addr_lsb |= sc->arpcom.ac_enaddr[4];
mac_addr_lsb <<= 8;
mac_addr_lsb |= sc->arpcom.ac_enaddr[5];
regs->mac_addr_lsb = mac_addr_lsb;
/* install interrupt vector */
set_vector(greth_interrupt_handler, sc->vector, 1);