X86: Rename the bridge which allows commnication back to the local APICs.

There was a collision with a name used in fs.py, and that causes that script
not to work when used with x86.
This commit is contained in:
Gabe Black 2012-02-05 01:37:40 -08:00
parent 82939294d6
commit 6cae538ce9

View file

@ -385,12 +385,12 @@ def connectX86ClassicSystem(x86_sys):
# Create a bridge from the IO bus to the memory bus to allow access to # Create a bridge from the IO bus to the memory bus to allow access to
# the local APIC (two pages) # the local APIC (two pages)
x86_sys.iobridge = Bridge(delay='50ns', nack_delay='4ns') x86_sys.apicbridge = Bridge(delay='50ns', nack_delay='4ns')
x86_sys.iobridge.slave = x86_sys.iobus.port x86_sys.apicbridge.slave = x86_sys.iobus.port
x86_sys.iobridge.master = x86_sys.membus.port x86_sys.apicbridge.master = x86_sys.membus.port
x86_sys.iobridge.ranges = [AddrRange(interrupts_address_space_base, x86_sys.apicbridge.ranges = [AddrRange(interrupts_address_space_base,
interrupts_address_space_base + interrupts_address_space_base +
APIC_range_size - 1)] APIC_range_size - 1)]
# connect the io bus # connect the io bus
x86_sys.pc.attachIO(x86_sys.iobus) x86_sys.pc.attachIO(x86_sys.iobus)