C and other Super I/O cosmetic fixes.
[coreboot.git] / src / superio / ite / it8716f / superio.c
index d43e202158d1d8109a8ef117fa3f080c3fa35750..54e640f913c5795eddc9e056fff7853f9969388f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * This file is part of the LinuxBIOS project.
+ * This file is part of the coreboot project.
  *
  * Copyright (C) 2006 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2007 AMD
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <arch/io.h>
+#include <stdlib.h>
 #include "chip.h"
 #include "it8716f.h"
 
-/* Base address 0x2e: 0x87 0x01 0x55 0x55. */
-/* Base address 0x4e: 0x87 0x01 0x55 0xaa. */
 static void pnp_enter_ext_func_mode(device_t dev)
 {
-       outb(0x87, dev->path.u.pnp.port);
-       outb(0x01, dev->path.u.pnp.port);
-       outb(0x55, dev->path.u.pnp.port);
-
-       if (dev->path.u.pnp.port == 0x4e) {
-               outb(0xaa, dev->path.u.pnp.port);
-       } else {
-               outb(0x55, dev->path.u.pnp.port);
-       }
+       u16 port = dev->path.pnp.port;
+
+       outb(0x87, port);
+       outb(0x01, port);
+       outb(0x55, port);
+       outb((port == 0x4e) ? 0xaa : 0x55, port);
 }
 
 static void pnp_exit_ext_func_mode(device_t dev)
@@ -50,47 +46,45 @@ static void pnp_exit_ext_func_mode(device_t dev)
        pnp_write_config(dev, 0x02, 0x02);
 }
 
-static void pnp_write_index(uint16_t port_base, uint8_t reg, uint8_t value)
+#if !defined(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) || !CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL
+static void pnp_write_index(u16 port_base, u8 reg, u8 value)
 {
        outb(reg, port_base);
        outb(value, port_base + 1);
 }
 
-static uint8_t pnp_read_index(uint16_t port_base, uint8_t reg)
+static u8 pnp_read_index(u16 port_base, u8 reg)
 {
        outb(reg, port_base);
        return inb(port_base + 1);
 }
 
-static void init_ec(uint16_t base)
+static void init_ec(u16 base)
 {
-       uint8_t value;
+       u8 value;
 
-       /* Read out current value of FAN_CTL control register (0x14). */
+       /* Read out current value of FAN_CTL (0x14). */
        value = pnp_read_index(base, 0x14);
-       printk_debug("FAN_CTL: reg = 0x%04x, read value = 0x%02x\r\n",
-                    base + 0x14, value);
+       printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, read value = 0x%02x\n",
+              base + 0x14, value);
 
-       /* Set FAN_CTL control register (0x14) polarity to high, and
-          activate fans 1, 2 and 3. */
+       /* Set FAN_CTL (0x14) polarity to high, activate fans 1, 2 and 3. */
        pnp_write_index(base, 0x14, value | 0x87);
-       printk_debug("FAN_CTL: reg = 0x%04x, writing value = 0x%02x\r\n",
-                    base + 0x14, value | 0x87);
+       printk(BIOS_DEBUG, "FAN_CTL: reg = 0x%04x, writing value = 0x%02x\n",
+              base + 0x14, value | 0x87);
 }
+#endif
 
 static void it8716f_init(device_t dev)
 {
-       struct superio_ite_it8716f_config *conf;
-       struct resource *res0, *res1;
+       struct superio_ite_it8716f_config *conf = dev->chip_info;
+       struct resource *res0;
 
-       if (!dev->enabled) {
+       if (!dev->enabled)
                return;
-       }
-
-       conf = dev->chip_info;
 
        /* TODO: FDC, PP, KBCM, MIDI, GAME, IR. */
-       switch (dev->path.u.pnp.device) {
+       switch (dev->path.pnp.device) {
        case IT8716F_SP1:
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com1);
@@ -105,9 +99,7 @@ static void it8716f_init(device_t dev)
                init_ec(res0->base + EC_INDEX_PORT);
                break;
        case IT8716F_KBCK:
-               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;
        }
 }
@@ -143,25 +135,22 @@ static struct device_operations ops = {
 };
 
 static struct pnp_info pnp_dev_info[] = {
-       {&ops, IT8716F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0},},
-       {&ops, IT8716F_SP1, PNP_IO0 | PNP_IRQ0, {0x7f8, 0},},
-       {&ops, IT8716F_SP2, PNP_IO0 | PNP_IRQ0, {0x7f8, 0},},
-       {&ops, IT8716F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0},},
-       {&ops, IT8716F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7f8, 0},
-        {0x7f8, 0x4},},
-       {&ops, IT8716F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x7ff, 0},
-        {0x7ff, 0x4},},
-       {&ops, IT8716F_KBCM, PNP_IRQ0,},
-       {&ops, IT8716F_GPIO,},
-       {&ops, IT8716F_MIDI, PNP_IO0 | PNP_IRQ0, {0x7fe, 0x4},},
-       {&ops, IT8716F_GAME, PNP_IO0, {0x7ff, 0},},
-       {&ops, IT8716F_IR,},
+       { &ops, IT8716F_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, IT8716F_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, IT8716F_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, IT8716F_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, IT8716F_EC, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, },
+       { &ops, IT8716F_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07ff, 0}, {0x07ff, 4}, },
+       { &ops, IT8716F_KBCM, PNP_IRQ0, },
+       { &ops, IT8716F_GPIO, PNP_IO1 | PNP_IO2, {0, 0}, {0x07f8, 0}, {0x07f8, 0}, },
+       { &ops, IT8716F_MIDI, PNP_IO0 | PNP_IRQ0, {0x07fe, 4}, },
+       { &ops, IT8716F_GAME, PNP_IO0, {0x07ff, 0}, },
+       { &ops, IT8716F_IR, },
 };
 
 static void enable_dev(struct device *dev)
 {
-       pnp_enable_devices(dev, &ops,
-               sizeof(pnp_dev_info) / sizeof(pnp_dev_info[0]), pnp_dev_info);
+       pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info);
 }
 
 struct chip_operations superio_ite_it8716f_ops = {