typedef enum {PCI_BAR_IO, PCI_BAR_MEM16, PCI_BAR_MEM32, PCI_BAR_MEM64_LOW, PCI_BAR_MEM64_HIGH, PCI_BAR_NONE} pci_bar_type_t;
-struct v3_bar_reg {
+struct pci_device;
+
+struct v3_pci_bar {
pci_bar_type_t type;
int mem_hook;
int num_pages;
- struct v3_bar_reg bar[6];
+ struct v3_pci_bar bar[6];
uint_t bus_num;
struct rb_node dev_tree_node;
uint_t bus_num,
const char * name,
int dev_num,
+ struct v3_pci_bar * bars,
int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
- int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
+ int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled),
+ int (*ext_rom_update)(struct pci_device *pci_dev),
void * private_data);
default:
return 1;
- // case (non writable reg list):
-
- default:
- return 1;
}
} else {
// PCI to PCI Bridge = 0x01
pci_dev->bar[bar_reg].updated = 1;
}
} else if ((cur_reg >= 0x30) && (cur_reg < 0x34)) {
- pci_dev->ext_rom_updated = 1;
+ pci_dev->ext_rom_update_flag = 1;
} else if ((cur_reg == 0x04) || (cur_reg == 0x05)) {
// COMMAND update
} else if (cur_reg == 0x0f) {
if (pci_dev->bar[i].updated) {
int bar_offset = 0x10 + 4 * i;
- *(uint32_t *)pci_dev->config_space + bar_offset) &= pci_dev->bar[i].mask;
+ *(uint32_t *)(pci_dev->config_space + bar_offset) &= pci_dev->bar[i].mask;
if (pci_dev->bar[i].bar_update) {
pci_dev->bar[i].bar_update(pci_dev, i);
static int init_i440fx(struct vm_device * dev) {
- struct pci_device * pci_dev = v3_pci_register_device(dev, 0, "i440FX", 0,
+ /*struct pci_device * pci_dev = v3_pci_register_device(dev, 0, "i440FX", 0,
NULL, NULL, NULL);
if (!pci_dev) {
pci_dev->config_header.header_type = 0x00;
pci_dev->bus_num = 0;
-
+ */
return 0;
}
return -1;
}
- PrintDebug("Sizeof config header=%d\n", sizeof(struct pci_config_header));
+ PrintDebug("Sizeof config header=%d\n", (int)sizeof(struct pci_config_header));
for (i = 0; i < 4; i++) {
v3_dev_hook_io(dev, CONFIG_ADDR_PORT + i, &addr_port_read, &addr_port_write);
}
+
+ return 0;
}
struct v3_pci_bar * bars,
int (*config_update)(struct pci_device * pci_dev, uint_t reg_num, int length),
int (*cmd_update)(struct pci_device *pci_dev, uchar_t io_enabled, uchar_t mem_enabled),
- int (*bar_update)(struct pci_device * pci_dev, uint_t bar),
+ int (*ext_rom_update)(struct pci_device * pci_dev),
void * private_data) {
struct pci_internal * pci_state = (struct pci_internal *)pci->private_data;
// register update callbacks
pci_dev->config_update = config_update;
- pci_dev->bar_update = bar_update;
+ pci_dev->cmd_update = cmd_update;
+ pci_dev->ext_rom_update = ext_rom_update;
pci_dev->priv_data = private_data;
//copy bars
for (i = 0; i < 6; i ++){
pci_dev->bar[i].type = bars[i].type;
- pci_dev->bar[i].num_resources = bars[i].num_resources;
+ pci_dev->bar[i].num_pages = bars[i].num_pages;
+ pci_dev->bar[i].mem_hook = bars[i].mem_hook;
pci_dev->bar[i].bar_update = bars[i].bar_update;
}