diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-10 14:53:36 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-10 14:53:36 +0000 |
| commit | 340fa9396b4b73fd894a15fe48882c98d74292ce (patch) | |
| tree | fd38d38490431ddb2c210ffbc39b4771ce08eda2 /src/superio/winbond/w83977tf/superio.c | |
| parent | 02d66fd1bf3e5548dc5edaed074d2946fe5a37df (diff) | |
Random Winbond Super I/O cosmetic and coding-style fixes.
- Whitespace, coding style, and typo fixes.
- Drop unused/obsolete "#config chip.h".
- Use u8/u16/etc. everywhere.
- Use pnp_read_config()/pnp_write_config() instead of open-coding them.
- Use pnp_set_logical_device() instead of open-coding it.
- W83627EHG: Fix incorrect enable_hwm_smbus() code comment.
- Use ARRAY_SIZE.
- w83627hf/superio.c: w83627hf_16_bit_addr_qual(): Bugfix, the code was using
'dev->path.pnp.port >> 8' as config port, which is incorrect in superio.c
(which has a "real" device_t struct, in contrast to *_early_serial.c which
uses "unsigned" as device_t where 'dev >> 8' is required).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6057 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/superio/winbond/w83977tf/superio.c')
| -rw-r--r-- | src/superio/winbond/w83977tf/superio.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c index 58ad008c96..3cfb1de543 100644 --- a/src/superio/winbond/w83977tf/superio.c +++ b/src/superio/winbond/w83977tf/superio.c @@ -3,7 +3,7 @@ * * Copyright (C) 2000 AG Electronics Ltd. * Copyright (C) 2003-2004 Linux Networx - * Copyright (C) 2004 Tyan By LYH change from PC87360 + * 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 @@ -20,13 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* 2006-4-24 - * Adapted for the w83977 by rsmith <smithbone@gmail.com> - * This is mostly just a search and replace on the part type - * TODO: Actually see if all the sub functionis exist and are - * setup correctly. - */ - #include <arch/io.h> #include <device/device.h> #include <device/pnp.h> @@ -44,6 +37,7 @@ static void w83977tf_enter_ext_func_mode(device_t dev) outb(0x87, dev->path.pnp.port); outb(0x87, dev->path.pnp.port); } + static void w83977tf_exit_ext_func_mode(device_t dev) { outb(0xaa, dev->path.pnp.port); @@ -51,15 +45,12 @@ static void w83977tf_exit_ext_func_mode(device_t dev) static void w83977tf_init(device_t dev) { - struct superio_winbond_w83977tf_config *conf; + struct superio_winbond_w83977tf_config *conf = dev->chip_info; struct resource *res0, *res1; - /* Wishlist handle well known programming interfaces more - * generically. - */ - if (!dev->enabled) { + + if (!dev->enabled) return; - } - conf = dev->chip_info; + switch(dev->path.pnp.device) { case W83977TF_SP1: res0 = find_resource(dev, PNP_IDX_IO0); @@ -111,7 +102,6 @@ static struct pnp_info pnp_dev_info[] = { { &ops, W83977TF_PP, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0, { 0x07f8, 0}, }, { &ops, W83977TF_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, W83977TF_SP2, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - /* No 4 { 0,}, */ { &ops, W83977TF_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, { 0x7ff, 0 }, { 0x7ff, 0x4}, }, { &ops, W83977TF_CIR, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, { &ops, W83977TF_GAME_MIDI_GPIO1, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7ff, 0 }, {0x7fe, 4} }, @@ -120,8 +110,7 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { - pnp_enable_devices(dev, &ops, - ARRAY_SIZE(pnp_dev_info), pnp_dev_info); + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } struct chip_operations superio_winbond_w83977tf_ops = { |