From 488a1a5dfe9a9ba57fa6c6b6b98136ea494e0296 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 26 Sep 2011 19:01:44 +0200 Subject: pcnet: Move BCR defines to header This moves BCR defines to the common header and immediately makes use of them to add BCR_APROMWE, replacing the open-coded write check in pcnet_aprom_writeb. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori --- hw/pcnet-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/pcnet-pci.c') diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 41a6e07c0..4f97f965f 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -56,9 +56,9 @@ static void pcnet_aprom_writeb(void *opaque, uint32_t addr, uint32_t val) #ifdef PCNET_DEBUG printf("pcnet_aprom_writeb addr=0x%08x val=0x%02x\n", addr, val); #endif - /* Check APROMWE bit to enable write access */ - if (pcnet_bcr_readw(s,2) & 0x100) + if (BCR_APROMWE(s)) { s->prom[addr & 15] = val; + } } static uint32_t pcnet_aprom_readb(void *opaque, uint32_t addr) -- cgit v1.2.3