diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-15 19:35:14 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-11-15 19:35:14 +0000 |
| commit | a69d978be8a068944466e776de87527fb104a878 (patch) | |
| tree | 8acf4247e3104ad9ccb940568a81e472105a674b /src/superio/smsc/lpc47n217/lpc47n217_early_serial.c | |
| parent | 2e9323e5bef293c051d9fd982214e6db2e3305ee (diff) | |
| download | coreboot-a69d978be8a068944466e776de87527fb104a878.tar.xz | |
C and other Super I/O cosmetic fixes.
- Random coding style, whitespace and cosmetic fixes.
- Consistently use the same spacing and 4-hexdigit port number format
in the pnp_dev_info[] arrays.
- Drop dead/unused code and less useful comments.
- Add missing "(C)" characters and copyright years.
- Shorten and simplify some code snippets.
- Use u8/u16/etc. everywhere.
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@6073 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/superio/smsc/lpc47n217/lpc47n217_early_serial.c')
| -rw-r--r-- | src/superio/smsc/lpc47n217/lpc47n217_early_serial.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c b/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c index 34f2c4512b..ce79db8f0c 100644 --- a/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c +++ b/src/superio/smsc/lpc47n217/lpc47n217_early_serial.c @@ -24,17 +24,15 @@ #include <assert.h> #include "lpc47n217.h" -/** Enable access to the LPC47N217's configuration registers. */ -static inline void pnp_enter_conf_state(device_t dev) +static void pnp_enter_conf_state(device_t dev) { - unsigned port = dev>>8; + u16 port = dev >> 8; outb(0x55, port); } -/** Disable access to the LPC47N217's configuration registers. */ static void pnp_exit_conf_state(device_t dev) { - unsigned port = dev>>8; + u16 port = dev >> 8; outb(0xaa, port); } @@ -44,24 +42,21 @@ static void pnp_exit_conf_state(device_t dev) * @param dev High 8 bits = Super I/O port, low 8 bits = logical device number. * @param iobase Base I/O port for the logical device. */ -void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase) +void lpc47n217_pnp_set_iobase(device_t dev, u16 iobase) { - /* LPC47N217 requires base ports to be a multiple of 4 */ + /* LPC47N217 requires base ports to be a multiple of 4. */ ASSERT(!(iobase & 0x3)); switch(dev & 0xFF) { case LPC47N217_PP: pnp_write_config(dev, 0x23, (iobase >> 2) & 0xff); break; - case LPC47N217_SP1: pnp_write_config(dev, 0x24, (iobase >> 2) & 0xff); break; - case LPC47N217_SP2: pnp_write_config(dev, 0x25, (iobase >> 2) & 0xff); break; - default: break; } @@ -81,37 +76,29 @@ void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase) */ void lpc47n217_pnp_set_enable(device_t dev, int enable) { - uint8_t power_register = 0; - uint8_t power_mask = 0; - uint8_t current_power; - uint8_t new_power; + u8 power_register = 0, power_mask = 0, current_power, new_power; switch(dev & 0xFF) { case LPC47N217_PP: power_register = 0x01; power_mask = 0x04; break; - case LPC47N217_SP1: power_register = 0x02; power_mask = 0x08; break; - case LPC47N217_SP2: power_register = 0x02; power_mask = 0x80; break; - default: return; } current_power = pnp_read_config(dev, power_register); - new_power = current_power & ~power_mask; /* disable by default */ - + new_power = current_power & ~power_mask; /* Disable by default. */ if (enable) - new_power |= power_mask; /* Enable */ - + new_power |= power_mask; /* Enable. */ pnp_write_config(dev, power_register, new_power); } @@ -122,7 +109,7 @@ void lpc47n217_pnp_set_enable(device_t dev, int enable) * @param dev High 8 bits = Super I/O port, low 8 bits = logical device number. * @param iobase Processor I/O port address to assign to this serial device. */ -static void lpc47n217_enable_serial(device_t dev, unsigned iobase) +static void lpc47n217_enable_serial(device_t dev, u16 iobase) { /* * NOTE: Cannot use pnp_set_XXX() here because they assume chip |