openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide: convert bmdma address ioport to ioport_register() 

cmd646, via compile tested, pci lightly boot tested.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Avi Kivity 2010-11-21 18:29:52 +02:00 committed by Kevin Wolf
parent 62155e2b51
commit 9fbef1ac7c
6 changed files with 29 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/ide/cmd646.c
View File

@ -179,12 +179,8 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num,
register_ioport_read(addr, 4, 1, bmdma_readb_1, d); register_ioport_read(addr, 4, 1, bmdma_readb_1, d);
} }
register_ioport_write(addr + 4, 4, 1, bmdma_addr_writeb, bm); iorange_init(&bm->addr_ioport, &bmdma_addr_ioport_ops, addr + 4, 4);
register_ioport_read(addr + 4, 4, 1, bmdma_addr_readb, bm); ioport_register(&bm->addr_ioport);
register_ioport_write(addr + 4, 4, 2, bmdma_addr_writew, bm);
register_ioport_read(addr + 4, 4, 2, bmdma_addr_readw, bm);
register_ioport_write(addr + 4, 4, 4, bmdma_addr_writel, bm);
register_ioport_read(addr + 4, 4, 4, bmdma_addr_readl, bm);
addr += 8; addr += 8;
} }
} }

2
hw/ide/internal.h
View File

@ -8,6 +8,7 @@
*/ */
#include <hw/ide.h> #include <hw/ide.h>
#include "block_int.h" #include "block_int.h"
#include "iorange.h"
/* debug IDE devices */ /* debug IDE devices */
//#define DEBUG_IDE //#define DEBUG_IDE
@ -496,6 +497,7 @@ struct BMDMAState {
QEMUIOVector qiov; QEMUIOVector qiov;
int64_t sector_num; int64_t sector_num;
uint32_t nsector; uint32_t nsector;
IORange addr_ioport;
QEMUBH *bh; QEMUBH *bh;
}; };

75
hw/ide/pci.c
View File

@ -73,72 +73,37 @@ void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val)
} }
} }
uint32_t bmdma_addr_readb(void *opaque, uint32_t addr) static void bmdma_addr_read(IORange *ioport, uint64_t addr,
unsigned width, uint64_t *data)
{ {
BMDMAState *bm = opaque; BMDMAState *bm = container_of(ioport, BMDMAState, addr_ioport);
uint32_t val; uint32_t mask = (1ULL << (width * 8)) - 1;
val = (bm->addr >> ((addr & 3) * 8)) & 0xff;
*data = (bm->addr >> (addr * 8)) & mask;
#ifdef DEBUG_IDE #ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val); printf("%s: 0x%08x\n", __func__, (unsigned)*data);
#endif #endif
return val;
} }
void bmdma_addr_writeb(void *opaque, uint32_t addr, uint32_t val) static void bmdma_addr_write(IORange *ioport, uint64_t addr,
unsigned width, uint64_t data)
{ {
BMDMAState *bm = opaque; BMDMAState *bm = container_of(ioport, BMDMAState, addr_ioport);
int shift = (addr & 3) * 8; int shift = addr * 8;
uint32_t mask = (1ULL << (width * 8)) - 1;
#ifdef DEBUG_IDE #ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val); printf("%s: 0x%08x\n", __func__, (unsigned)data);
#endif #endif
bm->addr &= ~(0xFF << shift); bm->addr &= ~(mask << shift);
bm->addr |= ((val & 0xFF) << shift) & ~3; bm->addr |= ((data & mask) << shift) & ~3;
bm->cur_addr = bm->addr; bm->cur_addr = bm->addr;
} }
uint32_t bmdma_addr_readw(void *opaque, uint32_t addr) const IORangeOps bmdma_addr_ioport_ops = {
{ .read = bmdma_addr_read,
BMDMAState *bm = opaque; .write = bmdma_addr_write,
uint32_t val; };
val = (bm->addr >> ((addr & 3) * 8)) & 0xffff;
#ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val);
#endif
return val;
}
void bmdma_addr_writew(void *opaque, uint32_t addr, uint32_t val)
{
BMDMAState *bm = opaque;
int shift = (addr & 3) * 8;
#ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val);
#endif
bm->addr &= ~(0xFFFF << shift);
bm->addr |= ((val & 0xFFFF) << shift) & ~3;
bm->cur_addr = bm->addr;
}
uint32_t bmdma_addr_readl(void *opaque, uint32_t addr)
{
BMDMAState *bm = opaque;
uint32_t val;
val = bm->addr;
#ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val);
#endif
return val;
}
void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val)
{
BMDMAState *bm = opaque;
#ifdef DEBUG_IDE
printf("%s: 0x%08x\n", __func__, val);
#endif
bm->addr = val & ~3;
bm->cur_addr = bm->addr;
}
static bool ide_bmdma_current_needed(void *opaque) static bool ide_bmdma_current_needed(void *opaque)
{ {

7
hw/ide/pci.h
View File

@ -11,12 +11,7 @@ typedef struct PCIIDEState {
} PCIIDEState; } PCIIDEState;
void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val); void bmdma_cmd_writeb(void *opaque, uint32_t addr, uint32_t val);
uint32_t bmdma_addr_readb(void *opaque, uint32_t addr); extern const IORangeOps bmdma_addr_ioport_ops;
void bmdma_addr_writeb(void *opaque, uint32_t addr, uint32_t val);
uint32_t bmdma_addr_readw(void *opaque, uint32_t addr);
void bmdma_addr_writew(void *opaque, uint32_t addr, uint32_t val);
uint32_t bmdma_addr_readl(void *opaque, uint32_t addr);
void bmdma_addr_writel(void *opaque, uint32_t addr, uint32_t val);
void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table); void pci_ide_create_devs(PCIDevice *dev, DriveInfo **hd_table);
extern const VMStateDescription vmstate_ide_pci; extern const VMStateDescription vmstate_ide_pci;

8
hw/ide/piix.c
View File

@ -85,12 +85,8 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num,
register_ioport_write(addr + 1, 3, 1, bmdma_writeb, bm); register_ioport_write(addr + 1, 3, 1, bmdma_writeb, bm);
register_ioport_read(addr, 4, 1, bmdma_readb, bm); register_ioport_read(addr, 4, 1, bmdma_readb, bm);
register_ioport_write(addr + 4, 4, 1, bmdma_addr_writeb, bm); iorange_init(&bm->addr_ioport, &bmdma_addr_ioport_ops, addr + 4, 4);
register_ioport_read(addr + 4, 4, 1, bmdma_addr_readb, bm); ioport_register(&bm->addr_ioport);
register_ioport_write(addr + 4, 4, 2, bmdma_addr_writew, bm);
register_ioport_read(addr + 4, 4, 2, bmdma_addr_readw, bm);
register_ioport_write(addr + 4, 4, 4, bmdma_addr_writel, bm);
register_ioport_read(addr + 4, 4, 4, bmdma_addr_readl, bm);
addr += 8; addr += 8;
} }
} }

8
hw/ide/via.c
View File

@ -87,12 +87,8 @@ static void bmdma_map(PCIDevice *pci_dev, int region_num,
register_ioport_write(addr + 1, 3, 1, bmdma_writeb, bm); register_ioport_write(addr + 1, 3, 1, bmdma_writeb, bm);
register_ioport_read(addr, 4, 1, bmdma_readb, bm); register_ioport_read(addr, 4, 1, bmdma_readb, bm);
register_ioport_write(addr + 4, 4, 1, bmdma_addr_writeb, bm); iorange_init(&bm->addr_ioport, &bmdma_addr_ioport_ops, addr + 4, 4);
register_ioport_read(addr + 4, 4, 1, bmdma_addr_readb, bm); ioport_register(&bm->addr_ioport);
register_ioport_write(addr + 4, 4, 2, bmdma_addr_writew, bm);
register_ioport_read(addr + 4, 4, 2, bmdma_addr_readw, bm);
register_ioport_write(addr + 4, 4, 4, bmdma_addr_writel, bm);
register_ioport_read(addr + 4, 4, 4, bmdma_addr_readl, bm);
addr += 8; addr += 8;
} }
} }