diff options
| author | Paul Brook <paul@codesourcery.com> | 2009-05-08 02:35:15 +0100 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2009-05-08 02:35:15 +0100 |
| commit | 2ac711791b2e4aabc5e4046b7428727828c705eb (patch) | |
| tree | c4ed47028dee4949cc7eace9760a20d1759406e2 /hw/pl080.c | |
| parent | e612a1f7256bb3546cf3e9ae6cad3997c4153663 (diff) | |
| download | focaccia-qemu-2ac711791b2e4aabc5e4046b7428727828c705eb.tar.gz focaccia-qemu-2ac711791b2e4aabc5e4046b7428727828c705eb.zip | |
Replace cpu_abort with hw_error
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/pl080.c')
| -rw-r--r-- | hw/pl080.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/pl080.c b/hw/pl080.c index e4d7e170e5..d18445b475 100644 --- a/hw/pl080.c +++ b/hw/pl080.c @@ -93,7 +93,7 @@ static void pl080_run(pl080_state *s) if ((s->conf & PL080_CONF_E) == 0) return; -cpu_abort(cpu_single_env, "DMA active\n"); +hw_error("DMA active\n"); /* If we are already in the middle of a DMA operation then indicate that there may be new DMA requests and return immediately. */ if (s->running) { @@ -111,7 +111,7 @@ again: continue; flow = (ch->conf >> 11) & 7; if (flow >= 4) { - cpu_abort(cpu_single_env, + hw_error( "pl080_run: Peripheral flow control not implemented\n"); } src_id = (ch->conf >> 1) & 0x1f; @@ -242,7 +242,7 @@ static uint32_t pl080_read(void *opaque, target_phys_addr_t offset) return s->sync; default: bad_offset: - cpu_abort(cpu_single_env, "pl080_read: Bad offset %x\n", (int)offset); + hw_error("pl080_read: Bad offset %x\n", (int)offset); return 0; } } @@ -288,13 +288,12 @@ static void pl080_write(void *opaque, target_phys_addr_t offset, case 10: /* SoftLBReq */ case 11: /* SoftLSReq */ /* ??? Implement these. */ - cpu_abort(cpu_single_env, "pl080_write: Soft DMA not implemented\n"); + hw_error("pl080_write: Soft DMA not implemented\n"); break; case 12: /* Configuration */ s->conf = value; if (s->conf & (PL080_CONF_M1 | PL080_CONF_M1)) { - cpu_abort(cpu_single_env, - "pl080_write: Big-endian DMA not implemented\n"); + hw_error("pl080_write: Big-endian DMA not implemented\n"); } pl080_run(s); break; @@ -303,7 +302,7 @@ static void pl080_write(void *opaque, target_phys_addr_t offset, break; default: bad_offset: - cpu_abort(cpu_single_env, "pl080_write: Bad offset %x\n", (int)offset); + hw_error("pl080_write: Bad offset %x\n", (int)offset); } pl080_update(s); } |