diff options
| author | malc | 2011-08-22 12:41:12 +0200 |
|---|---|---|
| committer | malc | 2011-08-22 12:41:12 +0200 |
| commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
| tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /hw/pcnet.h | |
| parent | tcg/ppc64: implement not_i32/64 and ext32u_i64 (diff) | |
| parent | Merge remote-tracking branch 'pmaydell/armhw-for-upstream' into staging (diff) | |
| download | qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.gz qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.tar.xz qemu-1afa194a0a3384c5a8fd150e4335d332c22883cf.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/pcnet.h')
| -rw-r--r-- | hw/pcnet.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pcnet.h b/hw/pcnet.h index 7e1c6853dd..cd86bde9d0 100644 --- a/hw/pcnet.h +++ b/hw/pcnet.h @@ -17,17 +17,17 @@ struct PCNetState_st { uint8_t prom[16]; uint16_t csr[128]; uint16_t bcr[32]; + int xmit_pos; uint64_t timer; MemoryRegion mmio; - int xmit_pos; uint8_t buffer[4096]; - int tx_busy; qemu_irq irq; void (*phys_mem_read)(void *dma_opaque, target_phys_addr_t addr, uint8_t *buf, int len, int do_bswap); void (*phys_mem_write)(void *dma_opaque, target_phys_addr_t addr, uint8_t *buf, int len, int do_bswap); void *dma_opaque; + int tx_busy; int looptest; }; |