ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xilinx_axienet: Register reset properly 

Register the reset function and the Device::reset function rather than
explicitly call it from the sysbus::init.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Acked-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Peter Crosthwaite 2013-04-16 10:20:06 +10:00 committed by Edgar E. Iglesias
parent f0e7a81c0c
commit 9ee0ceb7a8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/net/xilinx_axienet.c
View File

@ -402,8 +402,10 @@ static inline int axienet_newfunc_enabled(XilinxAXIEnet *s)
return !!(s->regs[R_RAF] & RAF_NEWFUNC_EN); return !!(s->regs[R_RAF] & RAF_NEWFUNC_EN);
} }
static void axienet_reset(XilinxAXIEnet *s) static void xilinx_axienet_reset(DeviceState *d)
{ {
XilinxAXIEnet *s = XILINX_AXI_ENET(d);
axienet_rx_reset(s); axienet_rx_reset(s);
axienet_tx_reset(s); axienet_tx_reset(s);
@ -871,7 +873,6 @@ static int xilinx_enet_init(SysBusDevice *dev)
s->TEMAC.parent = s; s->TEMAC.parent = s;
s->rxmem = g_malloc(s->c_rxmem); s->rxmem = g_malloc(s->c_rxmem);
axienet_reset(s);
return 0; return 0;
} }
@ -902,6 +903,7 @@ static void xilinx_enet_class_init(ObjectClass *klass, void *data)
k->init = xilinx_enet_init; k->init = xilinx_enet_init;
dc->props = xilinx_enet_properties; dc->props = xilinx_enet_properties;
dc->reset = xilinx_axienet_reset;
ssc->push = axienet_stream_push; ssc->push = axienet_stream_push;
} }