diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-04-15 15:42:00 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-05-05 13:10:12 +0300 |
| commit | 510ac32db14e5e847aaf998992f69768c7fffc41 (patch) | |
| tree | 05513794c33f7106845eb645bdc3698a12fa59c0 /tools/intel_reg.c | |
| parent | 23b7f089207e44244ecc5757a2be5263db08581b (diff) | |
intel_reg: 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/intel_reg.c')
| -rw-r--r-- | tools/intel_reg.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/intel_reg.c b/tools/intel_reg.c index 975529d4..0f982669 100644 --- a/tools/intel_reg.c +++ b/tools/intel_reg.c @@ -226,8 +226,7 @@ static int read_register(struct config *config, struct reg *reg, uint32_t *valp) switch (reg->port_desc.port) { case PORT_MMIO: - val = *(volatile uint32_t *)((volatile char*)mmio + - reg->mmio_offset + reg->addr); + val = INREG(reg->mmio_offset + reg->addr); break; case PORT_PORTIO_VGA: iopl(3); @@ -235,7 +234,7 @@ static int read_register(struct config *config, struct reg *reg, uint32_t *valp) iopl(0); break; case PORT_MMIO_VGA: - val = *((volatile uint8_t*)mmio + reg->addr); + val = INREG8(reg->addr); break; case PORT_BUNIT: case PORT_PUNIT: @@ -284,8 +283,7 @@ static int write_register(struct config *config, struct reg *reg, uint32_t val) switch (reg->port_desc.port) { case PORT_MMIO: - *(volatile uint32_t *)((volatile char *)mmio + - reg->mmio_offset + reg->addr) = val; + OUTREG(reg->mmio_offset + reg->addr, val); break; case PORT_PORTIO_VGA: if (val > 0xff) { @@ -303,7 +301,7 @@ static int write_register(struct config *config, struct reg *reg, uint32_t val) val, reg->port_desc.name); return -1; } - *((volatile uint8_t *)mmio + reg->addr) = val; + OUTREG8(reg->addr, val); break; case PORT_BUNIT: case PORT_PUNIT: |