diff options
author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-06-02 07:58:14 +1000 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-03 09:37:57 +0200 |
commit | fdceb48b3623f8d342c9138feb8ee0db61a79f24 (patch) | |
tree | 441eaaf1b64d13ed6f7eea4fd58a2b8761514c60 /src/superio/smsc/smscsuperio/early_serial.c | |
parent | 8f45761a67347050058537f6a6cd75489af6c1d8 (diff) |
superio/smsc/smscsuperio: Make romstage linkable with header
Rewrite smsc/smscsuperio romstage component to be more consistent and
provide header there-by removing #include's of early_serial.c's in
mainboard's.
Change-Id: I572e0c76422f09d4de88935a36c0a59e5350e6e0
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5915
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/superio/smsc/smscsuperio/early_serial.c')
-rw-r--r-- | src/superio/smsc/smscsuperio/early_serial.c | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/src/superio/smsc/smscsuperio/early_serial.c b/src/superio/smsc/smscsuperio/early_serial.c index 5e9aadb7e3..e2eea6d719 100644 --- a/src/superio/smsc/smscsuperio/early_serial.c +++ b/src/superio/smsc/smscsuperio/early_serial.c @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de> + * Copyright (C) 2014 Edward O'Callaghan <eocallaghan@alterapraxis.com> * * 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,12 +21,27 @@ #include <arch/io.h> #include <device/pnp_def.h> +#include <stdint.h> + +#include "smscsuperio.h" + +#define SMSC_ENTRY_KEY 0x55 +#define SMSC_EXIT_KEY 0xAA + +/* Enable configuration: pass entry key '0x87' into index port dev. */ +static void pnp_enter_conf_state(device_t dev) +{ + u16 port = dev >> 8; + outb(SMSC_ENTRY_KEY, port); +} + +/* Disable configuration: pass exit key '0xAA' into index port dev. */ +static void pnp_exit_conf_state(device_t dev) +{ + u16 port = dev >> 8; + outb(SMSC_EXIT_KEY, port); +} -/* All known/supported SMSC Super I/Os have the same logical device IDs - * for the serial ports (COM1, COM2). - */ -#define SMSCSUPERIO_SP1 4 /* Com1 */ -#define SMSCSUPERIO_SP2 5 /* Com2 */ /** * Enable the specified serial port. @@ -33,14 +49,12 @@ * @param dev The device to use. * @param iobase The I/O base of the serial port (usually 0x3f8/0x2f8). */ -static inline void smscsuperio_enable_serial(device_t dev, u16 iobase) +void smscsuperio_enable_serial(device_t dev, u16 iobase) { - u16 port = dev >> 8; - - outb(0x55, port); /* Enter the configuration state. */ + pnp_enter_conf_state(dev); pnp_set_logical_device(dev); pnp_set_enable(dev, 0); pnp_set_iobase(dev, PNP_IDX_IO0, iobase); pnp_set_enable(dev, 1); - outb(0xaa, port); /* Exit the configuration state. */ + pnp_exit_conf_state(dev); } |