diff options
| author | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:15:54 +0000 |
|---|---|---|
| committer | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:15:54 +0000 |
| commit | 1c8cd59f3c9248f0954a5cf215dc3652ccfc8da5 (patch) | |
| tree | 7c19d8a922e2d0613a494c5949b2b6f45c388e13 /src/devices/device.c | |
| parent | 7e5fbd6fc03df87c9276b08219ca15ad17c43dac (diff) | |
Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-38
Creator: Li-Ta Lo <ollie@lanl.gov>
emulator update
x96emu update from Paulo
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1954 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/device.c')
| -rw-r--r-- | src/devices/device.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/devices/device.c b/src/devices/device.c index d2c435fb72..ba4a2f4901 100644 --- a/src/devices/device.c +++ b/src/devices/device.c @@ -363,7 +363,6 @@ void compute_allocate_resource( } - #if CONFIG_CONSOLE_VGA == 1 device_t vga_pri = 0; static void allocate_vga_resource(void) @@ -378,13 +377,14 @@ static void allocate_vga_resource(void) vga = 0; vga_onboard = 0; for (dev = all_devices; dev; dev = dev->next) { - if (!dev->enabled) continue; + if ( !dev->enabled ) continue; if (((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) && ((dev->class >> 8) != PCI_CLASS_DISPLAY_OTHER)) { if (!vga) { if (dev->on_mainboard) { vga_onboard = dev; - } else { + } + else { vga = dev; } } @@ -397,8 +397,7 @@ static void allocate_vga_resource(void) vga = vga_onboard; } - if (vga) { - // vga is first add on card or the only onboard vga + if (vga) { // vga is first add on card or the only onboard vga printk_debug("Allocating VGA resource %s\n", dev_path(vga)); vga->command |= (PCI_COMMAND_MEMORY | PCI_COMMAND_IO); vga_pri = vga; @@ -412,6 +411,7 @@ static void allocate_vga_resource(void) bus = (bus == bus->dev->bus)? 0 : bus->dev->bus; } } + #endif |