Diff for /qemu/hw/grackle_pci.c between versions 1.1.1.6 and 1.1.1.7

version 1.1.1.6, 2018/04/24 17:38:50 version 1.1.1.7, 2018/04/24 18:29:29
Line 108  static int pci_grackle_init_device(SysBu Line 108  static int pci_grackle_init_device(SysBu
   
     s = FROM_SYSBUS(GrackleState, dev);      s = FROM_SYSBUS(GrackleState, dev);
   
     pci_mem_config = pci_host_conf_register_mmio(&s->host_state);      pci_mem_config = pci_host_conf_register_mmio(&s->host_state, 1);
     pci_mem_data = pci_host_data_register_mmio(&s->host_state);      pci_mem_data = pci_host_data_register_mmio(&s->host_state, 1);
     sysbus_init_mmio(dev, 0x1000, pci_mem_config);      sysbus_init_mmio(dev, 0x1000, pci_mem_config);
     sysbus_init_mmio(dev, 0x1000, pci_mem_data);      sysbus_init_mmio(dev, 0x1000, pci_mem_data);
   
     register_savevm("grackle", 0, 1, pci_grackle_save, pci_grackle_load,      register_savevm(&dev->qdev, "grackle", 0, 1, pci_grackle_save,
                     &s->host_state);                      pci_grackle_load, &s->host_state);
     qemu_register_reset(pci_grackle_reset, &s->host_state);      qemu_register_reset(pci_grackle_reset, &s->host_state);
     return 0;      return 0;
 }  }
   
 static int pci_dec_21154_init_device(SysBusDevice *dev)  
 {  
     GrackleState *s;  
     int pci_mem_config, pci_mem_data;  
   
     s = FROM_SYSBUS(GrackleState, dev);  
   
     pci_mem_config = pci_host_conf_register_mmio(&s->host_state);  
     pci_mem_data = pci_host_data_register_mmio(&s->host_state);  
     sysbus_init_mmio(dev, 0x1000, pci_mem_config);  
     sysbus_init_mmio(dev, 0x1000, pci_mem_data);  
     return 0;  
 }  
   
 static int grackle_pci_host_init(PCIDevice *d)  static int grackle_pci_host_init(PCIDevice *d)
 {  {
     pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_MOTOROLA);      pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_MOTOROLA);
Line 140  static int grackle_pci_host_init(PCIDevi Line 126  static int grackle_pci_host_init(PCIDevi
     d->config[0x08] = 0x00; // revision      d->config[0x08] = 0x00; // revision
     d->config[0x09] = 0x01;      d->config[0x09] = 0x01;
     pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST);      pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST);
     d->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type  
     return 0;  
 }  
   
 static int dec_21154_pci_host_init(PCIDevice *d)  
 {  
     /* PCI2PCI bridge same values as PearPC - check this */  
     pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_DEC);  
     pci_config_set_device_id(d->config, PCI_DEVICE_ID_DEC_21154);  
     d->config[0x08] = 0x02; // revision  
     pci_config_set_class(d->config, PCI_CLASS_BRIDGE_PCI);  
     d->config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_BRIDGE; // header_type  
   
     d->config[0x18] = 0x0;  // primary_bus  
     d->config[0x19] = 0x1;  // secondary_bus  
     d->config[0x1a] = 0x1;  // subordinate_bus  
     d->config[0x1c] = 0x10; // io_base  
     d->config[0x1d] = 0x20; // io_limit  
   
     d->config[0x20] = 0x80; // memory_base  
     d->config[0x21] = 0x80;  
     d->config[0x22] = 0x90; // memory_limit  
     d->config[0x23] = 0x80;  
   
     d->config[0x24] = 0x00; // prefetchable_memory_base  
     d->config[0x25] = 0x84;  
     d->config[0x26] = 0x00; // prefetchable_memory_limit  
     d->config[0x27] = 0x85;  
     return 0;      return 0;
 }  }
   
Line 177  static PCIDeviceInfo grackle_pci_host_in Line 135  static PCIDeviceInfo grackle_pci_host_in
     .init      = grackle_pci_host_init,      .init      = grackle_pci_host_init,
 };  };
   
 static PCIDeviceInfo dec_21154_pci_host_info = {  
     .qdev.name = "dec-21154",  
     .qdev.size = sizeof(PCIDevice),  
     .init      = dec_21154_pci_host_init,  
 };  
   
 static void grackle_register_devices(void)  static void grackle_register_devices(void)
 {  {
     sysbus_register_dev("grackle", sizeof(GrackleState),      sysbus_register_dev("grackle", sizeof(GrackleState),
                         pci_grackle_init_device);                          pci_grackle_init_device);
     pci_qdev_register(&grackle_pci_host_info);      pci_qdev_register(&grackle_pci_host_info);
     sysbus_register_dev("dec-21154", sizeof(GrackleState),  
                         pci_dec_21154_init_device);  
     pci_qdev_register(&dec_21154_pci_host_info);  
 }  }
   
 device_init(grackle_register_devices)  device_init(grackle_register_devices)

Removed from v.1.1.1.6  
changed lines
  Added in v.1.1.1.7


unix.superglobalmegacorp.com