GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sio/smsc/kbc1100: Fix some style issues 

This fixes indentation and whitespaces before opening parentheses.

Change-Id: I8940f712c0161419ee0c383b7bc9eb581967366e
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/20852
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Arthur Heymans 2017-08-01 21:51:10 +02:00 committed by Martin Roth
parent 7c5eb073e7
commit 12d010306b
2 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/superio/smsc/kbc1100/early_init.c
View File

@ -46,30 +46,30 @@ void kbc1100_early_serial(pnp_devfn_t dev, u16 iobase)
void kbc1100_early_init(u16 port) void kbc1100_early_init(u16 port)
{ {
pnp_devfn_t dev; pnp_devfn_t dev;
dev = PNP_DEV (port, KBC1100_KBC); dev = PNP_DEV(port, KBC1100_KBC);
pnp_enter_conf_state(dev); pnp_enter_conf_state(dev);
/* Serial IRQ enabled */ /* Serial IRQ enabled */
outb(0x25, port); outb(0x25, port);
outb(0x04, port + 1); outb(0x04, port + 1);
/* Enable keyboard */ /* Enable keyboard */
pnp_set_logical_device(dev); pnp_set_logical_device(dev);
pnp_set_enable(dev, 0); pnp_set_enable(dev, 0);
pnp_set_iobase(dev, PNP_IDX_IO0, 0x60); pnp_set_iobase(dev, PNP_IDX_IO0, 0x60);
pnp_set_iobase(dev, PNP_IDX_IO1, 0x64); pnp_set_iobase(dev, PNP_IDX_IO1, 0x64);
pnp_set_irq(dev, 0x70, 1); /* IRQ 1 */ pnp_set_irq(dev, 0x70, 1); /* IRQ 1 */
pnp_set_irq(dev, 0x72, 12); /* IRQ 12 */ pnp_set_irq(dev, 0x72, 12); /* IRQ 12 */
pnp_set_enable(dev, 1); pnp_set_enable(dev, 1);
/* Enable EC Channel 0 */ /* Enable EC Channel 0 */
dev = PNP_DEV (port, KBC1100_EC0); dev = PNP_DEV(port, KBC1100_EC0);
pnp_set_logical_device(dev); pnp_set_logical_device(dev);
pnp_set_enable(dev, 1); pnp_set_enable(dev, 1);
pnp_exit_conf_state(dev); pnp_exit_conf_state(dev);
/* disable the 1s timer */ /* disable the 1s timer */
outb(0xE7, 0x64); outb(0xE7, 0x64);
} }

46
src/superio/smsc/kbc1100/superio.c
View File

@ -31,44 +31,42 @@ static void enable_dev(struct device *dev);
static void kbc1100_init(struct device *dev); static void kbc1100_init(struct device *dev);
struct chip_operations superio_smsc_kbc1100_ops = { struct chip_operations superio_smsc_kbc1100_ops = {
CHIP_NAME("SMSC KBC1100 Super I/O") CHIP_NAME("SMSC KBC1100 Super I/O")
.enable_dev = enable_dev .enable_dev = enable_dev
}; };
static struct device_operations ops = { static struct device_operations ops = {
.read_resources = pnp_read_resources, .read_resources = pnp_read_resources,
.set_resources = pnp_set_resources, .set_resources = pnp_set_resources,
.enable_resources = pnp_enable_resources, .enable_resources = pnp_enable_resources,
.enable = pnp_alt_enable, .enable = pnp_alt_enable,
.init = kbc1100_init, .init = kbc1100_init,
.ops_pnp_mode = &pnp_conf_mode_55_aa, .ops_pnp_mode = &pnp_conf_mode_55_aa,
}; };
static struct pnp_info pnp_dev_info[] = { static struct pnp_info pnp_dev_info[] = {
{ &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff, 0x7ff, }, { &ops, KBC1100_KBC, PNP_IO0 | PNP_IO1 | PNP_IRQ0 | PNP_IRQ1, 0x7ff,
0x7ff, },
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)
{ {
pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info),
pnp_dev_info);
} }
static void kbc1100_init(struct device *dev) static void kbc1100_init(struct device *dev)
{ {
struct resource *res0, *res1; struct resource *res0, *res1;
if (!dev->enabled)
return;
switch (dev->path.pnp.device) {
if (!dev->enabled) { case KBC1100_KBC:
return; res0 = find_resource(dev, PNP_IDX_IO0);
} res1 = find_resource(dev, PNP_IDX_IO1);
pc_keyboard_init(NO_AUX_DEVICE);
switch(dev->path.pnp.device) { break;
}
case KBC1100_KBC:
res0 = find_resource(dev, PNP_IDX_IO0);
res1 = find_resource(dev, PNP_IDX_IO1);
pc_keyboard_init(NO_AUX_DEVICE);
break;
}
} }