From 80d9804ff776c677932937ac3faf494acf378b45 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 30 Apr 2010 20:44:30 +0000 Subject: [PATCH] fix superio warnings. interesting side node: most superio .h files have no guards. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5520 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/superio/ite/it8718f/it8718f.h | 5 +++++ src/superio/ite/it8718f/it8718f_early_serial.c | 4 ++-- src/superio/nsc/pc87417/pc87417.h | 6 ++++++ src/superio/nsc/pc87417/pc87417_early_serial.c | 4 ++-- src/superio/winbond/w83627ehg/w83627ehg.h | 6 ++++++ src/superio/winbond/w83627ehg/w83627ehg_early_init.c | 4 ++-- src/superio/winbond/w83627ehg/w83627ehg_early_serial.c | 2 +- src/superio/winbond/w83627hf/w83627hf.h | 2 ++ src/superio/winbond/w83627hf/w83627hf_early_serial.c | 4 ++-- 9 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/superio/ite/it8718f/it8718f.h b/src/superio/ite/it8718f/it8718f.h index 2d2171fb0..1967d25b5 100644 --- a/src/superio/ite/it8718f/it8718f.h +++ b/src/superio/ite/it8718f/it8718f.h @@ -30,3 +30,8 @@ #define IT8718F_KBCM 0x06 /* Mouse */ #define IT8718F_IR 0x0a /* Consumer IR */ +#if defined(__PRE_RAM__) && !defined(__ROMCC__) +void it8718f_24mhz_clkin(void); +void it8718f_enable_serial(device_t dev, unsigned iobase); +#endif + diff --git a/src/superio/ite/it8718f/it8718f_early_serial.c b/src/superio/ite/it8718f/it8718f_early_serial.c index 6aae54d65..fabbde5e8 100644 --- a/src/superio/ite/it8718f/it8718f_early_serial.c +++ b/src/superio/ite/it8718f/it8718f_early_serial.c @@ -64,7 +64,7 @@ static void it8718f_exit_conf(void) it8718f_sio_write(0x00, IT8718F_CONFIG_REG_CC, 0x02); } -static void it8718f_24mhz_clkin(void) +void it8718f_24mhz_clkin(void) { it8718f_enter_conf(); @@ -75,7 +75,7 @@ static void it8718f_24mhz_clkin(void) } /* Enable the peripheral devices on the IT8718F Super I/O chip. */ -static void it8718f_enable_serial(device_t dev, unsigned iobase) +void it8718f_enable_serial(device_t dev, unsigned iobase) { /* (1) Enter the configuration state (MB PnP mode). */ it8718f_enter_conf(); diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h index 3171d1fd7..bc65eef55 100644 --- a/src/superio/nsc/pc87417/pc87417.h +++ b/src/superio/nsc/pc87417/pc87417.h @@ -110,3 +110,9 @@ #define PC87417_HAP1 0x14 #define PC87417_XSCNF 0x15 #define PC87417_XWBCNF 0x16 + +#if defined(__PRE_RAM__) && !defined(__ROMCC__) +void pc87417_enable_serial(device_t dev, unsigned iobase); +void pc87417_enable_dev(device_t dev); +#endif + diff --git a/src/superio/nsc/pc87417/pc87417_early_serial.c b/src/superio/nsc/pc87417/pc87417_early_serial.c index 78cf9b48b..8d748046c 100644 --- a/src/superio/nsc/pc87417/pc87417_early_serial.c +++ b/src/superio/nsc/pc87417/pc87417_early_serial.c @@ -23,7 +23,7 @@ #include #include "pc87417.h" -static void pc87417_enable_serial(device_t dev, unsigned iobase) +void pc87417_enable_serial(device_t dev, unsigned iobase) { pnp_set_logical_device(dev); pnp_set_enable(dev, 0); @@ -31,7 +31,7 @@ static void pc87417_enable_serial(device_t dev, unsigned iobase) pnp_set_enable(dev, 1); } -static void pc87417_enable_dev(device_t dev) +void pc87417_enable_dev(device_t dev) { pnp_set_logical_device(dev); pnp_set_enable(dev, 1); diff --git a/src/superio/winbond/w83627ehg/w83627ehg.h b/src/superio/winbond/w83627ehg/w83627ehg.h index aeda043fc..9e32f64c2 100644 --- a/src/superio/winbond/w83627ehg/w83627ehg.h +++ b/src/superio/winbond/w83627ehg/w83627ehg.h @@ -44,3 +44,9 @@ #define W83627EHG_GPIO3 ((1 << 8) | 9) #define W83627EHG_GPIO4 ((2 << 8) | 9) #define W83627EHG_GPIO5 ((3 << 8) | 9) + +#if defined(__PRE_RAM__) && !defined(__ROMCC__) +void w83627ehg_enable_dev(device_t dev, unsigned iobase); +void w83627ehg_disable_dev(device_t dev); +void w83627ehg_enable_serial(device_t dev, unsigned iobase); +#endif diff --git a/src/superio/winbond/w83627ehg/w83627ehg_early_init.c b/src/superio/winbond/w83627ehg/w83627ehg_early_init.c index 125837a55..0335a67be 100644 --- a/src/superio/winbond/w83627ehg/w83627ehg_early_init.c +++ b/src/superio/winbond/w83627ehg/w83627ehg_early_init.c @@ -22,13 +22,13 @@ #include #include "w83627ehg.h" -static void w83627ehg_disable_dev(device_t dev) +void w83627ehg_disable_dev(device_t dev) { pnp_set_logical_device(dev); pnp_set_enable(dev, 0); } -static void w83627ehg_enable_dev(device_t dev, unsigned iobase) +void w83627ehg_enable_dev(device_t dev, unsigned iobase) { pnp_set_logical_device(dev); pnp_set_enable(dev, 0); diff --git a/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c b/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c index 170b6a7de..63b044a9e 100644 --- a/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c +++ b/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c @@ -35,7 +35,7 @@ static void pnp_exit_ext_func_mode(device_t dev) outb(0xaa, port); } -static void w83627ehg_enable_serial(device_t dev, unsigned iobase) +void w83627ehg_enable_serial(device_t dev, unsigned iobase) { pnp_enter_ext_func_mode(dev); pnp_set_logical_device(dev); diff --git a/src/superio/winbond/w83627hf/w83627hf.h b/src/superio/winbond/w83627hf/w83627hf.h index fa74cbd6d..a21a2b0bf 100644 --- a/src/superio/winbond/w83627hf/w83627hf.h +++ b/src/superio/winbond/w83627hf/w83627hf.h @@ -113,5 +113,7 @@ #if defined(__PRE_RAM__) && !defined(__ROMCC__) void w83627hf_disable_dev(device_t dev); void w83627hf_enable_dev(device_t dev, unsigned iobase); +void w83627hf_enable_serial(device_t dev, unsigned iobase); +void w83627hf_set_clksel_48(device_t dev); #endif diff --git a/src/superio/winbond/w83627hf/w83627hf_early_serial.c b/src/superio/winbond/w83627hf/w83627hf_early_serial.c index 19734934c..2bc6c1ddd 100644 --- a/src/superio/winbond/w83627hf/w83627hf_early_serial.c +++ b/src/superio/winbond/w83627hf/w83627hf_early_serial.c @@ -37,7 +37,7 @@ static void pnp_exit_ext_func_mode(device_t dev) outb(0xaa, port); } -static void w83627hf_enable_serial(device_t dev, unsigned iobase) +void w83627hf_enable_serial(device_t dev, unsigned iobase) { pnp_enter_ext_func_mode(dev); pnp_set_logical_device(dev); @@ -47,7 +47,7 @@ static void w83627hf_enable_serial(device_t dev, unsigned iobase) pnp_exit_ext_func_mode(dev); } -static inline void w83627hf_set_clksel_48(device_t dev) +void w83627hf_set_clksel_48(device_t dev) { unsigned port = dev >> 8; pnp_enter_ext_func_mode(dev); -- 2.25.1