C and other Super I/O cosmetic fixes.
[coreboot.git] / src / superio / smsc / lpc47b272 / superio.c
index 6222a3d3fbc9374999df576bb68011e4a9d44d57..5bf385c7fb49307d382529be92f9fad95d15f3b1 100644 (file)
@@ -45,7 +45,7 @@ static void lpc47b272_init(device_t dev);
 
 static void pnp_enter_conf_state(device_t dev);
 static void pnp_exit_conf_state(device_t dev);
-//static void dump_pnp_device(device_t dev);
+// static void dump_pnp_device(device_t dev);
 
 struct chip_operations superio_smsc_lpc47b272_ops = {
        CHIP_NAME("SMSC LPC47B272 Super I/O")
@@ -61,38 +61,31 @@ static struct device_operations ops = {
 };
 
 static struct pnp_info pnp_dev_info[] = {
-       { &ops, LPC47B272_FDC,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
-       { &ops, LPC47B272_PP,   PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, },
-       { &ops, LPC47B272_SP1,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       { &ops, LPC47B272_SP2,  PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, },
-       { &ops, LPC47B272_KBC,  PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, },
-       { &ops, LPC47B272_RT,   PNP_IO0, { 0x780, 0 }, },
+       { &ops, LPC47B272_FDC, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B272_PP,  PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B272_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B272_SP2, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, },
+       { &ops, LPC47B272_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, {0x07ff, 0}, {0x07ff, 4}, },
+       { &ops, LPC47B272_RT,  PNP_IO0, {0x0780, 0}, },
 };
 
-/**********************************************************************************/
-/*                             PUBLIC INTERFACE                                  */
-/**********************************************************************************/
-
-/*
- * Function:           enable_dev
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Create device structures and allocate resources to devices
- *                     specified in the pnp_dev_info array (above).
+/**
+ * Create device structures and allocate resources to devices specified in the
+ * pnp_dev_info array (above).
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void enable_dev(device_t dev)
 {
-       pnp_enable_devices(dev, &pnp_ops,
-                          ARRAY_SIZE(pnp_dev_info),
+       pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
                           pnp_dev_info);
 }
 
-/*
- * Function:           lpc47b272_pnp_set_resources
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Configure the specified Super I/O device with the resources
- *                     (I/O space, etc.) that have been allocated for it.
+/**
+ * Configure the specified Super I/O device with the resources (I/O space,
+ * etc.) that have been allocated for it.
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void lpc47b272_pnp_set_resources(device_t dev)
 {
@@ -112,28 +105,22 @@ static void lpc47b272_pnp_enable(device_t 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_set_enable(dev, (dev->enabled) ? 1 : 0);
        pnp_exit_conf_state(dev);
 }
 
-/*
- * Function:           lpc47b272_init
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Initialize the specified Super I/O device.
- *                     Devices other than COM ports and the keyboard controller are
- *                     ignored. For COM ports, we configure the baud rate.
+/**
+ * Initialize the specified Super I/O device.
+ *
+ * Devices other than COM ports and the keyboard controller are ignored.
+ * For COM ports, we configure the baud rate.
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void lpc47b272_init(device_t dev)
 {
        struct superio_smsc_lpc47b272_config *conf = dev->chip_info;
-       struct resource *res0, *res1;
+       struct resource *res0;
 
        if (!dev->enabled)
                return;
@@ -143,79 +130,60 @@ static void lpc47b272_init(device_t dev)
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com1);
                break;
-
        case LPC47B272_SP2:
                res0 = find_resource(dev, PNP_IDX_IO0);
                init_uart8250(res0->base, &conf->com2);
                break;
-
        case LPC47B272_KBC:
-               res0 = find_resource(dev, PNP_IDX_IO0);
-               res1 = find_resource(dev, PNP_IDX_IO1);
                pc_keyboard_init(&conf->keyboard);
                break;
        }
 }
 
-/**********************************************************************************/
-/*                             PRIVATE FUNCTIONS                                 */
-/**********************************************************************************/
-
-/*
- * Function:           pnp_enter_conf_state
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Enable access to the LPC47B272's configuration registers.
- */
 static void pnp_enter_conf_state(device_t dev)
 {
        outb(0x55, dev->path.pnp.port);
 }
 
-/*
- * Function:           pnp_exit_conf_state
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Disable access to the LPC47B272's configuration registers.
- */
 static void pnp_exit_conf_state(device_t dev)
 {
        outb(0xaa, dev->path.pnp.port);
 }
 
 #if 0
-/*
- * Function:           dump_pnp_device
- * Parameters:         dev - pointer to structure describing a Super I/O device
- * Return Value:       None
- * Description:        Print the values of all of the LPC47B272's configuration registers.
- *                     NOTE: The LPC47B272 must be in configuration mode when this
- *                     function is called.
+/**
+ * Print the values of all of the LPC47B272's configuration registers.
+ *
+ * NOTE: The LPC47B272 must be in config mode when this function is called.
+ *
+ * @param dev Pointer to structure describing a Super I/O device.
  */
 static void dump_pnp_device(device_t dev)
 {
-       int register_index;
+       int i;
        print_debug("\n");
 
-       for(register_index = 0; register_index <= LPC47B272_MAX_CONFIG_REGISTER; register_index++) {
-               uint8_t register_value;
+       for (i = 0; i <= LPC47B272_MAX_CONFIG_REGISTER; i++) {
+               u8 register_value;
 
-               if ((register_index & 0x0f) == 0) {
-                       print_debug_hex8(register_index);
+               if ((i & 0x0f) == 0) {
+                       print_debug_hex8(i);
                        print_debug_char(':');
                }
 
-               /* Skip over 'register' that would cause exit from configuration mode */
-               if (register_index == 0xaa)
+               /*
+                * Skip over 'register' that would cause exit from
+                * configuration mode.
+                */
+               if (i == 0xaa)
                        register_value = 0xaa;
                else
-                       register_value = pnp_read_config(dev, register_index);
+                       register_value = pnp_read_config(dev, i);
 
                print_debug_char(' ');
                print_debug_hex8(register_value);
-               if ((register_index & 0x0f) == 0x0f) {
+               if ((i & 0x0f) == 0x0f)
                        print_debug("\n");
-               }
        }
 
        print_debug("\n");