Changeset d93aafed in mainline

Timestamp:

2010-10-23T17:57:21Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

33dbbd2

Parents:

8304889

Message:

Use more descriptive variable names.

File:

• uspace/drv/pciintel/pci.c (modified) (6 diffs)

uspace/drv/pciintel/pci.c

@@ -277 +277 @@
         bool io;
         /* 64-bit wide address */
-        bool w64;
+        bool addrw64;
         
         /* Size of the io or memory range specified by the BAR */
@@ -289 +289 @@
         io = (bool) (val & 1);
         if (io) {
-                w64 = false;
+                addrw64 = false;
         } else {
                 switch ((val >> 1) & 3) {
                 case 0:
-                        w64 = false;
+                        addrw64 = false;
                         break;
                 case 2:
-                        w64 = true;
+                        addrw64 = true;
                         break;
                 default:
@@ -314 +314 @@
         range_size = pci_bar_mask_to_size(mask);
         
-        if (w64) {
+        if (addrw64) {
                 range_addr = ((uint64_t)pci_conf_read_32(dev, addr + 4) << 32) |
                     (val & 0xfffffff0);
@@ -321 +321 @@
         }
         
-        if (0 != range_addr) {
+        if (range_addr != 0) {
                 printf(NAME ": device %s : ", dev->name);
                 printf("address = %x", range_addr);
@@ -329 +329 @@
         pci_add_range(dev, range_addr, range_size, io);
         
-        if (w64)
+        if (addrw64)
                 return addr + 8;
         
@@ -524 +524 @@
 }
 
-void init_pci_dev_data(pci_dev_data_t *d, int bus, int dev, int fn)
-{
-        d->bus = bus;
-        d->dev = dev;
-        d->fn = fn;
-}
-
-void delete_pci_dev_data(pci_dev_data_t *d)
-{
-        if (d != NULL) {
-                clean_hw_resource_list(&d->hw_resources);
-                free(d);
+void init_pci_dev_data(pci_dev_data_t *dev_data, int bus, int dev, int fn)
+{
+        dev_data->bus = bus;
+        dev_data->dev = dev;
+        dev_data->fn = fn;
+}
+
+void delete_pci_dev_data(pci_dev_data_t *dev_data)
+{
+        if (dev_data != NULL) {
+                clean_hw_resource_list(&dev_data->hw_resources);
+                free(dev_data);
         }
 }