@@ -35,7 +35,7 @@ uint32_t omap_badwidth_read8(void *opaque, hwaddr addr)
uint8_t ret;
OMAP_8B_REG(addr);
- cpu_physical_memory_read(addr, &ret, 1);
+ address_space_read(addr, &ret, 1);
return ret;
}
@@ -45,7 +45,7 @@ void omap_badwidth_write8(void *opaque, hwaddr addr,
uint8_t val8 = value;
OMAP_8B_REG(addr);
- cpu_physical_memory_write(addr, &val8, 1);
+ address_space_write(addr, &val8, 1);
}
uint32_t omap_badwidth_read16(void *opaque, hwaddr addr)
@@ -53,7 +53,7 @@ uint32_t omap_badwidth_read16(void *opaque, hwaddr addr)
uint16_t ret;
OMAP_16B_REG(addr);
- cpu_physical_memory_read(addr, &ret, 2);
+ address_space_read(addr, &ret, 2);
return ret;
}
@@ -63,7 +63,7 @@ void omap_badwidth_write16(void *opaque, hwaddr addr,
uint16_t val16 = value;
OMAP_16B_REG(addr);
- cpu_physical_memory_write(addr, &val16, 2);
+ address_space_write(addr, &val16, 2);
}
uint32_t omap_badwidth_read32(void *opaque, hwaddr addr)
@@ -71,7 +71,7 @@ uint32_t omap_badwidth_read32(void *opaque, hwaddr addr)
uint32_t ret;
OMAP_32B_REG(addr);
- cpu_physical_memory_read(addr, &ret, 4);
+ address_space_read(addr, &ret, 4);
return ret;
}
@@ -79,7 +79,7 @@ void omap_badwidth_write32(void *opaque, hwaddr addr,
uint32_t value)
{
OMAP_32B_REG(addr);
- cpu_physical_memory_write(addr, &value, 4);
+ address_space_write(addr, &value, 4);
}
/* MPU OS timers */
@@ -292,9 +292,9 @@ static void pxa2xx_pwrmode_write(CPUARMState *env, const ARMCPRegInfo *ri,
#if 0
buffer = 0xe59ff000; /* ldr pc, [pc, #0] */
- cpu_physical_memory_write(0, &buffer, 4);
+ address_space_write(0, &buffer, 4);
buffer = s->pm_regs[PSPR >> 2];
- cpu_physical_memory_write(8, &buffer, 4);
+ address_space_write(8, &buffer, 4);
#endif
/* Suspend */
@@ -82,7 +82,7 @@ static void mv88w8618_audio_callback(void *opaque, int free_out, int free_in)
if (block_size > 4096) {
return;
}
- cpu_physical_memory_read(s->target_buffer + s->play_pos, buf, block_size);
+ address_space_read(s->target_buffer + s->play_pos, buf, block_size);
mem_buffer = buf;
if (s->playback_mode & MP_AUDIO_16BIT_SAMPLE) {
if (s->playback_mode & MP_AUDIO_MONO) {
@@ -203,7 +203,7 @@ static void ac97_in_cb(void *opaque, int avail_b)
break;
}
- cpu_physical_memory_write(addr, buf, acquired);
+ address_space_write(addr, buf, acquired);
temp -= acquired;
addr += acquired;
@@ -241,7 +241,7 @@ static void ac97_out_cb(void *opaque, int free_b)
int copied, to_copy;
to_copy = audio_MIN(temp, sizeof(buf));
- cpu_physical_memory_read(addr, buf, to_copy);
+ address_space_read(addr, buf, to_copy);
copied = AUD_write(s->voice_out, buf, to_copy);
if (!copied) {
break;