diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-09-16 21:08:06 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-09-16 21:08:06 +0000 |
| commit | 5fafdf24ef2c090c164d4dc89684b3f379dbdd87 (patch) | |
| tree | c0654ee63b6dac76d98b427e92ef16850a90c652 /hw/piix_pci.c | |
| parent | bd494f4cbd4187dda8cc8f4739763f24a31a4c8b (diff) | |
| download | qemu-5fafdf24ef2c090c164d4dc89684b3f379dbdd87.zip qemu-5fafdf24ef2c090c164d4dc89684b3f379dbdd87.tar.gz qemu-5fafdf24ef2c090c164d4dc89684b3f379dbdd87.tar.bz2 | |
find -type f | xargs sed -i 's/[\t ]$//g' # on most files
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3173 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/piix_pci.c')
| -rw-r--r-- | hw/piix_pci.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 095698c..8c00f0d 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -2,7 +2,7 @@ * QEMU i440FX/PIIX3 PCI Bridge Emulation * * Copyright (c) 2006 Fabrice Bellard - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal * in the Software without restriction, including without limitation the rights @@ -63,19 +63,19 @@ static void update_pam(PCIDevice *d, uint32_t start, uint32_t end, int r) switch(r) { case 3: /* RAM */ - cpu_register_physical_memory(start, end - start, + cpu_register_physical_memory(start, end - start, start); break; case 1: /* ROM (XXX: not quite correct) */ - cpu_register_physical_memory(start, end - start, + cpu_register_physical_memory(start, end - start, start | IO_MEM_ROM); break; case 2: case 0: /* XXX: should distinguish read/write cases */ for(addr = start; addr < end; addr += 4096) { - cpu_register_physical_memory(addr, 4096, + cpu_register_physical_memory(addr, 4096, isa_page_descs[(addr - 0xa0000) >> 12]); } break; @@ -97,7 +97,7 @@ static void i440fx_update_memory_mappings(PCIDevice *d) cpu_register_physical_memory(0xa0000, 0x20000, 0xa0000); } else { for(addr = 0xa0000; addr < 0xc0000; addr += 4096) { - cpu_register_physical_memory(addr, 4096, + cpu_register_physical_memory(addr, 4096, isa_page_descs[(addr - 0xa0000) >> 12]); } } @@ -124,7 +124,7 @@ void i440fx_init_memory_mappings(PCIDevice *d) } } -static void i440fx_write_config(PCIDevice *d, +static void i440fx_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { /* XXX: implement SMRAM.D_LOCK */ @@ -175,7 +175,7 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic) register_ioport_read(0xcfc, 4, 2, pci_host_data_readw, s); register_ioport_read(0xcfc, 4, 4, pci_host_data_readl, s); - d = pci_register_device(b, "i440FX", sizeof(PCIDevice), 0, + d = pci_register_device(b, "i440FX", sizeof(PCIDevice), 0, NULL, i440fx_write_config); d->config[0x00] = 0x86; // vendor_id |