V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

pci: Use a separate 'dev' variable for the PCI device 

In the 'pci' command, add a separate variable to hold the PCI device. When
this code is converted to driver model, this variable will be used to hold a
struct udevice instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-11-26 19:51:27 -07:00
parent 72ef5b608c
commit 32ec5b344b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/cmd_pci.c
View File

@ -444,6 +444,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
ulong addr = 0, value = 0, cmd_size = 0; ulong addr = 0, value = 0, cmd_size = 0;
enum pci_size_t size = PCI_SIZE_32; enum pci_size_t size = PCI_SIZE_32;
pci_dev_t dev;
int busnum = 0; int busnum = 0;
pci_dev_t bdf = 0; pci_dev_t bdf = 0;
char cmd = 's'; char cmd = 's';
@ -488,12 +489,14 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 0; return 0;
} }
dev = bdf;
switch (argv[1][0]) { switch (argv[1][0]) {
case 'h': /* header */ case 'h': /* header */
pci_header_show(bdf); pci_header_show(dev);
break; break;
case 'd': /* display */ case 'd': /* display */
return pci_cfg_display(bdf, addr, size, value); return pci_cfg_display(dev, addr, size, value);
#ifdef CONFIG_CMD_PCI_ENUM #ifdef CONFIG_CMD_PCI_ENUM
case 'e': case 'e':
# ifdef CONFIG_DM_PCI # ifdef CONFIG_DM_PCI
@ -506,17 +509,17 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
case 'n': /* next */ case 'n': /* next */
if (argc < 4) if (argc < 4)
goto usage; goto usage;
ret = pci_cfg_modify(bdf, addr, size, value, 0); ret = pci_cfg_modify(dev, addr, size, value, 0);
break; break;
case 'm': /* modify */ case 'm': /* modify */
if (argc < 4) if (argc < 4)
goto usage; goto usage;
ret = pci_cfg_modify(bdf, addr, size, value, 1); ret = pci_cfg_modify(dev, addr, size, value, 1);
break; break;
case 'w': /* write */ case 'w': /* write */
if (argc < 5) if (argc < 5)
goto usage; goto usage;
ret = pci_cfg_write(bdf, addr, size, value); ret = pci_cfg_write(dev, addr, size, value);
break; break;
default: default:
ret = CMD_RET_USAGE; ret = CMD_RET_USAGE;