sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

device/pnp: remove struct io_info

Browse Source 
The 'set' field was not used anywhere. Replace the struct with a simple
integer representing the mask.

initializer updates performed with:
sed -i -r 's/\{ ?0(x([[:digit:]abcdefABCDEF]{3,4}))?, (0x)?[04]? ?\}/0\1/g' \
	src/ec/*/*/ec.c
sed -i -r 's/\{ ?0(x([[:digit:]abcdefABCDEF]{3,4}))?, (0x)?[04] ?\}/0\1/g' \
	src/ec/*/*/ec_lpc.c \
	src/superio/*/*/superio.c \
	src/superio/smsc/fdc37n972/fdc37n972.c \
	src/superio/smsc/sio10n268/sio10n268.c \
	src/superio/via/vt1211/vt1211.c

src/ec/kontron/it8516e/ec.c was manually updated. The previous value for
IT8516E_LDN_SWUC appears to have been a typo, as it was out of range and
had a zero bit in the middle of the mask.

Change-Id: I1e7853844605cd2a6d568caf05488e1218fb53f9
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-on: https://review.coreboot.org/20078
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Myles Watson <mylesgw@gmail.com>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Samuel Holland
2017-06-06 22:55:01 -05:00
committed by Patrick Georgi
parent c21ba2cd3e
commit 7daac91236
67 changed files with 378 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/device/pnp_device.c
View File

@@ -191,12 +191,12 @@ struct device_operations pnp_ops = {
/* PNP chip operations */
static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info)
static void pnp_get_ioresource(device_t dev, u8 index, u16 mask)
{
struct resource *resource;
unsigned moving, gran, step;
if (!info->mask) {
if (!mask) {
printk(BIOS_ERR, "ERROR: device %s index %d has no mask.\n",
dev_path(dev), index);
return;
@@ -210,7 +210,7 @@ static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info)
/* Get the resource size... */
moving = info->mask;
moving = mask;
gran = 15;
step = 1 << gran;
@@ -238,7 +238,7 @@ static void pnp_get_ioresource(device_t dev, u8 index, struct io_info *info)
/* Set the resource size and alignment. */
resource->gran = gran;
resource->align = gran;
resource->limit = info->mask | (step - 1);
resource->limit = mask | (step - 1);
resource->size = 1 << gran;
}
@@ -247,13 +247,13 @@ static void get_resources(device_t dev, struct pnp_info *info)
struct resource *resource;
if (info->flags & PNP_IO0)
pnp_get_ioresource(dev, PNP_IDX_IO0, &info->io0);
pnp_get_ioresource(dev, PNP_IDX_IO0, info->io0);
if (info->flags & PNP_IO1)
pnp_get_ioresource(dev, PNP_IDX_IO1, &info->io1);
pnp_get_ioresource(dev, PNP_IDX_IO1, info->io1);
if (info->flags & PNP_IO2)
pnp_get_ioresource(dev, PNP_IDX_IO2, &info->io2);
pnp_get_ioresource(dev, PNP_IDX_IO2, info->io2);
if (info->flags & PNP_IO3)
pnp_get_ioresource(dev, PNP_IDX_IO3, &info->io3);
pnp_get_ioresource(dev, PNP_IDX_IO3, info->io3);
if (info->flags & PNP_IRQ0) {
resource = new_resource(dev, PNP_IDX_IRQ0);