head 1.2; access; symbols; locks; strict; comment @# @; 1.2 date 2017.03.20.18.06.07; author bouyer; state dead; branches; next 1.1; commitid UIkDeoKV4TqUGjKz; 1.1 date 2016.12.29.23.12.23; author wiz; state Exp; branches; next ; commitid rbn5RRsoW55uZVzz; desc @@ 1.2 log @Remove obsolete patches, they are obsolete since the switch to the 46 version @ text @$NetBSD: patch-dc,v 1.1 2016/12/29 23:12:23 wiz Exp $ From sysutils/xentools33/patches/patch-ak. qemu-0.13.x will include this fix: http://git.qemu.org/qemu.git/commit/?id=9651ac55e5de0e1534d898316cc851af6ffc4334 --- ioemu-qemu-xen/hw/e1000.c.orig 2009-08-06 12:56:34.000000000 +0000 +++ ioemu-qemu-xen/hw/e1000.c @@@@ -244,16 +244,20 @@@@ set_eecd(E1000State *s, int index, uint3 s->eecd_state.old_eecd = val & (E1000_EECD_SK | E1000_EECD_CS | E1000_EECD_DI|E1000_EECD_FWE_MASK|E1000_EECD_REQ); + if (!(E1000_EECD_CS & val)) // CS inactive; nothing to do + return; + if (E1000_EECD_CS & (val ^ oldval)) { // CS rise edge; reset state + s->eecd_state.val_in = 0; + s->eecd_state.bitnum_in = 0; + s->eecd_state.bitnum_out = 0; + s->eecd_state.reading = 0; + } if (!(E1000_EECD_SK & (val ^ oldval))) // no clock edge return; if (!(E1000_EECD_SK & val)) { // falling edge s->eecd_state.bitnum_out++; return; } - if (!(val & E1000_EECD_CS)) { // rising, no CS (EEPROM reset) - memset(&s->eecd_state, 0, sizeof s->eecd_state); - return; - } s->eecd_state.val_in <<= 1; if (val & E1000_EECD_DI) s->eecd_state.val_in |= 1; @ 1.1 log @Fix build. Not sure if this makes sense, since it's for the removed xen 4.1. @ text @d1 1 a1 1 $NetBSD: patch-dc,v 1.1.1.1 2011/04/06 09:10:27 cegger Exp $ @