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

[repository service]

Author: blueswirl
Date: Sat Apr 27 13:42:16 2013
New Revision: 1132
URL: http://tracker.coreboot.org/trac/openbios/changeset/1132

Log:
sparc64: remove hacks for the "interrupts" property

Forcing the "interrupts" property to the value of zero is not
necessary, and is incompatible with the IRQ mapping schema
introduced in the previous commit

Signed-off-by: Artyom Tarasenko 
Signed-off-by: Blue Swirl

Modified:
   trunk/openbios-devel/drivers/ide.c
   trunk/openbios-devel/drivers/pci.c
   trunk/openbios-devel/drivers/pci_database.c
   trunk/openbios-devel/drivers/pci_database.h

Modified: trunk/openbios-devel/drivers/ide.c
==============================================================================
--- trunk/openbios-devel/drivers/ide.c	Sat Apr 27 13:42:14 2013	(r1131)
+++ trunk/openbios-devel/drivers/ide.c	Sat Apr 27 13:42:16 2013	(r1132)
@@ -1432,8 +1432,6 @@
    	props[0]=14; props[1]=0;
    	set_property(dnode, "interrupts",
    		     (char *)&props, 2*sizeof(props[0]));
-#elif defined(CONFIG_SPARC64)
-                set_int_property(get_cur_dev(), "interrupts", 0);
 #endif

props[0] = __cpu_to_be32(chan->io_regs[0]);

Modified: trunk/openbios-devel/drivers/pci.c
==============================================================================
--- trunk/openbios-devel/drivers/pci.c	Sat Apr 27 13:42:14 2013	(r1131)
+++ trunk/openbios-devel/drivers/pci.c	Sat Apr 27 13:42:16 2013	(r1132)
@@ -537,14 +537,6 @@
    return 0;
 }

-int virtio_config_cb(const pci_config_t *config)
-{
-#if defined(CONFIG_SPARC64)
-    set_int_property(get_cur_dev(), "interrupts", 0);
-#endif
-    return 0;
-}
-
 int ide_config_cb2 (const pci_config_t *config)
 {
    ob_ide_init(config->path,

Modified: trunk/openbios-devel/drivers/pci_database.c
==============================================================================
--- trunk/openbios-devel/drivers/pci_database.c	Sat Apr 27 13:42:14 2013	(r1131)
+++ trunk/openbios-devel/drivers/pci_database.c	Sat Apr 27 13:42:16 2013	(r1132)
@@ -52,7 +52,7 @@
         NULL, "virtio-scsi", NULL,
         "pci1af4,1001\0pci1af4,1001\0pciclass,01018f\0",
         0, 0, 0,
-        virtio_config_cb, NULL,
+        NULL, NULL,
     },
     {
         0xFFFF, 0xFFFF,
@@ -134,7 +134,7 @@
         NULL, "virtio-net", NULL,
         "pci1af4,1000\0pci1af4,1000\0pciclass,020000\0",
         0, 0, 0,
-        virtio_config_cb, NULL,
+        NULL, NULL,
     },
     {
         0xFFFF, 0xFFFF,

Modified: trunk/openbios-devel/drivers/pci_database.h
==============================================================================
--- trunk/openbios-devel/drivers/pci_database.h	Sat Apr 27 13:42:14 2013	(r1131)
+++ trunk/openbios-devel/drivers/pci_database.h	Sat Apr 27 13:42:16 2013	(r1132)
@@ -28,7 +28,6 @@
     const void *private;
 };

-extern int virtio_config_cb(const pci_config_t *config);
 extern int ide_config_cb2(const pci_config_t *config);
 extern int eth_config_cb(const pci_config_t *config);
 extern int macio_heathrow_config_cb(const pci_config_t *config);