summaryrefslogtreecommitdiff
path: root/src/superio/winbond/w83977f
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2010-11-10 14:53:36 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2010-11-10 14:53:36 +0000
commit340fa9396b4b73fd894a15fe48882c98d74292ce (patch)
treefd38d38490431ddb2c210ffbc39b4771ce08eda2 /src/superio/winbond/w83977f
parent02d66fd1bf3e5548dc5edaed074d2946fe5a37df (diff)
downloadcoreboot-340fa9396b4b73fd894a15fe48882c98d74292ce.tar.xz
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/w83977f')
-rw-r--r--src/superio/winbond/w83977f/Makefile.inc2
-rw-r--r--src/superio/winbond/w83977f/superio.c13
-rw-r--r--src/superio/winbond/w83977f/w83977f.h6
-rw-r--r--src/superio/winbond/w83977f/w83977f_early_serial.c8
4 files changed, 14 insertions, 15 deletions
diff --git a/src/superio/winbond/w83977f/Makefile.inc b/src/superio/winbond/w83977f/Makefile.inc
index fa2f260e20..956403042a 100644
--- a/src/superio/winbond/w83977f/Makefile.inc
+++ b/src/superio/winbond/w83977f/Makefile.inc
@@ -18,5 +18,5 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-#config chip.h
ramstage-$(CONFIG_SUPERIO_WINBOND_W83977F) += superio.c
+
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index 7e797f3fdb..7ebfd293f3 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -35,6 +35,7 @@ static void w83977f_enter_ext_func_mode(device_t dev)
outb(0x87, dev->path.pnp.port);
outb(0x87, dev->path.pnp.port);
}
+
static void w83977f_exit_ext_func_mode(device_t dev)
{
outb(0xaa, dev->path.pnp.port);
@@ -42,13 +43,12 @@ static void w83977f_exit_ext_func_mode(device_t dev)
static void w83977f_init(device_t dev)
{
- struct superio_winbond_w83977f_config *conf;
+ struct superio_winbond_w83977f_config *conf = dev->chip_info;
struct resource *res0, *res1;
- if (!dev->enabled) {
+ if (!dev->enabled)
return;
- }
- conf = dev->chip_info;
+
switch(dev->path.pnp.device) {
case W83977F_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
@@ -109,11 +109,10 @@ 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_w83977f_ops = {
- CHIP_NAME("Winbond W83977F-A Super I/O")
+ CHIP_NAME("Winbond W83977F Super I/O")
.enable_dev = enable_dev,
};
diff --git a/src/superio/winbond/w83977f/w83977f.h b/src/superio/winbond/w83977f/w83977f.h
index 25eb1cbc7f..086134682a 100644
--- a/src/superio/winbond/w83977f/w83977f.h
+++ b/src/superio/winbond/w83977f/w83977f.h
@@ -22,12 +22,12 @@
#define SUPERIO_WINBOND_W83977F_W83977F_H
#define W83977F_FDC 0 /* Floppy */
-#define W83977F_PP 1 /* Parallel Port */
+#define W83977F_PP 1 /* Parallel port */
#define W83977F_SP1 2 /* Com1 */
#define W83977F_SP2 3 /* Com2 */
#define W83977F_RTC 4 /* RTC */
-#define W83977F_KBC 5 /* Keyboard & Mouse */
-#define W83977F_IR 6 /* Infrared Port */
+#define W83977F_KBC 5 /* PS/2 keyboard & mouse */
+#define W83977F_IR 6 /* Infrared port */
#define W83977F_GPIO1 7 /* General Purpose I/O 1 */
#define W83977F_GPIO2 8 /* General Purpose I/O 2 */
diff --git a/src/superio/winbond/w83977f/w83977f_early_serial.c b/src/superio/winbond/w83977f/w83977f_early_serial.c
index a42688938d..f0fb1da6d5 100644
--- a/src/superio/winbond/w83977f/w83977f_early_serial.c
+++ b/src/superio/winbond/w83977f/w83977f_early_serial.c
@@ -21,20 +21,20 @@
#include <arch/romcc_io.h>
#include "w83977f.h"
-static inline void pnp_enter_ext_func_mode(device_t dev)
+static void pnp_enter_ext_func_mode(device_t dev)
{
- unsigned int port = dev >> 8;
+ u16 port = dev >> 8;
outb(0x87, port);
outb(0x87, port);
}
static void pnp_exit_ext_func_mode(device_t dev)
{
- unsigned int port = dev >> 8;
+ u16 port = dev >> 8;
outb(0xaa, port);
}
-static void w83977f_enable_serial(device_t dev, unsigned int iobase)
+static void w83977f_enable_serial(device_t dev, u16 iobase)
{
pnp_enter_ext_func_mode(dev);
pnp_set_logical_device(dev);