Author: stepan Date: Fri Apr 30 22:44:30 2010 New Revision: 5520 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5520
Log: fix superio warnings. interesting side node: most superio .h files have no guards.
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/src/superio/ite/it8718f/it8718f.h trunk/src/superio/ite/it8718f/it8718f_early_serial.c trunk/src/superio/nsc/pc87417/pc87417.h trunk/src/superio/nsc/pc87417/pc87417_early_serial.c trunk/src/superio/winbond/w83627ehg/w83627ehg.h trunk/src/superio/winbond/w83627ehg/w83627ehg_early_init.c trunk/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c trunk/src/superio/winbond/w83627hf/w83627hf.h trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c
Modified: trunk/src/superio/ite/it8718f/it8718f.h ============================================================================== --- trunk/src/superio/ite/it8718f/it8718f.h Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/ite/it8718f/it8718f.h Fri Apr 30 22:44:30 2010 (r5520) @@ -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 +
Modified: trunk/src/superio/ite/it8718f/it8718f_early_serial.c ============================================================================== --- trunk/src/superio/ite/it8718f/it8718f_early_serial.c Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/ite/it8718f/it8718f_early_serial.c Fri Apr 30 22:44:30 2010 (r5520) @@ -64,7 +64,7 @@ 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 @@ }
/* 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();
Modified: trunk/src/superio/nsc/pc87417/pc87417.h ============================================================================== --- trunk/src/superio/nsc/pc87417/pc87417.h Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/nsc/pc87417/pc87417.h Fri Apr 30 22:44:30 2010 (r5520) @@ -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 +
Modified: trunk/src/superio/nsc/pc87417/pc87417_early_serial.c ============================================================================== --- trunk/src/superio/nsc/pc87417/pc87417_early_serial.c Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/nsc/pc87417/pc87417_early_serial.c Fri Apr 30 22:44:30 2010 (r5520) @@ -23,7 +23,7 @@ #include <arch/romcc_io.h> #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 @@ 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);
Modified: trunk/src/superio/winbond/w83627ehg/w83627ehg.h ============================================================================== --- trunk/src/superio/winbond/w83627ehg/w83627ehg.h Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/winbond/w83627ehg/w83627ehg.h Fri Apr 30 22:44:30 2010 (r5520) @@ -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
Modified: trunk/src/superio/winbond/w83627ehg/w83627ehg_early_init.c ============================================================================== --- trunk/src/superio/winbond/w83627ehg/w83627ehg_early_init.c Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/winbond/w83627ehg/w83627ehg_early_init.c Fri Apr 30 22:44:30 2010 (r5520) @@ -22,13 +22,13 @@ #include <arch/romcc_io.h> #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);
Modified: trunk/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c ============================================================================== --- trunk/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/winbond/w83627ehg/w83627ehg_early_serial.c Fri Apr 30 22:44:30 2010 (r5520) @@ -35,7 +35,7 @@ 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);
Modified: trunk/src/superio/winbond/w83627hf/w83627hf.h ============================================================================== --- trunk/src/superio/winbond/w83627hf/w83627hf.h Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/winbond/w83627hf/w83627hf.h Fri Apr 30 22:44:30 2010 (r5520) @@ -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
Modified: trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c ============================================================================== --- trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c Fri Apr 30 22:36:02 2010 (r5519) +++ trunk/src/superio/winbond/w83627hf/w83627hf_early_serial.c Fri Apr 30 22:44:30 2010 (r5520) @@ -37,7 +37,7 @@ 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 @@ 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);