Commit 489983d6 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Michael Tokarev
Browse files

hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c 



- add "hw/net/ne2000-isa.h"
- remove the old i386 dependency

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarHervé Poussineau <hpoussin@reactos.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au> [PPC]
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 866e2b37

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
#include "qom/cpu.h"

#include "hw/nmi.h"

#include "hw/i386/intel_iommu.h"

#include "hw/net/ne2000-isa.h"



/* debug PC/ISA interrupts */

//#define DEBUG_IRQ

hw/mips/mips_r4k.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "hw/char/serial.h"

#include "hw/isa/isa.h"

#include "net/net.h"

#include "hw/net/ne2000-isa.h"

#include "sysemu/sysemu.h"

#include "hw/boards.h"

#include "hw/block/flash.h"

hw/net/ne2000-isa.c

+2 −4
Original line number Diff line number Diff line
@@ -22,17 +22,15 @@ 
 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/i386/pc.h"

#include "hw/isa/isa.h"

#include "hw/net/ne2000-isa.h"

#include "hw/qdev.h"

#include "net/net.h"

#include "ne2000.h"

#include "sysemu/sysemu.h"

#include "exec/address-spaces.h"

#include "qapi/error.h"

#include "qapi/visitor.h"



#define TYPE_ISA_NE2000 "ne2k_isa"

#define ISA_NE2000(obj) OBJECT_CHECK(ISANE2000State, (obj), TYPE_ISA_NE2000)



typedef struct ISANE2000State {

hw/net/ne2000.c

+0 −2
Original line number Diff line number Diff line
@@ -22,9 +22,7 @@ 
 * THE SOFTWARE.

 */

#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "net/net.h"

#include "ne2000.h"

#include "hw/loader.h"

#include "sysemu/sysemu.h"

hw/net/ne2000.h

+3 −0
Original line number Diff line number Diff line 
#ifndef HW_NE2000_H

#define HW_NE2000_H



#include "hw/hw.h"

#include "net/net.h"



#define NE2000_PMEM_SIZE    (32*1024)

#define NE2000_PMEM_START   (16*1024)

#define NE2000_PMEM_END     (NE2000_PMEM_SIZE+NE2000_PMEM_START)