i855: Remove useless memctrl indirection.

[coreboot.git] / src / northbridge / intel / i855 / debug.c

diff --git a/src/northbridge/intel/i855/debug.c b/src/northbridge/intel/i855/debug.c
index 4083add6f1b2ded8ecb6fc1e263be406ed195d7b..0c6747e4a371bccf467f27ae3397eff6a058214b 100644 (file)
--- a/src/northbridge/intel/i855/debug.c
+++ b/src/northbridge/intel/i855/debug.c
@@ -18,23 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-/*
- * generic K8 debug code, used by mainboard specific romstage.c
- *
- */
-#if 1
-/*
-static void print_debug_pci_dev(unsigned dev)
-{
-       print_debug("PCI: ");
-       print_debug_hex8((dev >> 16) & 0xff);
-       print_debug_char(':');
-       print_debug_hex8((dev >> 11) & 0x1f);
-       print_debug_char('.');
-       print_debug_hex8((dev >> 8) & 7);
-}
-*/
-
+#include <spd.h>
 
 static void print_debug_pci_dev(unsigned dev)
 {
@@ -46,11 +30,11 @@ static void print_debug_pci_dev(unsigned dev)
        print_debug_hex8((dev >> 12) & 0x07);
 }
 
-static void print_pci_devices(void)
+static inline void print_pci_devices(void)
 {
        device_t dev;
-       for(dev = PCI_DEV(0, 0, 0); 
-               dev <= PCI_DEV(0, 0x1f, 0x7); 
+       for(dev = PCI_DEV(0, 0, 0);
+               dev <= PCI_DEV(0, 0x1f, 0x7);
                dev += PCI_DEV(0,0,1)) {
                uint32_t id;
                id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -60,7 +44,7 @@ static void print_pci_devices(void)
                        continue;
                }
                print_debug_pci_dev(dev);
-               print_debug("\r\n");
+               print_debug("\n");
        }
 }
 
@@ -68,8 +52,8 @@ static void dump_pci_device(unsigned dev)
 {
        int i;
        print_debug_pci_dev(dev);
-       print_debug("\r\n");
-       
+       print_debug("\n");
+
        for(i = 0; i <= 255; i++) {
                unsigned char val;
                if ((i & 0x0f) == 0) {
@@ -80,16 +64,16 @@ static void dump_pci_device(unsigned dev)
                print_debug_char(' ');
                print_debug_hex8(val);
                if ((i & 0x0f) == 0x0f) {
-                       print_debug("\r\n");
+                       print_debug("\n");
                }
        }
 }
 
-static void dump_pci_devices(void)
+static inline void dump_pci_devices(void)
 {
        device_t dev;
-       for(dev = PCI_DEV(0, 0, 0); 
-               dev <= PCI_DEV(0, 0x1f, 0x7); 
+       for(dev = PCI_DEV(0, 0, 0);
+               dev <= PCI_DEV(0, 0x1f, 0x7);
                dev += PCI_DEV(0,0,1)) {
                uint32_t id;
                id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -102,72 +86,45 @@ static void dump_pci_devices(void)
        }
 }
 
-static void dump_spd_registers(const struct mem_controller *ctrl)
+static inline void dump_spd_registers(void)
 {
        int i;
-       print_debug("\r\n");
+       print_debug("\n");
        for(i = 0; i < 2; i++) {
                unsigned device;
-               device = ctrl->channel0[i];
+               device = DIMM0 + i;
                if (device) {
                        int j;
-                       print_debug("dimm: "); 
-                       print_debug_hex8(i); 
+                       print_debug("dimm: ");
+                       print_debug_hex8(i);
                        print_debug(".0: ");
                        print_debug_hex8(device);
                        for(j = 0; j < 256; j++) {
                                int status;
                                unsigned char byte;
                                if ((j & 0xf) == 0) {
-                                       print_debug("\r\n");
-                                       print_debug_hex8(j);
-                                       print_debug(": ");
-                               }
-                               status = smbus_read_byte(device, j);
-                               if (status < 0) {
-                                       print_debug("bad device\r\n");
-                                       break;
-                               }
-                               byte = status & 0xff;
-                               print_debug_hex8(byte);
-                               print_debug_char(' ');
-                       }
-                       print_debug("\r\n");
-               }
-#if 0
-               device = ctrl->channel1[i];
-               if (device) {
-                       int j;
-                       print_debug("dimm: "); 
-                       print_debug_hex8(i); 
-                       print_debug(".1: ");
-                       print_debug_hex8(device);
-                       for(j = 0; j < 256; j++) {
-                               int status;
-                               unsigned char byte;
-                               if ((j & 0xf) == 0) {
-                                       print_debug("\r\n");
+                                       print_debug("\n");
                                        print_debug_hex8(j);
                                        print_debug(": ");
                                }
                                status = smbus_read_byte(device, j);
                                if (status < 0) {
-                                       print_debug("bad device\r\n");
+                                       print_debug("bad device\n");
                                        break;
                                }
                                byte = status & 0xff;
                                print_debug_hex8(byte);
                                print_debug_char(' ');
                        }
-                       print_debug("\r\n");
+                       print_debug("\n");
                }
-#endif
        }
 }
-static void dump_smbus_registers(void)
+
+static inline void dump_smbus_registers(void)
 {
         int i;
-        print_debug("\r\n");
+        print_debug("\n");
         for(i = 1; i < 0x80; i++) {
                 unsigned device;
                 device = i;
@@ -175,23 +132,22 @@ static void dump_smbus_registers(void)
                 print_debug("smbus: ");
                 print_debug_hex8(device);
                 for(j = 0; j < 256; j++) {
-                       int status; 
+                       int status;
                         unsigned char byte;
                         if ((j & 0xf) == 0) {
-                               print_debug("\r\n");
+                               print_debug("\n");
                                 print_debug_hex8(j);
                                 print_debug(": ");
                         }
                         status = smbus_read_byte(device, j);
                         if (status < 0) {
-                                print_debug("bad device\r\n");
+                                print_debug("bad device\n");
                                 break;
                         }
                         byte = status & 0xff;
                         print_debug_hex8(byte);
                         print_debug_char(' ');
                 }
-                print_debug("\r\n");
-       }       
+                print_debug("\n");
+       }
 }
-#endif