removed unused code, code reformat

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

1 files changed, 6 insertions, 157 deletions

diff --git a/src/mainboard/tyan/s2885/mainboard.c b/src/mainboard/tyan/s2885/mainboard.c
index 559f5b450e..2c01584310 100644
--- a/src/mainboard/tyan/s2885/mainboard.c
+++ b/src/mainboard/tyan/s2885/mainboard.c
@@ -9,164 +9,9 @@
 
 unsigned long initial_apicid[CONFIG_MAX_CPUS] =
 {
-	0,1
+	0, 1
 };
 
-#if 0
-static void fixup_lsi_53c1030(struct device *pdev)
-{
-//	uint8_t byte;
-	uint16_t word;
-
-	byte = 1;
-        pci_write_config8(pdev, 0xff, byte);
-           // Set the device id 
-//      pci_write_config_word(pdev, PCI_DEVICE_ID, PCI_DEVICE_ID_LSILOGIC_53C1030);
-           // Set the subsytem vendor id 
-//      pci_write_config16(pdev, PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_TYAN);  
-        word = 0x10f1;
-	pci_write_config16(pdev, PCI_SUBSYSTEM_VENDOR_ID, word);
-            // Set the subsytem id 
-	word = 0x2880;
-        pci_write_config16(pdev, PCI_SUBSYSTEM_ID, word);
-            // Disable writes to the device id 
-	byte = 0;
-        pci_write_config8(pdev, 0xff, byte);
-
-//	lsi_scsi_init(pdev);
-	
-}
-#endif
-
-#if 0
-static void print_pci_regs(struct device *dev)
-{
-      uint8_t byte;
-      int i;
-
-      for(i=0;i<256;i++) {
-	     byte = pci_read_config8(dev, i);
-   
-             if((i%16)==0) printk_debug("\n%02x:",i);
-             printk_debug(" %02x",byte);
-      }
-      printk_debug("\n");
-	
-//        pci_write_config8(dev, 0x4, byte);
-
-}
-#endif
-#if 0
-static void print_mem(void)
-{
-        int i;
-	int low_1MB = 0;
-	for(i=low_1MB;i<low_1MB+1024*4;i++) {
-             if((i%16)==0) printk_debug("\n %08x:",i);
-             printk_debug(" %02x ",(unsigned char)*((unsigned char *)i));
-             }
-
-        for(i=low_1MB;i<low_1MB+1024*4;i++) {
-             if((i%16)==0) printk_debug("\n %08x:",i);
-             printk_debug(" %c ",(unsigned char)*((unsigned char *)i));
-             }
- }
-#endif
-#if 0
-static void amd8111_enable_rom(void)
-{
-        uint8_t byte;
-        struct device *dev;
-
-        /* Enable 4MB rom access at 0xFFC00000 - 0xFFFFFFFF */
-        /* Locate the amd8111 */
-        dev = dev_find_device(0x1022, 0x7468, 0);
-
-        /* Set the 4MB enable bit bit */
-        byte = pci_read_config8(dev, 0x43);
-        byte |= 0x80;
-        pci_write_config8(dev, 0x43, byte);
-}
-#endif
-#if 0
-static void onboard_scsi_fixup(void)
-{
-        struct device *dev;
-#if 1 
-	unsigned char i,j,k;
-
-	for(i=0;i<=6;i++) {
-		for(j=0;j<=0x1f;j++) {
-			for (k=0;k<=6;k++){
-				dev = dev_find_slot(i, PCI_DEVFN(j, k));
-				if (dev) {
-			                printk_debug("%02x:%02x:%02x",i,j,k);
-					print_pci_regs(dev);
-        			}
-			}
-		}
-	}
-#endif
-
-
-#if 0
-        dev = dev_find_device(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1030,0);
-        if(!dev) {
-                printk_info("LSI_SCSI_FW_FIXUP: No Device Found!");
-                return;
-        }
-
-	lsi_scsi_init(dev); 
-#endif
-//	print_mem();
-//	amd8111_enable_rom();
-}
-#endif
-#if 0
-static void vga_fixup(void) {
-        // we do this right here because:
-        // - all the hardware is working, and some VGA bioses seem to need
-        //   that
-        // - we need page 0 below for linuxbios tables.
-#if CONFIG_REALMODE_IDT == 1
-        printk_debug("INSTALL REAL-MODE IDT\n");
-        setup_realmode_idt();
-#endif
-#if CONFIG_VGABIOS == 1
-        printk_debug("DO THE VGA BIOS\n");
-        do_vgabios(0x0600);
-        post_code(0x93);
-#endif
-
-}
-
-#endif
- 
-
-static void
-enable(struct chip *chip, enum chip_pass pass)
-{
-
-        struct mainboard_tyan_s2885_config *conf = 
-		(struct mainboard_tyan_s2885_config *)chip->chip_info;
-
-        switch (pass) {
-		default: break;
-//		case CONF_PASS_PRE_CONSOLE:
-//		case CONF_PASS_PRE_PCI:
-//		case CONF_PASS_POST_PCI:		
-                case CONF_PASS_PRE_BOOT:
-//			if (conf->fixup_scsi)
- //       			onboard_scsi_fixup();
-//			if (conf->fixup_vga)
-//				vga_fixup();
-			printk_debug("mainboard fixup pass %d done\r\n",
-					pass);
-			break;
-	}
-
-}
-
 static struct device_operations mainboard_operations = {
         .read_resources   = root_dev_read_resources,
         .set_resources    = root_dev_set_resources,
@@ -180,6 +25,10 @@ static void enumerate(struct chip *chip)
 {
         struct chip *child;
 
+	if (chip->control && chip->control->name) {
+		printk_debug("Enumerating: %s\n", chip->control->name);
+	}
+
 	/* update device operation for dynamic root */
         dev_root.ops = &mainboard_operations;
         chip->dev = &dev_root;
@@ -188,8 +37,8 @@ static void enumerate(struct chip *chip)
 		child->bus = &dev_root.link[0];
         }
 }
+
 struct chip_control mainboard_tyan_s2885_control = {
-	.enable    = enable,
         .enumerate = enumerate,
         .name      = "Tyan s2885 mainboard ",
 };