chaged chip_device_path::enable to chip_device_path::enabled,

again, I am the only one who can't speak English.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1544 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/devices/chip.c b/src/devices/chip.c
index 5066ef2abcd43b3e88232be1fab173b27e031f66..4c74949e46b3c872787dca74b9a13ec90bb5c9b9 100644 (file)
--- a/src/devices/chip.c
+++ b/src/devices/chip.c
@@ -115,7 +115,7 @@ void chip_enumerate(struct chip *chip)
                        printk_spew(" parent: (%p) %s\n",
                                    dev->bus->dev,  dev_path(dev->bus->dev));
                        dev->chip = chip;
-                       dev->enabled = chip->path[i].enable;
+                       dev->enabled = chip->path[i].enabled;
                        dev->links = link + 1;
                        for (child = chip->children; child; child = child->next) {
                                if (!child->bus && child->link == i) {

diff --git a/src/include/device/chip.h b/src/include/device/chip.h
index 7dface868fbdee1c3772f12cfee0af284138ff7a..5f4e36b87c91df2984f83c3d10cd5b0d107c66e3 100644 (file)
--- a/src/include/device/chip.h
+++ b/src/include/device/chip.h
@@ -56,7 +56,7 @@ struct chip_resource {
 struct chip_device_path {
        struct device_path path;
        unsigned channel;
-       int enable;
+       int enabled;
        struct chip_resource resource[MAX_RESOURCES];
 };
 

diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index aa48ead780dccde3a5facb288df34357f00e869a..c5b13ca62284e8115c0fd75ce99c196e5eacd52b 100644 (file)
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -755,7 +755,7 @@ class partobj:
                        fatal("Invalid device id")
                if ((function < 0) or (function > 7)):
                        fatal("Invalid function")
-               self.path = "%s\n\t\t{ .enable = %d, .path = {.type=DEVICE_PATH_PCI,.u={.pci={ .bus = 0x%x, .devfn = PCI_DEVFN(0x%x,%d)}}}" % (self.path, enable, bus, slot, function)
+               self.path = "%s\n\t\t{ .enabled = %d, .path = {.type=DEVICE_PATH_PCI,.u={.pci={ .bus = 0x%x, .devfn = PCI_DEVFN(0x%x,%d)}}}" % (self.path, enable, bus, slot, function)
 
        def addpnppath(self, enable, port, device):
                """ Add a relative path to a pnp device hanging off our parent """
@@ -763,13 +763,13 @@ class partobj:
                        fatal("Invalid port")
                if ((device < 0) or (device > 0xff)):
                        fatal("Invalid device")
-               self.path = "%s\n\t\t{ .enable = %d, .path={.type=DEVICE_PATH_PNP,.u={.pnp={ .port = 0x%x, .device = 0x%x }}}" % (self.path, enable, port, device)
+               self.path = "%s\n\t\t{ .enabled = %d, .path={.type=DEVICE_PATH_PNP,.u={.pnp={ .port = 0x%x, .device = 0x%x }}}" % (self.path, enable, port, device)
                
-       def addi2cpath(self, enable, device):
+       def addi2cpath(self, enabled, device):
                """ Add a relative path to a i2c device hanging off our parent """
                if ((device < 0) or (device > 0x7f)):
                        fatal("Invalid device")
-               self.path = "%s\n\t\t{ .enable = %d, .path = {.type=DEVICE_PATH_I2C,.u={.i2c={ .device = 0x%x }}} " % (self.path, enable, device)
+               self.path = "%s\n\t\t{ .enabled = %d, .path = {.type=DEVICE_PATH_I2C,.u={.i2c={ .device = 0x%x }}} " % (self.path, enable, device)
 
 
        def usesoption(self, name):