Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / southbridge / via / vt8235 / vt8235.c

diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index 2687972afa070bdaf03b2e8af303e80d2834bfd2..4fa27846611a43aa950185c15e79b7f11f63f568 100644 (file)
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -7,31 +7,23 @@
 #include <pc80/i8259.h>
 #include "chip.h"
 
-/*
- * Base VT8235.
- */
-
-void hard_reset(void) 
-{
-       printk(BIOS_ERR, "NO HARD RESET ON VT8235! FIX ME!\n");
-}
-
 static void keyboard_on(struct device *dev)
 {
-       unsigned char regval;
+       u8 regval;
 
        regval = pci_read_config8(dev, 0x51);
-       regval |= 0x05; 
+       regval |= 0x05;
        regval &= 0xfd;
        pci_write_config8(dev, 0x51, regval);
 
        pc_keyboard_init(0);
 }
 
+#ifdef UNUSED_CODE
 void dump_south(device_t dev0)
 {
        int i,j;
-       
+
        for(i = 0; i < 256; i += 16) {
                printk(BIOS_DEBUG, "0x%x: ", i);
                for(j = 0; j < 16; j++) {
@@ -41,45 +33,51 @@ void dump_south(device_t dev0)
        }
 }
 
-void set_led()
+void set_led(void)
 {
-       // set power led to steady now that lxbios has virtually done its job
+       // set power led to steady now that coreboot has virtually done its job
        device_t dev;
        dev = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, 0);
        pci_write_config8(dev, 0x94, 0xb0);
 }
-
+#endif
 
 static void vt8235_enable(struct device *dev)
 {
-       unsigned char regval;
-       unsigned short vendor,model;
+       u8 regval;
+       u16 vendor,model;
 
        vendor = pci_read_config16(dev,0);
        model = pci_read_config16(dev,0x2);
 
        printk(BIOS_DEBUG, "In vt8235_enable %04x %04x.\n",vendor,model);
-       
-       /* if this is not the southbridge itself just return */
-       /* this is necessary because USB devices are slot 10, whereas this device is slot 11 
-         therefore usb devices get called first during the bus scan */
+
+       /* If this is not the southbridge itself just return.
+        * This is necessary because USB devices are slot 10, whereas this
+        * device is slot 11 therefore usb devices get called first during
+        * the bus scan. We don't want to wait until we could do dev->init
+        * because that's too late.
+        */
 
        if( (vendor != PCI_VENDOR_ID_VIA) || (model != PCI_DEVICE_ID_VIA_8235))
                return;
 
        printk(BIOS_DEBUG, "Initialising Devices\n");
 
-       setup_i8259();   // make sure interupt controller is configured before keyboard init 
+       /* make sure interupt controller is configured before keyboard init */
+       setup_i8259();
 
        /* enable RTC and ethernet */
        regval = pci_read_config8(dev, 0x51);
-       regval |= 0x18; 
+       regval |= 0x18;
        pci_write_config8(dev, 0x51, regval);
 
        /* turn on keyboard */
        keyboard_on(dev);
 
-       /* enable USB 1.1 & USB 2.0 -redundant really since we've already been there - see note above*/
+       /* enable USB 1.1 & USB 2.0 - redundant really since we've
+        * already been there - see note above
+        */
        regval = pci_read_config8(dev, 0x50);
        regval &= ~(0x36);
        pci_write_config8(dev, 0x50, regval);