[commit] r1111 - trunk/openbios-devel/drivers

[repository service]

Author: mcayland
Date: Fri Apr  5 12:34:38 2013
New Revision: 1111
URL: http://tracker.coreboot.org/trac/openbios/changeset/1111

Log:
macio: Remove unnecessary newworld check

openpic_init is only called on newworld machines.

Signed-off-by: Amadeusz Sławiński 
Signed-off-by: Mark Cave-Ayland

Modified:
   trunk/openbios-devel/drivers/macio.c

Modified: trunk/openbios-devel/drivers/macio.c
==============================================================================
--- trunk/openbios-devel/drivers/macio.c	Fri Apr  5 12:34:10 2013	(r1110)
+++ trunk/openbios-devel/drivers/macio.c	Fri Apr  5 12:34:38 2013	(r1111)
@@ -167,43 +167,41 @@

fword("finish-device");

-        if (is_newworld()) {
-            u32 *interrupt_map;
-            int len, i;
+        u32 *interrupt_map;
+        int len, i;

-            /* patch in interrupt parent */
-            dnode = find_dev(buf);
+        /* patch in interrupt parent */
+        dnode = find_dev(buf);

-            target_node = find_dev("/pci/mac-io");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci/mac-io/escc/ch-a");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io/escc/ch-a");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci/mac-io/escc/ch-b");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io/escc/ch-b");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci/mac-io/ata-1");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io/ata-1");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci/mac-io/ata-2");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io/ata-2");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci/mac-io/ata-3");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io/ata-3");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci/mac-io/via-cuda");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci/mac-io/via-cuda");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            target_node = find_dev("/pci");
-            set_int_property(target_node, "interrupt-parent", dnode);
+        target_node = find_dev("/pci");
+        set_int_property(target_node, "interrupt-parent", dnode);

-            interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len);
-            for (i = 0; i < 8; i++) {
-                interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode;
-            }
-            set_property(target_node, "interrupt-map", (char *)interrupt_map, len);
+        interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len);
+        for (i = 0; i < 8; i++) {
+            interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode;
         }
+        set_property(target_node, "interrupt-map", (char *)interrupt_map, len);
 }

DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io");