some ifdef --> if fixes

[coreboot.git] / src / northbridge / intel / i82830 / vga.c

diff --git a/src/northbridge/intel/i82830/vga.c b/src/northbridge/intel/i82830/vga.c
index 7a6d1f7a6bfe273f5d15ea2f91f12bb225d39175..c82c484a3a5239528db53061a5483c948fb2fa0f 100644 (file)
--- a/src/northbridge/intel/i82830/vga.c
+++ b/src/northbridge/intel/i82830/vga.c
@@ -1,50 +1,106 @@
-/*\r
- * This file is part of the coreboot project.\r
- *\r
- * Copyright (C) 2009 Joseph Smith <joe@settoplinux.org>\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA\r
- */\r
-\r
-#include <console/console.h>\r
-#include <arch/io.h>\r
-#include <stdint.h>\r
-#include <device/device.h>\r
-#include <device/pci.h>\r
-#include <device/pci_ids.h>\r
-\r
-static void vga_init(device_t dev) {\r
-\r
-       printk_info("Starting Graphics Initialization\n");\r
-       pci_dev_init(dev);\r
-       printk_info("Graphics Initialization Complete\n");\r
-       /* Future TV-OUT code will be called from here. */\r
-}\r
-\r
-static const struct device_operations vga_operations = {\r
-       .read_resources   = pci_dev_read_resources,\r
-       .set_resources    = pci_dev_set_resources,\r
-       .enable_resources = pci_dev_enable_resources,\r
-       .init             = vga_init,\r
-       .scan_bus         = 0,\r
-       .enable           = 0,\r
-       .ops_pci          = 0,\r
-};\r
-\r
-static const struct pci_driver vga_driver __pci_driver = {\r
-       .ops    = &vga_operations,\r
-       .vendor = PCI_VENDOR_ID_INTEL,\r
-       .device = 0x3577,\r
-};\r
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2009 Joseph Smith <joe@settoplinux.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+#include <console/console.h>
+#include <arch/io.h>
+#include <stdint.h>
+#include <device/device.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <cbfs.h>
+#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#include <x86emu/x86emu.h>
+#endif
+
+static void vga_init(device_t dev)
+{
+       printk(BIOS_INFO, "Starting Graphics Initialization\n");
+       struct cbfs_file *file = cbfs_find("mbi.bin");
+       void *mbi = NULL;
+       unsigned int mbi_len = 0;
+
+       if (file) {
+               if (ntohl(file->type) != CBFS_TYPE_MBI) {
+                       printk(BIOS_INFO,  "CBFS:  MBI binary is of type %x instead of"
+                              "type %x\n", file->type, CBFS_TYPE_MBI);
+               } else {
+                       mbi = (void *) CBFS_SUBHEADER(file);
+                       mbi_len = ntohl(file->len);
+               }
+       } else {
+               printk(BIOS_INFO,  "Could not find MBI.\n");
+       }
+
+       if (mbi && mbi_len) {
+               /* The GDT or coreboot table is going to live here. But
+                * a long time after we relocated the GNVS, so this is
+                * not troublesome.
+                */
+               *(u32 *)0x500 = (u32)mbi;
+               *(u32 *)0x504 = (u32)mbi_len;
+               outb(0xeb, 0xb2);
+       }
+
+       pci_dev_init(dev);
+       printk(BIOS_INFO, "Graphics Initialization Complete\n");
+
+       /* Enable TV-Out */
+#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#define PIPE_A_CRT     (1 << 0)
+#define PIPE_A_LFP     (1 << 1)
+#define PIPE_A_TV      (1 << 3)
+#define PIPE_B_CRT     (1 << 8)
+#define PIPE_B_TV      (1 << 10)
+       printk(BIOS_DEBUG, "Enabling TV-Out\n");
+       void runInt10(void);
+       M.x86.R_AX = 0x5f64;
+       M.x86.R_BX = 0x0001; // Set Display Device, force execution
+       M.x86.R_CX = PIPE_A_CRT | PIPE_A_TV;
+       // M.x86.R_CX = PIPE_B_TV;
+       runInt10();
+       switch (M.x86.R_AX) {
+       case 0x005f:
+               printk(BIOS_DEBUG, "... failed.\n");
+               break;
+       case 0x015f:
+               printk(BIOS_DEBUG, "... ok.\n");
+               break;
+       default:
+               printk(BIOS_DEBUG, "... not supported.\n");
+               break;
+       }
+#endif
+}
+
+static const struct device_operations vga_operations = {
+       .read_resources   = pci_dev_read_resources,
+       .set_resources    = pci_dev_set_resources,
+       .enable_resources = pci_dev_enable_resources,
+       .init             = vga_init,
+       .scan_bus         = 0,
+       .enable           = 0,
+       .ops_pci          = 0,
+};
+
+static const struct pci_driver vga_driver __pci_driver = {
+       .ops    = &vga_operations,
+       .vendor = PCI_VENDOR_ID_INTEL,
+       .device = 0x3577,
+};