rtoss - Diff between revs 78 and 79

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 78 Rev 79
Line 141... Line 141...
141         d->isa_page_descs[i] = cpu_get_physical_page_desc(0xa0000 + i * 0x1000); 141         d->isa_page_descs[i] = cpu_get_physical_page_desc(0xa0000 + i * 0x1000);
142     } 142     }
143 } 143 }
144 144
145 void i440fx_update_isa_page_descs(PCII440FXState *d, 145 void i440fx_update_isa_page_descs(PCII440FXState *d,
146                                   uint32_t start_addr, uint32_t size) -  
-   146                                   target_phys_addr_t start_addr,
-   147                                   ram_addr_t size)
147 { 148 {
148     int i = (start_addr - 0xa0000) >> 12; -  
149     uint32_t addr; -  
-   149     target_phys_addr_t addr;
150 150
151     for (addr = start_addr; addr < start_addr + size; addr += 0x1000, i++) { -  
-   151     for (addr = start_addr; addr < start_addr + size; addr += 0x1000) {
152         if (addr >= 0xa0000 && addr < 0x100000) { 152         if (addr >= 0xa0000 && addr < 0x100000) {
-   153             int i = (addr - 0xa0000) >> 12;
153             d->isa_page_descs[i] = cpu_get_physical_page_desc(addr); 154             d->isa_page_descs[i] = cpu_get_physical_page_desc(addr);
154         } 155         }
155     } 156     }
156 } 157 }
157 158
Line 379... Line 380...
379 } 380 }
380 381
381 /* NEC PC-9821 */ 382 /* NEC PC-9821 */
382 383
383 PCIBus *pc98_i440fx_init(PCII440FXState **pi440fx_state, 384 PCIBus *pc98_i440fx_init(PCII440FXState **pi440fx_state,
384                          int *piix3_devfn, qemu_irq *pic, uint32_t ram_size) -  
-   385                          int *piix3_devfn, qemu_irq *pic, ram_addr_t ram_size)
385 { 386 {
386     PCIBus *pci_bus; 387     PCIBus *pci_bus;
387     PCII440FXState *d; 388     PCII440FXState *d;
388     int i; 389     int i;
389 390