*** empty log message ***

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1748 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/drivers/generic/debug/debug_dev.c

@@ -3,6 +3,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
+#include <cpu/x86/msr.h>
 #include "chip.h"
 
 static void print_pci_regs(struct device *dev)
@@ -13,8 +14,7 @@ static void print_pci_regs(struct device *dev)
       for(i=0;i<256;i++) {
 	     byte = pci_read_config8(dev, i);
    
-		if ((i & 0xf) == 0)
+             if((i & 0xf)==0) printk_debug("\n%02x:",i);
-			printk_debug("\n%02x:", i);
              printk_debug(" %02x",byte);
       }
       printk_debug("\n");
@@ -25,8 +25,7 @@ static void print_mem(void)
         unsigned int i;
 	unsigned int start = 0xfffff000;
 	for(i=start;i<0xffffffff;i++) {
-		if ((i & 0xf) == 0)
+             if((i & 0xf)==0) printk_debug("\n %08x:",i);
-			printk_debug("\n %08x:", i);
              printk_debug(" %02x",(unsigned char)*((unsigned char *)i));
              }
 	printk_debug(" %02x\n",(unsigned char)*((unsigned char *)i));
@@ -47,29 +46,24 @@ static void print_pci_regs_all(void)
 				if(!dev->enabled) {
 					continue;
 				}
-				printk_debug("\n%02x:%02x:%02x aka %s", i,
+			        printk_debug("\n%02x:%02x:%02x aka %s",i,j,k, dev_path(dev));
-					     j, k, dev_path(dev));
 				print_pci_regs(dev);
 			}
 		}
 	}
+
 }
 
-static void debug_init(device_t dev)
+static void print_msr()
 {
-	unsigned bus;
-	unsigned devfn;
-
-//      print_pci_regs_all();
-
-	print_mem();
-#if 0
         msr_t msr;
         unsigned index;
         unsigned eax, ebx, ecx, edx;
         index = 0x80000007;
         printk_debug("calling cpuid 0x%08x\n", index);
-	asm volatile ("cpuid":"=a" (eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
+        asm volatile(
+                "cpuid"
+                : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
                 : "a" (index)
                 );
         printk_debug("cpuid[%08x]: %08x %08x %08x %08x\n",
@@ -81,7 +75,35 @@ static void debug_init(device_t dev)
                 printk_debug("msr[0x%08x]: 0x%08x%08x\n",
                         index, msr.hi, msr.hi);
         }
+
+}
+ 
+static void debug_init(device_t dev)
+{
+	device_t parent;
+	switch(dev->path.u.pnp.device) {
+#if CONFIG_CHIP_NAME
+	case 0:
+		parent = dev->bus->dev;
+		printk_debug("DEBUG: %s", dev_path(parent));
+		if(parent->chip_ops && parent->chip_ops->name) {
+			printk_debug(": %s\n", parent->chip_ops->name);
+		} else {
+			printk_debug("\n");
+		}
+		break;
 #endif
+		
+	case 1:
+		print_pci_regs_all();
+		break;
+	case 2: 
+		print_mem();
+		break;
+	case 3:
+		print_msr();
+		break;
+	}
 }
 
 static void debug_noop(device_t dummy)

src/mainboard/tyan/s2885/Config.lb

@@ -157,6 +157,12 @@ chip northbridge/amd/amdk8
 					device pci 1.0 off end
 				end
 				device pci 1.0 on
+                                        chip drivers/generic/debug
+                                                device pnp 2.0 on end
+                                                device pnp 2.1 off end
+                                                device pnp 2.2 off end
+                                                device pnp 2.3 on end
+                                        end
 					chip superio/winbond/w83627hf
 						device pnp 2e.0 on #  Floppy
                                  			io 0x60 = 0x3f0
@@ -210,7 +216,14 @@ chip northbridge/amd/amdk8
 		
 		device pci 18.1 on end
 		device pci 18.2 on end
-		device pci 18.3 on end
+		device pci 18.3 on 
+#                        chip drivers/generic/debug
+#                                device pnp 1.0 on end
+#                                device pnp 1.1 off end
+#                                device pnp 1.2 off end
+#                                device pnp 1.3 on end
+#                        end
+		end
 
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
@@ -232,6 +245,9 @@ chip northbridge/amd/amdk8
 
         chip drivers/generic/debug 
                 device pnp 0.0 on end
+                device pnp 0.1 off end 
+                device pnp 0.2 off end
+                device pnp 0.3 on end
         end
 end