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

intel_reg: switch to INREG and OUTREG

Browse Source 
Use INREG and OUTREG instead of using mmio directly.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2015-04-15 15:42:00 +03:00
parent 23b7f08920
commit 510ac32db1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/intel_reg.c
View File

@ -226,8 +226,7 @@ static int read_register(struct config *config, struct reg *reg, uint32_t *valp)
switch (reg->port_desc.port) { switch (reg->port_desc.port) {
case PORT_MMIO: case PORT_MMIO:
val = *(volatile uint32_t *)((volatile char*)mmio + val = INREG(reg->mmio_offset + reg->addr);
reg->mmio_offset + reg->addr);
break; break;
case PORT_PORTIO_VGA: case PORT_PORTIO_VGA:
iopl(3); iopl(3);
@ -235,7 +234,7 @@ static int read_register(struct config *config, struct reg *reg, uint32_t *valp)
iopl(0); iopl(0);
break; break;
case PORT_MMIO_VGA: case PORT_MMIO_VGA:
val = *((volatile uint8_t*)mmio + reg->addr); val = INREG8(reg->addr);
break; break;
case PORT_BUNIT: case PORT_BUNIT:
case PORT_PUNIT: 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) { switch (reg->port_desc.port) {
case PORT_MMIO: case PORT_MMIO:
*(volatile uint32_t *)((volatile char *)mmio + OUTREG(reg->mmio_offset + reg->addr, val);
reg->mmio_offset + reg->addr) = val;
break; break;
case PORT_PORTIO_VGA: case PORT_PORTIO_VGA:
if (val > 0xff) { 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); val, reg->port_desc.name);
return -1; return -1;
} }
*((volatile uint8_t *)mmio + reg->addr) = val; OUTREG8(reg->addr, val);
break; break;
case PORT_BUNIT: case PORT_BUNIT:
case PORT_PUNIT: case PORT_PUNIT: