From f18abab20047a23d7b29705ce274920ad36cd18a Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 31 Mar 2014 21:53:32 +1100 Subject: superio/serverengines/pilot: Avoid .c includes Following the same reasoning as commit d3043313a91dff3bc2f879ffb3b4bf23a364d711 superio/fintek/f81865f: Avoid .c includes Clean up the early_serial #include directives in mainboard/romstage code. Change-Id: Ia6ed36c8517a95b651fefdd855eec0ec91d73187 Signed-off-by: Edward O'Callaghan Reviewed-on: http://review.coreboot.org/5439 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/superio/serverengines/pilot/Makefile.inc | 22 ++++++++++++++++++++++ src/superio/serverengines/pilot/early_init.c | 7 ++++++- src/superio/serverengines/pilot/early_serial.c | 9 +++++---- src/superio/serverengines/pilot/pilot.h | 11 ++++++++++- 4 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 src/superio/serverengines/pilot/Makefile.inc (limited to 'src/superio/serverengines/pilot') diff --git a/src/superio/serverengines/pilot/Makefile.inc b/src/superio/serverengines/pilot/Makefile.inc new file mode 100644 index 0000000000..b07438fc0a --- /dev/null +++ b/src/superio/serverengines/pilot/Makefile.inc @@ -0,0 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2014 Edward O'Callaghan +## +## 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 +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +romstage-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_init.c +romstage-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_serial.c diff --git a/src/superio/serverengines/pilot/early_init.c b/src/superio/serverengines/pilot/early_init.c index 1993c9ef7a..002210f97b 100644 --- a/src/superio/serverengines/pilot/early_init.c +++ b/src/superio/serverengines/pilot/early_init.c @@ -23,11 +23,16 @@ #define BLUBB_DEV PNP_DEV(port, 0x04) +#include +#include +#include +#include "pilot.h" + /* * Logical device 4, 5 and 7 are being deactivated. Logical Device 1 seems to * be another serial (?), it is also deactivated on the HP machine. */ -static void pilot_early_init(device_t dev) +void pilot_early_init(device_t dev) { u16 port = dev >> 8; diff --git a/src/superio/serverengines/pilot/early_serial.c b/src/superio/serverengines/pilot/early_serial.c index 4112901c4d..82e124c98c 100644 --- a/src/superio/serverengines/pilot/early_serial.c +++ b/src/superio/serverengines/pilot/early_serial.c @@ -22,23 +22,24 @@ /* PILOT Super I/O is only based on LPC observation done on factory system. */ #include +#include #include "pilot.h" /* Pilot uses 0x5A/0xA5 pattern to actiavte deactivate config access. */ -static void pnp_enter_ext_func_mode(device_t dev) +void pnp_enter_ext_func_mode(device_t dev) { u16 port = dev >> 8; outb(0x5A, port); } -static void pnp_exit_ext_func_mode(device_t dev) +void pnp_exit_ext_func_mode(device_t dev) { u16 port = dev >> 8; outb(0xA5, port); } /* Serial config is a fairly standard procedure. */ -static void __attribute__((unused)) pilot_enable_serial(device_t dev, u16 iobase) +void pilot_enable_serial(device_t dev, u16 iobase) { pnp_enter_ext_func_mode(dev); pnp_set_logical_device(dev); @@ -47,7 +48,7 @@ static void __attribute__((unused)) pilot_enable_serial(device_t dev, u16 iobase pnp_exit_ext_func_mode(dev); } -static void __attribute__((unused)) pilot_disable_serial(device_t dev) +void pilot_disable_serial(device_t dev) { pnp_enter_ext_func_mode(dev); pnp_set_logical_device(dev); diff --git a/src/superio/serverengines/pilot/pilot.h b/src/superio/serverengines/pilot/pilot.h index a5bddd30d8..e19cf37539 100644 --- a/src/superio/serverengines/pilot/pilot.h +++ b/src/superio/serverengines/pilot/pilot.h @@ -30,4 +30,13 @@ #define PILOT_LD5 0x05 /* Logical device 5 */ #define PILOT_LD7 0x07 /* Logical device 7 */ -#endif +/* should not expose these however early_init needs love */ +void pnp_enter_ext_func_mode(device_t dev); +void pnp_exit_ext_func_mode(device_t dev); + +void pilot_early_init(device_t dev); + +void pilot_enable_serial(device_t dev, u16 iobase); +void pilot_disable_serial(device_t dev); + +#endif /* SUPERIO_SERVERENGINES_PILOT_PILOT_H */ -- cgit v1.2.3