diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-04-15 15:47:34 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-05-05 13:10:12 +0300 |
| commit | 12d785bcd47396b477cca206e5db2158d02ffd5b (patch) | |
| tree | adeeb078ee177c9a81db7c8fb31b3fd9b168ea2e /tools | |
| parent | 87eb37c86b5c4212e48cae1a05a9c21b7ff03e3e (diff) | |
intel_reg_{read,write}: switch to INREG and OUTREG
Use INREG and OUTREG instead of using mmio directly.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/intel_reg_read.c | 5 | ||||
| -rw-r--r-- | tools/intel_reg_write.c | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tools/intel_reg_read.c b/tools/intel_reg_read.c index 3b912914..46fa664b 100644 --- a/tools/intel_reg_read.c +++ b/tools/intel_reg_read.c @@ -51,8 +51,7 @@ static void dump_range(uint32_t start, uint32_t end) int i; for (i = start; i < end; i += 4) - printf("0x%X : 0x%X\n", i, - *(volatile uint32_t *)((volatile char*)mmio + i)); + printf("0x%X : 0x%X\n", i, INREG(i)); } static void usage(char *cmdname) @@ -130,7 +129,7 @@ int main(int argc, char** argv) dump_range(reg, reg + (dwords * 4)); if (decode_bits) - bit_decode(*(volatile uint32_t *)((volatile char*)mmio + reg)); + bit_decode(INREG(reg)); } } diff --git a/tools/intel_reg_write.c b/tools/intel_reg_write.c index ff4e561e..b0ddffeb 100644 --- a/tools/intel_reg_write.c +++ b/tools/intel_reg_write.c @@ -35,7 +35,6 @@ int main(int argc, char** argv) { uint32_t reg, value; - volatile uint32_t *ptr; if (argc < 3) { printf("Usage: %s addr value\n", argv[0]); @@ -47,11 +46,10 @@ int main(int argc, char** argv) intel_register_access_init(intel_get_pci_device(), 0); sscanf(argv[1], "0x%x", ®); sscanf(argv[2], "0x%x", &value); - ptr = (volatile uint32_t *)((volatile char *)mmio + reg); - printf("Value before: 0x%X\n", *ptr); - *ptr = value; - printf("Value after: 0x%X\n", *ptr); + printf("Value before: 0x%X\n", INREG(reg)); + OUTREG(reg, value); + printf("Value after: 0x%X\n", INREG(reg)); intel_register_access_fini(); return 0; |