// availability
for (j = 0; j < 8; j++) {
if (!(bus->dev_map[i] & (0x1 << j))) {
- return i * 8 + j;
+ return ((i * 8) + j) * 8;
}
}
}
}
static void allocate_dev_num(struct pci_bus * bus, int dev_num) {
- int major = dev_num / 8;
+ int major = (dev_num / 8) / 8;
int minor = dev_num % 8;
bus->dev_map[major] |= (0x1 << minor);
static int init_i440fx(struct vm_device * dev) {
- /*struct pci_device * pci_dev = v3_pci_register_device(dev, 0, "i440FX", 0,
- NULL, NULL, NULL);
+ struct pci_device * pci_dev = NULL;
+ struct v3_pci_bar bars[6];
+ int i;
+
+ for (i = 0; i < 6; i++) {
+ bars[i].type = PCI_BAR_NONE;
+ bars[i].mem_hook = 0;
+ bars[i].num_pages = 0;
+ bars[i].bar_update = NULL;
+ }
+
+ pci_dev = v3_pci_register_device(dev, PCI_STD_DEVICE, 0, "i440FX", 0, bars,
+ NULL, NULL, NULL, NULL);
if (!pci_dev) {
- return -1;
+ return -1;
}
pci_dev->config_header.vendor_id = 0x8086;
pci_dev->config_header.revision = 0x0002;
pci_dev->config_header.subclass = 0x00; // SubClass: host2pci
pci_dev->config_header.class = 0x06; // Class: PCI bridge
- pci_dev->config_header.header_type = 0x00;
pci_dev->bus_num = 0;
- */
return 0;
}
int bar_offset = 0x10 + 4 * i;
if (pci_dev->bar[i].type == PCI_BAR_IO) {
+ pci_dev->bar[i].mask = 0x0000fffd;
*(uint32_t *)(pci_dev->config_space + bar_offset) = 0x00000001;
} else if (pci_dev->bar[i].type == PCI_BAR_MEM32) {
- pci_dev->bar[i].mask = (pci_dev->bar[i].num_pages << 12) - 1;
+ pci_dev->bar[i].mask = ~((pci_dev->bar[i].num_pages << 12) - 1);
pci_dev->bar[i].mask |= 0xf; // preserve the configuration flags
*(uint32_t *)(pci_dev->config_space + bar_offset) = 0x00000008;
// if dev_num == -1, auto assign
struct pci_device * v3_pci_register_device(struct vm_device * pci,
+ pci_device_type_t dev_type,
uint_t bus_num,
const char * name,
int dev_num,
memset(pci_dev, 0, sizeof(struct pci_device));
+ switch (dev_type) {
+ case PCI_STD_DEVICE:
+ pci_dev->config_header.header_type = 0x00;
+ break;
+ default:
+ PrintError("Unhandled PCI Device Type: %d\n", dev_type);
+ return NULL;
+ }
+
pci_dev->bus_num = bus_num;
pci_dev->dev_num = dev_num;