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/fdc37m60x | |
| 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/fdc37m60x')
| -rw-r--r-- | src/superio/smsc/fdc37m60x/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/superio/smsc/fdc37m60x/fdc37m60x_early_serial.c | 6 | ||||
| -rw-r--r-- | src/superio/smsc/fdc37m60x/superio.c | 13 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/superio/smsc/fdc37m60x/Makefile.inc b/src/superio/smsc/fdc37m60x/Makefile.inc index 197ecd39b1..b6d524db00 100644 --- a/src/superio/smsc/fdc37m60x/Makefile.inc +++ b/src/superio/smsc/fdc37m60x/Makefile.inc @@ -18,5 +18,5 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -#config chip.h ramstage-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.c + diff --git a/src/superio/smsc/fdc37m60x/fdc37m60x_early_serial.c b/src/superio/smsc/fdc37m60x/fdc37m60x_early_serial.c index 1c1d334b62..d8cd8c683d 100644 --- a/src/superio/smsc/fdc37m60x/fdc37m60x_early_serial.c +++ b/src/superio/smsc/fdc37m60x/fdc37m60x_early_serial.c @@ -24,7 +24,7 @@ /* The base address is 0x3f0 or 0x370, depending on the SYSOPT pin. */ #define SIO_BASE 0x3f0 #define SIO_INDEX SIO_BASE -#define SIO_DATA SIO_BASE+1 +#define SIO_DATA (SIO_BASE + 1) /* Global configuration registers. */ #define FDC37M60X_CONFIG_REG_CC 0x02 /* Configure Control. */ @@ -37,7 +37,7 @@ /* The content of FDC37M60X_CONFIG_REG_LDN (index 0x07) must be set to the LDN the register belongs to, before you can access the register. */ -static void fdc37m60x_sio_write(uint8_t ldn, uint8_t index, uint8_t value) +static void fdc37m60x_sio_write(uint8_t ldn, u8 index, u8 value) { outb(FDC37M60X_CONFIG_REG_LDN, SIO_BASE); outb(ldn, SIO_DATA); @@ -46,7 +46,7 @@ static void fdc37m60x_sio_write(uint8_t ldn, uint8_t index, uint8_t value) } /* Enable the peripheral devices on the FDC37M60X Super I/O chip. */ -static void fdc37m60x_enable_serial(device_t dev, unsigned iobase) +static void fdc37m60x_enable_serial(device_t dev, u16 iobase) { /* (1) Enter the configuration state. */ outb(0x55, FDC37M60X_CONFIGURATION_PORT); diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c index 0fc5eaaf65..d074c648de 100644 --- a/src/superio/smsc/fdc37m60x/superio.c +++ b/src/superio/smsc/fdc37m60x/superio.c @@ -28,14 +28,11 @@ static void init(device_t dev) { - struct superio_smsc_fdc37m60x_config *conf; + struct superio_smsc_fdc37m60x_config *conf = dev->chip_info; struct resource *res0; - if (!dev->enabled) { + if (!dev->enabled) return; - } - - conf = dev->chip_info; switch (dev->path.pnp.device) { case FDC37M60X_FDC: /* TODO. */ @@ -68,9 +65,9 @@ static struct device_operations ops = { /* TODO: FDC, PP, AUX. */ static struct pnp_info pnp_dev_info[] = { - { &ops, FDC37M60X_SP1, PNP_IO0 | PNP_IRQ0, { 0x7f8, 0 }, }, - { &ops, FDC37M60X_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, { 0x7f8, 0 }, }, - { &ops, FDC37M60X_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, { 0x7f8, 0 }, { 0x7f8, 0x4}, }, + { &ops, FDC37M60X_SP1, PNP_IO0 | PNP_IRQ0, {0x07f8, 0}, }, + { &ops, FDC37M60X_SP2, PNP_IO0 | PNP_IRQ0 | PNP_DRQ0 | PNP_DRQ1, {0x07f8, 0}, }, + { &ops, FDC37M60X_KBCK, PNP_IO0 | PNP_IO1 | PNP_IRQ0, {0x07f8, 0}, {0x07f8, 4}, }, }; static void enable_dev(struct device *dev) |