patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

Rename dev_info_idx to dev_info_index

Browse source 
Updating local variable's name to follow a consistent naming convention.

Change accomplished with the following script:

   #!/bin/bash
   echo "Searching for ${1} to replace with ${2}"
   find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" -o -name "*.arch" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: Iee0936e2c92f2979b7e38f33a950108bdaf6f2c1
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-05-08 17:12:59 -05:00 committed by Anas Nashif
parent c43a34b312
commit 9935ba54d2
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/pci/pci.c
View file

@ -83,7 +83,7 @@ In order to use the driver, BSP has to define:
#define MAX_BARS 6 #define MAX_BARS 6
static struct pci_dev_info __noinit dev_info[CONFIG_MAX_PCI_DEVS]; static struct pci_dev_info __noinit dev_info[CONFIG_MAX_PCI_DEVS];
static int dev_info_idx = 0; static int dev_info_index = 0;
/******************************************************************************* /*******************************************************************************
* *
@ -216,7 +216,7 @@ static void pci_dev_scan(uint32_t bus,
int i; int i;
int max_bars; int max_bars;
if (dev_info_idx == CONFIG_MAX_PCI_DEVS) { if (dev_info_index == CONFIG_MAX_PCI_DEVS) {
/* No more room in the table */ /* No more room in the table */
return; return;
} }
@ -256,20 +256,20 @@ static void pci_dev_scan(uint32_t bus,
for (i = 0; i < max_bars; ++i) { for (i = 0; i < max_bars; ++i) {
/* Ignore BARs with errors and 64 bit BARs */ /* Ignore BARs with errors and 64 bit BARs */
if (pci_bar_params_get( if (pci_bar_params_get(
bus, dev, func, i, dev_info + dev_info_idx) != bus, dev, func, i, dev_info + dev_info_index) !=
0) 0)
continue; continue;
else { else {
dev_info[dev_info_idx].vendor_id = dev_info[dev_info_index].vendor_id =
pci_dev_header.field.vendor_id; pci_dev_header.field.vendor_id;
dev_info[dev_info_idx].device_id = dev_info[dev_info_index].device_id =
pci_dev_header.field.device_id; pci_dev_header.field.device_id;
dev_info[dev_info_idx].class = dev_info[dev_info_index].class =
pci_dev_header.field.class; pci_dev_header.field.class;
dev_info[dev_info_idx].irq = pci_pin2irq( dev_info[dev_info_index].irq = pci_pin2irq(
pci_dev_header.field.interrupt_pin); pci_dev_header.field.interrupt_pin);
dev_info_idx++; dev_info_index++;
if (dev_info_idx == CONFIG_MAX_PCI_DEVS) { if (dev_info_index == CONFIG_MAX_PCI_DEVS) {
/* No more room in the table */ /* No more room in the table */
return; return;
} }
@ -305,7 +305,7 @@ void pci_bus_scan(uint32_t class_mask /* bitmask, bits set for each needed class
/* run through the buses and devices */ /* run through the buses and devices */
for (bus = 0; bus < LSPCI_MAX_BUS; bus++) { for (bus = 0; bus < LSPCI_MAX_BUS; bus++) {
for (dev = 0; (dev < LSPCI_MAX_DEV) && for (dev = 0; (dev < LSPCI_MAX_DEV) &&
(dev_info_idx < CONFIG_MAX_PCI_DEVS); (dev_info_index < CONFIG_MAX_PCI_DEVS);
dev++) { dev++) {
pci_ctrl_addr.field.bus = bus; pci_ctrl_addr.field.bus = bus;
pci_ctrl_addr.field.device = dev; pci_ctrl_addr.field.device = dev;
@ -354,7 +354,7 @@ int pci_dev_find(int class, int idx, uint32_t *addr, uint32_t *size, int *irq)
int i; int i;
int j; int j;
for (i = 0, j = 0; i < dev_info_idx; i++) { for (i = 0, j = 0; i < dev_info_index; i++) {
if (dev_info[i].class != class) if (dev_info[i].class != class)
continue; continue;
@ -384,7 +384,7 @@ void pci_show(void)
int i; int i;
printk("PCI devices:\n"); printk("PCI devices:\n");
for (i = 0; i < dev_info_idx; i++) { for (i = 0; i < dev_info_index; i++) {
printk("%X:%X class: 0x%X, %s, addrs: 0x%X-0x%X, IRQ %d\n", printk("%X:%X class: 0x%X, %s, addrs: 0x%X-0x%X, IRQ %d\n",
dev_info[i].vendor_id, dev_info[i].vendor_id,
dev_info[i].device_id, dev_info[i].device_id,