printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / supermicro / h8qme_fam10 / get_bus_conf.c

diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
index bfadeef0f62f3af68780d3d961196d8fe4221f2c..2ee436b9e70f29e4501e5e12a2d413e64cf2e033 100644 (file)
--- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
@@ -62,8 +62,7 @@ static unsigned hcdnx[] = {
        0x20202020, 0x20202020,
 };
 
-unsigned sbdn3; 
-
+unsigned sbdn3;
 
 extern void get_pci1234(void);
 
@@ -99,9 +98,8 @@ void get_bus_conf(void)
        sysconf.sbdn = (sysconf.hcdn[0] & 0xff); // first byte of first chain
        m->bus_mcp55[0] = (sysconf.pci1234[0] >> 12) & 0xff;
 
-
-  m->bus_8132_0 = (sysconf.pci1234[1] >> 12) & 0xff; 
-       sbdn3 =(sysconf.hcdn[1] & 0xff); // first byte of second chain 
+       m->bus_8132_0 = (sysconf.pci1234[1] >> 12) & 0xff;
+       sbdn3 = (sysconf.hcdn[1] & 0xff); // first byte of second chain
 
                /* MCP55 */
                dev = dev_find_slot(m->bus_mcp55[0], PCI_DEVFN(sysconf.sbdn + 0x06,0));
@@ -110,7 +108,7 @@ void get_bus_conf(void)
                        m->bus_mcp55[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
                }
                else {
-                       printk_debug("ERROR - could not find PCI 1:%02x.0, using defaults\n", sysconf.sbdn + 0x06);
+                       printk(BIOS_DEBUG, "ERROR - could not find PCI 1:%02x.0, using defaults\n", sysconf.sbdn + 0x06);
                }
 
                for(i=2; i<8;i++) {
@@ -119,25 +117,25 @@ void get_bus_conf(void)
                                m->bus_mcp55[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
                        }
                        else {
-                               printk_debug("ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2 );
+                               printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:%02x.0, using defaults\n", m->bus_mcp55[0], sysconf.sbdn + 0x0a + i - 2 );
                        }
                }
 
-/*8132_1*/
+               /* 8132_1 */
 
-               dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(sbdn3,0));
-    m->bus_8132_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
+               dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(sbdn3, 0));
+               m->bus_8132_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
                m->bus_8132_2 = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                m->bus_8132_2++;
-/*8132_2*/   
 
-               dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(sbdn3+1,0));
+               /* 8132_2 */
+               dev = dev_find_slot(m->bus_8132_0, PCI_DEVFN(sbdn3 + 1, 0));
                m->bus_8132_2 = pci_read_config8(dev, PCI_SECONDARY_BUS);
                m->bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                m->bus_isa++;
 
        for(i=0; i< sysconf.hc_possible_num; i++) {
-                       if(!(sysconf.pci1234[i] & 0x1) ) continue;
+               if(!(sysconf.pci1234[i] & 0x1) ) continue;
 
                unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff;
                unsigned busn_max = (sysconf.pci1234[i] >> 20) & 0xff;
@@ -145,7 +143,7 @@ void get_bus_conf(void)
                        m->bus_type[j] = 1;
                if(m->bus_isa <= busn_max)
                        m->bus_isa = busn_max + 1;
-               printk_debug("i=%d bus range: [%x, %x] bus_isa=%x\n",i, busn, busn_max, m->bus_isa);
+               printk(BIOS_DEBUG, "i=%d bus range: [%x, %x] bus_isa=%x\n",i, busn, busn_max, m->bus_isa);
        }
 
 /*I/O APICs:   APIC ID Version State           Address*/
@@ -155,6 +153,6 @@ void get_bus_conf(void)
        apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
 #endif
        m->apicid_mcp55 = apicid_base+0;
-  m->apicid_8132_1 = apicid_base+1;
+       m->apicid_8132_1 = apicid_base+1;
        m->apicid_8132_2 = apicid_base+2;
 }