changed dev->enable to dev->enabled. Sorry, I am the only one who can't speak

English in the project.

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

diff --git a/src/devices/chip.c b/src/devices/chip.c
index 33f3976eb87dafb09995ff8e4d3984d8649832e3..5066ef2abcd43b3e88232be1fab173b27e031f66 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->enable = chip->path[i].enable;
+                       dev->enabled = chip->path[i].enable;
                        dev->links = link + 1;
                        for (child = chip->children; child; child = child->next) {
                                if (!child->bus && child->link == i) {
@@ -152,7 +152,7 @@ void chip_enumerate(struct chip *chip)
  * A static device chain is a linked list of static device structures which are
  * on the same branch of the static device tree. This function does not only
  * enumerate the devices on a single chain, as its name suggest, it also walks
- * into the subordinary chains. It calls the device specific
+ * into the subordinary chains by recursion. It calls the device specific
  * chip_control::enumerate() of the device if one exists or calls the generic
  * chip_enumerate(). 
  *
@@ -187,8 +187,12 @@ static void enumerate_static_device_chain(struct chip *root)
 /**
  * @brief Enumerate static devices in the system.
  *
- * \note The definition of 'enumerate' is not clear in this context. Does it mean
- * probe ?
+ * Static device is . Static devices are actually enumerated or "listed" in
+ * the Config.lb config file and the corresponding data structures are
+ * generated by config tool in the static.c. 
+ *
+ * \note The definition of 'enumerate' is not clear in this context. Does it
+ * mean probe ?
  *
  * \note How do we determine the existence of the static devices ? Static
  * devices are listed in the config file and generated at compile time by config
@@ -203,5 +207,6 @@ static void enumerate_static_device_chain(struct chip *root)
  */
 void enumerate_static_devices(void)
 {
+       printk_info("Enumerating static devices...\n");
        enumerate_static_device_chain(&static_root);
 }

diff --git a/src/devices/device.c b/src/devices/device.c
index d2b7e24f7483b35e96353a46ff42210708af1078..60e79c5a580dc54d7ffbfc5bb96fc455642e2bfe 100644 (file)
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -85,7 +85,7 @@ device_t alloc_dev(struct bus *parent, struct device_path *path)
        }
 
        /* If we don't have any other information about a device enable it */
-       dev->enable = 1;
+       dev->enabled = 1;
 
        return dev;
 }
@@ -135,7 +135,7 @@ static void read_resources(struct bus *bus)
                                   dev_path(curdev));
                        continue;
                }
-               if (!curdev->enable) {
+               if (!curdev->enabled) {
                        continue;
                }
 
@@ -431,10 +431,10 @@ void assign_resources(struct bus *bus)
        for (curdev = bus->children; curdev; curdev = curdev->sibling) {
                if (!curdev->ops || !curdev->ops->set_resources) {
                        printk_err("%s missing set_resources\n",
-                               dev_path(curdev));
+                                  dev_path(curdev));
                        continue;
                }
-               if (!curdev->enable) {
+               if (!curdev->enabled) {
                        continue;
                }
                curdev->ops->set_resources(curdev);
@@ -461,7 +461,7 @@ void enable_resources(struct device *dev)
                printk_err("%s missing enable_resources\n", dev_path(dev));
                return;
        }
-       if (!dev->enable) {
+       if (!dev->enabled) {
                return;
        }
        dev->ops->enable_resources(dev);
@@ -471,7 +471,7 @@ void enable_resources(struct device *dev)
  * @brief Determine the existence of dynamic devices and construct dynamic
  * device tree.
  *
- * Start for the root device 'dev_root', scan the buses in the system
+ * Start form the root device 'dev_root', scan the buses in the system
  * recursively, build the dynamic device tree according to the result
  * of the probe.
  *
@@ -565,7 +565,7 @@ void dev_initialize(void)
        printk_info("Initializing devices...\n");
 
        for (dev = all_devices; dev; dev = dev->next) {
-               if (dev->enable && dev->ops && dev->ops->init) {
+               if (dev->enabled && dev->ops && dev->ops->init) {
                        printk_debug("%s init\n", dev_path(dev));
                        dev->ops->init(dev);
                }

diff --git a/src/devices/hypertransport.c b/src/devices/hypertransport.c
index e50ebf6f2047e81c5172f6313947c5ba6e30e130..db7426767d175840d7a499145bd0f90653ee1199 100644 (file)
--- a/src/devices/hypertransport.c
+++ b/src/devices/hypertransport.c
@@ -264,10 +264,10 @@ unsigned int hypertransport_scan_chain(struct bus *bus, unsigned int max)
                        *chain_last = dev;
                        /* Run the magice enable sequence for the device */
                        if (dev->chip && dev->chip->control && dev->chip->control->enable_dev) {
-                               int enable  = dev->enable;
-                               dev->enable = 1;
+                               int enable  = dev->enabled;
+                               dev->enabled = 1;
                                dev->chip->control->enable_dev(dev);
-                               dev->enable = enable;
+                               dev->enabled = enable;
                        }
                        /* Now read the vendor and device id */
                        id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -335,7 +335,7 @@ unsigned int hypertransport_scan_chain(struct bus *bus, unsigned int max)
                printk_debug("%s [%04x/%04x] %s next_unitid: %04x\n",
                        dev_path(dev),
                        dev->vendor, dev->device, 
-                       (dev->enable? "enabled": "disabled"), next_unitid);
+                       (dev->enabled? "enabled": "disabled"), next_unitid);
 
        } while((last_unitid != next_unitid) && (next_unitid <= 0x1f));
 #if HAVE_HARD_RESET == 1

diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index 4bc4e1f9f0c0acf4564137e69dec77ee7389ca81..4a248224cb1e1e8fff0789d7e23314ace3ad3c71 100644 (file)
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -470,7 +470,7 @@ static void set_pci_ops(struct device *dev)
                break;
        default:
        bad:
-               if (dev->enable) {
+               if (dev->enabled) {
                        printk_err("%s [%04x/%04x/%06x] has unknown header "
                                   "type %02x, ignoring.\n",
                                   dev_path(dev),
@@ -605,10 +605,10 @@ unsigned int pci_scan_bus(struct bus *bus, unsigned min_devfn,
                         * some arbitray code without any justification */
                        if (dev->chip && dev->chip->control &&
                            dev->chip->control->enable_dev) {
-                               int enable  = dev->enable;
-                               dev->enable = 1;
+                               int enable  = dev->enabled;
+                               dev->enabled = 1;
                                dev->chip->control->enable_dev(dev);
-                               dev->enable = enable;
+                               dev->enabled = enable;
                        }
                        /* Now read the vendor and device id */
                        id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -648,7 +648,7 @@ unsigned int pci_scan_bus(struct bus *bus, unsigned min_devfn,
                printk_debug("%s [%04x/%04x] %s\n", 
                             dev_path(dev),
                             dev->vendor, dev->device, 
-                            dev->enable?"enabled": "disabled");
+                            dev->enabled?"enabled": "disabled");
 
                if (PCI_FUNC(devfn) == 0x00 && (hdr_type & 0x80) != 0x80) {
                        /* if this is not a multi function device, don't

diff --git a/src/devices/pnp_device.c b/src/devices/pnp_device.c
index 5a2e85795d6721d311956eddaea465859088dd05..207e3db23f1fd289b026db72a0298c848774e238 100644 (file)
--- a/src/devices/pnp_device.c
+++ b/src/devices/pnp_device.c
@@ -131,7 +131,7 @@ void pnp_enable_resources(device_t dev)
 void pnp_enable(device_t dev)
 {
 
-        if (!dev->enable) {
+        if (!dev->enabled) {
                pnp_set_logical_device(dev);
                pnp_set_enable(dev, 0);
        }

diff --git a/src/devices/root_device.c b/src/devices/root_device.c
index 0bf5ea60a85c07cd05a8431991107e5140efe2ee..c2173d3947ba849567000838216a9667084af76c 100644 (file)
--- a/src/devices/root_device.c
+++ b/src/devices/root_device.c
@@ -78,7 +78,7 @@ unsigned int walk_static_devices(device_t bus, unsigned int max)
                                child->ops->enable(child);
                        }
                        printk_debug("%s %s\n", dev_path(child),
-                                    child->enable?"enabled": "disabled");
+                                    child->enabled?"enabled": "disabled");
                }
        }
        for (link = 0; link < bus->links; link++) {
@@ -124,12 +124,12 @@ struct device dev_root = {
        .ops = &default_dev_ops_root,
        .bus = &dev_root.link[0],
        .path = { .type = DEVICE_PATH_ROOT },
-       .enable = 1,
-       .links = 1,
-       .link = {
-               [0] = {
-                       .dev = &dev_root,
-                       .link = 0,
-               },
-       },
+       .enabled = 1,
+       .links   = 1,
+       .link    = {
+                [0] = {
+                        .dev = &dev_root,
+                        .link = 0,
+                },
+        },
 };

diff --git a/src/include/device/device.h b/src/include/device/device.h
index 708fa149d3eea183bef9c7dc65b27803b2583303..52fb723ebeb31432b09c698cc7d9b06c5bd2ccc6 100644 (file)
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -46,8 +46,7 @@ struct device {
        unsigned short  device;
        unsigned int    class;          /* 3 bytes: (base,sub,prog-if) */
        unsigned int    hdr_type;       /* PCI header type */
-       /* @todo rename this to 'enabled' */
-       unsigned int    enable : 1;     /* set if we should enable the device */
+       unsigned int    enabled : 1;    /* set if we should enable the device */
 
        uint8_t command;
 

diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index d6b99a6c4ee7da8d1c7e7069aadeae1914660730..867654cdf5ee9aaedd68476b3d9f90991ba5b033 100644 (file)
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -97,7 +97,7 @@ struct mem_range *sizeram(void)
                             i, mem[i].basek, i, mem[i].sizek);
        }
 #endif
-       while(idx < sizeof(mem)/sizeof(mem[0])) {
+       while (idx < sizeof(mem)/sizeof(mem[0])) {
                mem[idx].basek = 0;
                mem[idx].sizek = 0;
                idx++;
@@ -192,7 +192,7 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
                /* See if there is an available configuration space mapping register
                 * in function 1. */
                free_reg = 0;
-               for(config_reg = 0xe0; config_reg <= 0xec; config_reg += 4) {
+               for (config_reg = 0xe0; config_reg <= 0xec; config_reg += 4) {
                        uint32_t config;
                        config = f1_read_config32(config_reg);
                        if (!free_reg && ((config & 3) == 0)) {
@@ -200,8 +200,8 @@ static unsigned int amdk8_scan_chains(device_t dev, unsigned int max)
                                continue;
                        }
                        if (((config & 3) == 3) && 
-                               (((config >> 4) & 7) == nodeid) &&
-                               (((config >> 8) & 3) == link)) {
+                           (((config >> 4) & 7) == nodeid) &&
+                           (((config >> 8) & 3) == link)) {
                                break;
                        }
                }
@@ -492,12 +492,12 @@ unsigned int amdk8_scan_root_bus(device_t root, unsigned int max)
        printk_debug("amdk8_scan_root_bus\n");
 
        /* Unmap all of the HT chains */
+       printk_debug("amdk8_scan_root_bus: clearing HT registers\n");
        for (reg = 0xe0; reg <= 0xec; reg += 4) {
-               printk_debug("amdk8_scan_root: clearing register %x\n", reg);
                f1_write_config32(reg, 0);
        }
 
-       printk_debug("amdk8_scan_root_bus: start scan pci bus\n");
+       printk_debug("amdk8_scan_root_bus: start scaning pci bus\n");
        max = pci_scan_bus(&root->link[0], PCI_DEVFN(0x18, 0), 0xff, max);
 
        printk_debug("amdk8_scan_root_bus: done\n");
@@ -570,14 +570,12 @@ static struct device_operations northbridge_operations = {
        .enable           = 0,
 };
 
-
 static struct pci_driver mcf0_driver __pci_driver = {
        .ops    = &northbridge_operations,
        .vendor = PCI_VENDOR_ID_AMD,
        .device = 0x1100,
 };
 
-
 static void enumerate(struct chip *chip)
 {
        chip_enumerate(chip);

diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index ccf26b623ec319e00fb5c22990115f8fe7d768fa..e576ea8f0c3b152ecfa0a9cd2e929eb2758b75dd 100644 (file)
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -40,7 +40,7 @@ void amd8111_enable(device_t dev)
        }
        reg = reg_old = pci_read_config16(lpc_dev, 0x48);
        reg &= ~(1 << index);
-       if (dev->enable) {
+       if (dev->enabled) {
                reg |= (1 << index);
        }
        if (reg != reg_old) {

diff --git a/src/southbridge/amd/amd8131/amd8131_bridge.c b/src/southbridge/amd/amd8131/amd8131_bridge.c
index 44b04d8636ffecd12000092ca2d7c3856c3ddd84..dc474fc7b0bf1700142c4591505b2730e6251d7e 100644 (file)
--- a/src/southbridge/amd/amd8131/amd8131_bridge.c
+++ b/src/southbridge/amd/amd8131/amd8131_bridge.c
@@ -98,19 +98,19 @@ static struct pci_driver pcix_driver __pci_driver = {
 static void ioapic_enable(device_t dev)
 {
        uint32_t value;
+
        value = pci_read_config32(dev, 0x44);
-       if (dev->enable) {
+       if (dev->enabled) {
                value |= ((1 << 1) | (1 << 0));
        } else {
                value &= ~((1 << 1) | (1 << 0));
        }
        pci_write_config32(dev, 0x44, value);
 
-//BY LYH
+       /* We have to enable MEM and Bus Master for IOAPIC */
         value = pci_read_config32(dev, 0x4);
         value |= 6;
         pci_write_config32(dev, 0x4, value);
-//BY LYH END
 }
 
 static struct device_operations ioapic_ops = {

diff --git a/src/superio/NSC/pc87360/superio.c b/src/superio/NSC/pc87360/superio.c
index 50d71ea92756668b3116ec761a4a586ccc4a5677..a9131569f55fdb6531d7c4dc75d304348c86028c 100644 (file)
--- a/src/superio/NSC/pc87360/superio.c
+++ b/src/superio/NSC/pc87360/superio.c
@@ -21,7 +21,7 @@ static void init(device_t dev)
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
-       if (!dev->enable) {
+       if (!dev->enabled) {
                return;
        }
        conf = dev->chip->chip_info;

diff --git a/src/superio/NSC/pc87366/superio.c b/src/superio/NSC/pc87366/superio.c
index 11da4825829e1971827d1cf6d99cb5eba75c32c0..7c492583f3ee15900938ae20b7bfc4e3f83bdba6 100644 (file)
--- a/src/superio/NSC/pc87366/superio.c
+++ b/src/superio/NSC/pc87366/superio.c
@@ -21,7 +21,7 @@ static void init(device_t dev)
        /* Wishlist handle well known programming interfaces more
         * generically.
         */
-       if (!dev->enable) {
+       if (!dev->enabled) {
                return;
        }
        conf = dev->chip->chip_info;

diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 0096fcd3ddb1a0ef0eff0c7a4402babde9a25583..9773d477dd5268952e46b7be586770662f9378c8 100644 (file)
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -83,7 +83,7 @@ static void w83627hf_init(device_t dev)
 {
        struct superio_winbond_w83627hf_config *conf;
        struct resource *res0, *res1;
-       if (!dev->enable) {
+       if (!dev->enabled) {
                return;
        }
        conf = dev->chip->chip_info;
@@ -140,7 +140,7 @@ void w83627hf_pnp_enable_resources(device_t dev)
 void w83627hf_pnp_enable(device_t dev)
 {
 
-        if (!dev->enable) {
+        if (!dev->enabled) {
                 pnp_enter_ext_func_mode(dev);   // BY LYH
 
                 pnp_set_logical_device(dev);