isa: add an ISA DMA interface, and store it within the ISA bus
This will permit to deprecate global DMA_*() functions. Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Message-id: 1453843944-26833-11-git-send-email-hpoussin@reactos.org Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
f5f19ee2e4
commit
5484f30b2c
|
@ -37,6 +37,12 @@ static void isa_bus_class_init(ObjectClass *klass, void *data)
|
||||||
k->get_fw_dev_path = isabus_get_fw_dev_path;
|
k->get_fw_dev_path = isabus_get_fw_dev_path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const TypeInfo isa_dma_info = {
|
||||||
|
.name = TYPE_ISADMA,
|
||||||
|
.parent = TYPE_INTERFACE,
|
||||||
|
.class_size = sizeof(IsaDmaClass),
|
||||||
|
};
|
||||||
|
|
||||||
static const TypeInfo isa_bus_info = {
|
static const TypeInfo isa_bus_info = {
|
||||||
.name = TYPE_ISA_BUS,
|
.name = TYPE_ISA_BUS,
|
||||||
.parent = TYPE_BUS,
|
.parent = TYPE_BUS,
|
||||||
|
@ -90,6 +96,20 @@ void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq)
|
||||||
dev->nirqs++;
|
dev->nirqs++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16)
|
||||||
|
{
|
||||||
|
assert(bus && dma8 && dma16);
|
||||||
|
assert(!bus->dma[0] && !bus->dma[1]);
|
||||||
|
bus->dma[0] = dma8;
|
||||||
|
bus->dma[1] = dma16;
|
||||||
|
}
|
||||||
|
|
||||||
|
IsaDma *isa_get_dma(ISABus *bus, int nchan)
|
||||||
|
{
|
||||||
|
assert(bus);
|
||||||
|
return bus->dma[nchan > 3 ? 1 : 0];
|
||||||
|
}
|
||||||
|
|
||||||
static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport)
|
static inline void isa_init_ioport(ISADevice *dev, uint16_t ioport)
|
||||||
{
|
{
|
||||||
if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) {
|
if (dev && (dev->ioport_id == 0 || ioport < dev->ioport_id)) {
|
||||||
|
@ -223,6 +243,7 @@ static const TypeInfo isa_device_type_info = {
|
||||||
|
|
||||||
static void isabus_register_types(void)
|
static void isabus_register_types(void)
|
||||||
{
|
{
|
||||||
|
type_register_static(&isa_dma_info);
|
||||||
type_register_static(&isa_bus_info);
|
type_register_static(&isa_bus_info);
|
||||||
type_register_static(&isabus_bridge_info);
|
type_register_static(&isabus_bridge_info);
|
||||||
type_register_static(&isa_device_type_info);
|
type_register_static(&isa_device_type_info);
|
||||||
|
|
|
@ -34,6 +34,41 @@ static inline uint16_t applesmc_port(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define TYPE_ISADMA "isa-dma"
|
||||||
|
|
||||||
|
#define ISADMA_CLASS(klass) \
|
||||||
|
OBJECT_CLASS_CHECK(IsaDmaClass, (klass), TYPE_ISADMA)
|
||||||
|
#define ISADMA_GET_CLASS(obj) \
|
||||||
|
OBJECT_GET_CLASS(IsaDmaClass, (obj), TYPE_ISADMA)
|
||||||
|
#define ISADMA(obj) \
|
||||||
|
INTERFACE_CHECK(IsaDma, (obj), TYPE_ISADMA)
|
||||||
|
|
||||||
|
struct IsaDma {
|
||||||
|
Object parent;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
ISADMA_TRANSFER_VERIFY,
|
||||||
|
ISADMA_TRANSFER_READ,
|
||||||
|
ISADMA_TRANSFER_WRITE,
|
||||||
|
ISADMA_TRANSFER_ILLEGAL,
|
||||||
|
} IsaDmaTransferMode;
|
||||||
|
|
||||||
|
typedef struct IsaDmaClass {
|
||||||
|
InterfaceClass parent;
|
||||||
|
|
||||||
|
IsaDmaTransferMode (*get_transfer_mode)(IsaDma *obj, int nchan);
|
||||||
|
bool (*has_autoinitialization)(IsaDma *obj, int nchan);
|
||||||
|
int (*read_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
|
||||||
|
int (*write_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len);
|
||||||
|
void (*hold_DREQ)(IsaDma *obj, int nchan);
|
||||||
|
void (*release_DREQ)(IsaDma *obj, int nchan);
|
||||||
|
void (*schedule)(IsaDma *obj);
|
||||||
|
void (*register_channel)(IsaDma *obj, int nchan,
|
||||||
|
DMA_transfer_handler transfer_handler,
|
||||||
|
void *opaque);
|
||||||
|
} IsaDmaClass;
|
||||||
|
|
||||||
typedef struct ISADeviceClass {
|
typedef struct ISADeviceClass {
|
||||||
DeviceClass parent_class;
|
DeviceClass parent_class;
|
||||||
} ISADeviceClass;
|
} ISADeviceClass;
|
||||||
|
@ -46,6 +81,7 @@ struct ISABus {
|
||||||
MemoryRegion *address_space;
|
MemoryRegion *address_space;
|
||||||
MemoryRegion *address_space_io;
|
MemoryRegion *address_space_io;
|
||||||
qemu_irq *irqs;
|
qemu_irq *irqs;
|
||||||
|
IsaDma *dma[2];
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ISADevice {
|
struct ISADevice {
|
||||||
|
@ -63,6 +99,8 @@ ISABus *isa_bus_new(DeviceState *dev, MemoryRegion *address_space,
|
||||||
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
|
void isa_bus_irqs(ISABus *bus, qemu_irq *irqs);
|
||||||
qemu_irq isa_get_irq(ISADevice *dev, int isairq);
|
qemu_irq isa_get_irq(ISADevice *dev, int isairq);
|
||||||
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
|
void isa_init_irq(ISADevice *dev, qemu_irq *p, int isairq);
|
||||||
|
void isa_bus_dma(ISABus *bus, IsaDma *dma8, IsaDma *dma16);
|
||||||
|
IsaDma *isa_get_dma(ISABus *bus, int nchan);
|
||||||
MemoryRegion *isa_address_space(ISADevice *dev);
|
MemoryRegion *isa_address_space(ISADevice *dev);
|
||||||
MemoryRegion *isa_address_space_io(ISADevice *dev);
|
MemoryRegion *isa_address_space_io(ISADevice *dev);
|
||||||
ISADevice *isa_create(ISABus *bus, const char *name);
|
ISADevice *isa_create(ISABus *bus, const char *name);
|
||||||
|
|
|
@ -33,6 +33,7 @@ typedef struct I2CBus I2CBus;
|
||||||
typedef struct I2SCodec I2SCodec;
|
typedef struct I2SCodec I2SCodec;
|
||||||
typedef struct ISABus ISABus;
|
typedef struct ISABus ISABus;
|
||||||
typedef struct ISADevice ISADevice;
|
typedef struct ISADevice ISADevice;
|
||||||
|
typedef struct IsaDma IsaDma;
|
||||||
typedef struct LoadStateEntry LoadStateEntry;
|
typedef struct LoadStateEntry LoadStateEntry;
|
||||||
typedef struct MACAddr MACAddr;
|
typedef struct MACAddr MACAddr;
|
||||||
typedef struct MachineClass MachineClass;
|
typedef struct MachineClass MachineClass;
|
||||||
|
|
Loading…
Reference in a new issue