C and other Super I/O cosmetic fixes.
[coreboot.git] / src / superio / smsc / lpc47b397 / superio.c
index 6400b03c37714b18855d62534405bed000776770..9c4d8d9f10f24d905ae0914eb971ff46edd10fae 100644 (file)
@@ -1,9 +1,24 @@
-/* Copyright 2000  AG Electronics Ltd. */
-/* Copyright 2003-2004 Linux Networx */
-/* Copyright 2004 Tyan 
- */ 
-
-/* This code is distributed without warranty under the GPL v2 (see COPYING) */
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2000 AG Electronics Ltd.
+ * Copyright (C) 2003-2004 Linux Networx
+ * Copyright (C) 2004 Tyan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
 
 #include <arch/io.h>
 #include <device/device.h>
 #include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
+#include <stdlib.h>
 #include "chip.h"
 #include "lpc47b397.h"
 
-
-static void pnp_enter_conf_state(device_t dev) {
-        outb(0x55, dev->path.u.pnp.port);
+static void pnp_enter_conf_state(device_t dev)
+{
+       outb(0x55, dev->path.pnp.port);
 }
-static void pnp_exit_conf_state(device_t dev) {
-        outb(0xaa, dev->path.u.pnp.port);
+
+static void pnp_exit_conf_state(device_t dev)
+{
+       outb(0xaa, dev->path.pnp.port);
 }
 
-static void pnp_write_index(unsigned long port_base, uint8_t reg, uint8_t value)
+static void pnp_write_index(u16 port, u8 reg, u8 value)
 {
-        outb(reg, port_base);
-        outb(value, port_base + 1);
+       outb(reg, port);
+       outb(value, port + 1);
 }
 
-static uint8_t pnp_read_index(unsigned long port_base, uint8_t reg)
+static u8 pnp_read_index(u16 port, u8 reg)
 {
-        outb(reg, port_base);
-        return inb(port_base + 1);
+       outb(reg, port);
+       return inb(port + 1);
 }
 
-static void enable_hwm_smbus(device_t dev) {
-       /* enable SensorBus register access */
-        uint8_t reg, value;
-        reg = 0xf0; 
-        value = pnp_read_config(dev, reg);
-        value |= 0x01;
-        pnp_write_config(dev, reg, value);
-} 
+static void enable_hwm_smbus(device_t dev)
+{
+       /* Enable SensorBus register access. */
+       u8 reg8;
 
+       reg8 = pnp_read_config(dev, 0xf0);
+       reg8 |= (1 << 1);
+       pnp_write_config(dev, 0xf0, reg8);
+}
 
 static void lpc47b397_init(device_t dev)
 {
-       struct superio_smsc_lpc47b397_config *conf;
-       struct resource *res0, *res1;
-       if (!dev->enabled) {
+       struct superio_smsc_lpc47b397_config *conf = dev->chip_info;
+       struct resource *res0;
+
+       if (!dev->enabled)
                return;
-       }
-       conf = dev->chip_info;
-       switch(dev->path.u.pnp.device) {
-       case LPC47B397_SP1: 
+
+       switch(dev->path.pnp.device) {
+       case LPC47B397_SP1:
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com1);
                break;
@@ -65,68 +83,41 @@ static void lpc47b397_init(device_t dev)
                init_uart8250(res0->base, &conf->com2);
                break;
        case LPC47B397_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
-               init_pc_keyboard(res0->base, res1->base, &conf->keyboard);
+               pc_keyboard_init(&conf->keyboard);
                break;
        }
-       
 }
 
-void lpc47b397_pnp_set_resources(device_t dev)
+static void lpc47b397_pnp_set_resources(device_t dev)
 {
-
-       pnp_enter_conf_state(dev);  
-
+       pnp_enter_conf_state(dev);
        pnp_set_resources(dev);
+       /* dump_pnp_device(dev); */
+       pnp_exit_conf_state(dev);
+}
 
-#if 0
-        dump_pnp_device(dev);
-#endif
-                
-        pnp_exit_conf_state(dev);  
-        
-}       
-        
-void lpc47b397_pnp_enable_resources(device_t dev)
-{       
-
-        pnp_enter_conf_state(dev);
-
-        pnp_enable_resources(dev);
+static void lpc47b397_pnp_enable_resources(device_t dev)
+{
+       pnp_enter_conf_state(dev);
+       pnp_enable_resources(dev);
 
-        switch(dev->path.u.pnp.device) {
-        case LPC47B397_HWM:
-                printk_debug("lpc47b397 SensorBus Register Access enabled\r\n");
+       switch(dev->path.pnp.device) {
+       case LPC47B397_HWM:
+               printk(BIOS_DEBUG, "LPC47B397 SensorBus register access enabled\n");
                pnp_set_logical_device(dev);
-                enable_hwm_smbus(dev);
-                break;
-        }
-
-#if 0  
-        dump_pnp_device(dev);
-#endif
-
-        pnp_exit_conf_state(dev);
-
+               enable_hwm_smbus(dev);
+               break;
+       }
+       /* dump_pnp_device(dev); */
+       pnp_exit_conf_state(dev);
 }
 
-void lpc47b397_pnp_enable(device_t dev)
+static void lpc47b397_pnp_enable(device_t dev)
 {
-
-       pnp_enter_conf_state(dev);   
-
+       pnp_enter_conf_state(dev);
        pnp_set_logical_device(dev);
-
-       if(dev->enabled) {
-               pnp_set_enable(dev, 1);
-       }
-       else {
-               pnp_set_enable(dev, 0);
-       }
-
-       pnp_exit_conf_state(dev);  
-       
+       pnp_set_enable(dev, (dev->enabled) ? 1 : 0);
+       pnp_exit_conf_state(dev);
 }
 
 static struct device_operations ops = {
@@ -137,7 +128,6 @@ static struct device_operations ops = {
        .init             = lpc47b397_init,
 };
 
-
 #define HWM_INDEX 0
 #define HWM_DATA  1
 #define SB_INDEX  0x0b
@@ -146,72 +136,74 @@ static struct device_operations ops = {
 #define SB_DATA2  0x0e
 #define SB_DATA3  0x0f
 
-static int lsmbus_read_byte(device_t dev, uint8_t address)
+static int lsmbus_read_byte(device_t dev, u8 address)
 {
-        unsigned device;
-        struct resource *res;
+       unsigned int device;
+       struct resource *res;
        int result;
 
-        device = dev->path.u.i2c.device;
+       device = dev->path.i2c.device;
+
+       res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
+
+       pnp_write_index(res->base + HWM_INDEX, 0, device); /* Why 0? */
 
-        res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
+       /* We only read it one byte one time. */
+       result = pnp_read_index(res->base + SB_INDEX, address);
 
-       pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0?
-       
-       result = pnp_read_index(res->base+SB_INDEX, address); // we only read it one byte one time
-        
-        return result;
+       return result;
 }
 
-static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
-{       
-        unsigned device;
-        struct resource *res;
-        
-        device = dev->path.u.i2c.device;
+static int lsmbus_write_byte(device_t dev, u8 address, u8 val)
+{
+       unsigned int device;
+       struct resource *res;
+
+       device = dev->path.i2c.device;
        res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
 
-        pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0?
+       pnp_write_index(res->base+HWM_INDEX, 0, device); /* Why 0? */
+
+       /* We only write it one byte one time. */
+       pnp_write_index(res->base+SB_INDEX, address, val);
 
-        pnp_write_index(res->base+SB_INDEX, address, val); // we only write it one byte one time
-        
-        return 0;
+       return 0;
 }
 
 static struct smbus_bus_operations lops_smbus_bus = {
-//        .recv_byte  = lsmbus_recv_byte,
-//        .send_byte  = lsmbus_send_byte,
-        .read_byte  = lsmbus_read_byte,
-        .write_byte = lsmbus_write_byte,
+       /* .recv_byte  = lsmbus_recv_byte, */
+       /* .send_byte  = lsmbus_send_byte, */
+       .read_byte  = lsmbus_read_byte,
+       .write_byte = lsmbus_write_byte,
 };
+
 static struct device_operations ops_hwm = {
-        .read_resources   = pnp_read_resources,
-        .set_resources    = lpc47b397_pnp_set_resources,
-        .enable_resources = lpc47b397_pnp_enable_resources,
-        .enable           = lpc47b397_pnp_enable,
-        .init             = lpc47b397_init,
+       .read_resources   = pnp_read_resources,
+       .set_resources    = lpc47b397_pnp_set_resources,
+       .enable_resources = lpc47b397_pnp_enable_resources,
+       .enable           = lpc47b397_pnp_enable,
+       .init             = lpc47b397_init,
        .scan_bus         = scan_static_bus,
        .ops_smbus_bus    = &lops_smbus_bus,
 };
 
 static struct pnp_info pnp_dev_info[] = {
-        { &ops, LPC47B397_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
-        { &ops, LPC47B397_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
-        { &ops, LPC47B397_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-        { &ops, LPC47B397_SP2,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-        { &ops, LPC47B397_KBC,  PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
-       { &ops_hwm, LPC47B397_HWM,  PNP_IO0, { 0x7f0, 0 }, },
-        { &ops, LPC47B397_RT,   PNP_IO0, { 0x780, 0 }, },
+       { &ops, LPC47B397_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B397_PP,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B397_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B397_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B397_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, },
+       { &ops_hwm, LPC47B397_HWM,  PNP_IO0, {0x07f0, 0}, },
+       { &ops, LPC47B397_RT,  PNP_IO0, {0x0780, 0}, },
 };
 
 static void enable_dev(struct device *dev)
 {
        pnp_enable_devices(dev, &pnp_ops,
-               sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
+               ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_smsc_lpc47b397_ops = {
        CHIP_NAME("SMSC LPC47B397 Super I/O")
        .enable_dev = enable_dev,
 };
-