flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

tools/intel_iosf_sb_*: Use getopt() to parse the options

Browse Source 
I want to add some command line options so switch to getopt() to make
that easier.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2015-02-05 16:50:07 +02:00
parent 38e3c58cba
commit 0461e8cf43
2 changed files with 78 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
tools/intel_iosf_sb_read.c
View File

@ -70,30 +70,59 @@ static int iosf_sb_port_parse(const char *name)
static void usage(const char *name) static void usage(const char *name)
{ {
printf("Warning : This program will work only on Valleyview\n" int i;
"Usage: %s <port> <reg>\n"
"\t port/reg : in 0xXXXX format\n", printf("Warning : This program will work only on Valleyview/Cherryview\n"
name); "Usage: %s [-h] [--] <port> <reg>\n"
"\t -h : Show this help text\n"
"\t <port> : ", name);
for (i = 0; i < ARRAY_SIZE(iosf_sb_ports); i++)
printf("%s,", iosf_sb_ports[i].name);
printf(" or in hex\n"
"\t <reg> : in hex\n");
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
uint32_t port, reg, val; uint32_t port, reg, val;
struct pci_device *dev = intel_get_pci_device(); struct pci_device *dev = intel_get_pci_device();
int i, nregs;
const char *name;
if (argc != 3 || !(IS_VALLEYVIEW(dev->device_id) || IS_CHERRYVIEW(dev->device_id))) { if (!IS_VALLEYVIEW(dev->device_id) &&
!IS_CHERRYVIEW(dev->device_id)) {
usage(argv[0]); usage(argv[0]);
return 1; return 1;
} }
port = iosf_sb_port_parse(argv[1]); for (;;) {
int c = getopt(argc, argv, "h");
reg = strtoul(argv[2], NULL, 16); if (c == -1)
break;
switch (c) {
case 'h':
usage(argv[0]);
return 0;
}
}
nregs = argc - optind;
if (nregs < 1) {
usage(argv[0]);
return 2;
}
i = optind;
name = argv[i++];
port = iosf_sb_port_parse(name);
intel_register_access_init(dev, 0); intel_register_access_init(dev, 0);
reg = strtoul(argv[i], NULL, 16);
val = intel_iosf_sb_read(port, reg); val = intel_iosf_sb_read(port, reg);
printf("0x%02x(%s)/0x%04x : 0x%08x\n", port, argv[1], reg, val); printf("0x%02x(%s)/0x%04x : 0x%08x\n", port, name, reg, val);
intel_register_access_fini(); intel_register_access_fini();

51
tools/intel_iosf_sb_write.c
View File

@ -69,36 +69,67 @@ static int iosf_sb_port_parse(const char *name)
static void usage(const char *name) static void usage(const char *name)
{ {
printf("Warning : This program will work only on Valleyview\n" int i;
"Usage: %s <port> <reg> <val>\n"
"\t port/reg/val : in 0xXXXX format\n", printf("Warning : This program will work only on Valleyview/Cherryview\n"
name); "Usage: %s [-h] [--] <port> <reg> <val>\n"
"\t -h : Show this help text\n"
"\t <port> : ", name);
for (i = 0; i < ARRAY_SIZE(iosf_sb_ports); i++)
printf("%s,", iosf_sb_ports[i].name);
printf(" or in hex\n"
"\t <reg> : in hex\n"
"\t <val> : in hex\n");
} }
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
uint32_t port, reg, val, tmp; uint32_t port, reg, val, tmp;
struct pci_device *dev = intel_get_pci_device(); struct pci_device *dev = intel_get_pci_device();
int i, nregs;
const char *name;
if (argc != 4 || !(IS_VALLEYVIEW(dev->device_id) || IS_CHERRYVIEW(dev->device_id))) { if (!IS_VALLEYVIEW(dev->device_id) &&
!IS_CHERRYVIEW(dev->device_id)) {
usage(argv[0]); usage(argv[0]);
return 1; return 1;
} }
port = iosf_sb_port_parse(argv[1]); for (;;) {
int c = getopt(argc, argv, "h");
reg = strtoul(argv[2], NULL, 16); if (c == -1)
val = strtoul(argv[3], NULL, 16); break;
switch (c) {
case 'h':
usage(argv[0]);
return 0;
}
}
nregs = argc - optind;
if (nregs < 2) {
usage(argv[0]);
return 2;
}
i = optind;
name = argv[i++];
port = iosf_sb_port_parse(name);
reg = strtoul(argv[i], NULL, 16);
val = strtoul(argv[i+1], NULL, 16);
intel_register_access_init(dev, 0); intel_register_access_init(dev, 0);
tmp = intel_iosf_sb_read(port, reg); tmp = intel_iosf_sb_read(port, reg);
printf("0x%02x(%s)/0x%04x before : 0x%08x\n", port, argv[1], reg, tmp); printf("0x%02x(%s)/0x%04x before : 0x%08x\n", port, name, reg, tmp);
intel_iosf_sb_write(port, reg, val); intel_iosf_sb_write(port, reg, val);
tmp = intel_iosf_sb_read(port, reg); tmp = intel_iosf_sb_read(port, reg);
printf("0x%02x(%s)/0x%04x after : 0x%08x\n", port, argv[1], reg, tmp); printf("0x%02x(%s)/0x%04x after : 0x%08x\n", port, name, reg, tmp);
intel_register_access_fini(); intel_register_access_fini();