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/omap1.c | |
| parent | e612a1f7256bb3546cf3e9ae6cad3997c4153663 (diff) | |
Replace cpu_abort with hw_error
Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'hw/omap1.c')
| -rw-r--r-- | hw/omap1.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/omap1.c b/hw/omap1.c index c32d3f7f09..f6c0d9dad8 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -1531,7 +1531,7 @@ static uint32_t omap_id_read(void *opaque, target_phys_addr_t addr) case omap1510: return 0x03310115; default: - cpu_abort(cpu_single_env, "%s: bad mpu model\n", __FUNCTION__); + hw_error("%s: bad mpu model\n", __FUNCTION__); } break; @@ -1542,7 +1542,7 @@ static uint32_t omap_id_read(void *opaque, target_phys_addr_t addr) case omap1510: return 0xfb47002f; default: - cpu_abort(cpu_single_env, "%s: bad mpu model\n", __FUNCTION__); + hw_error("%s: bad mpu model\n", __FUNCTION__); } break; } @@ -2775,15 +2775,14 @@ qemu_irq *omap_mpuio_in_get(struct omap_mpuio_s *s) void omap_mpuio_out_set(struct omap_mpuio_s *s, int line, qemu_irq handler) { if (line >= 16 || line < 0) - cpu_abort(cpu_single_env, "%s: No GPIO line %i\n", __FUNCTION__, line); + hw_error("%s: No GPIO line %i\n", __FUNCTION__, line); s->handler[line] = handler; } void omap_mpuio_key(struct omap_mpuio_s *s, int row, int col, int down) { if (row >= 5 || row < 0) - cpu_abort(cpu_single_env, "%s: No key %i-%i\n", - __FUNCTION__, col, row); + hw_error("%s: No key %i-%i\n", __FUNCTION__, col, row); if (down) s->buttons[row] |= 1 << col; @@ -2970,7 +2969,7 @@ qemu_irq *omap_gpio_in_get(struct omap_gpio_s *s) void omap_gpio_out_set(struct omap_gpio_s *s, int line, qemu_irq handler) { if (line >= 16 || line < 0) - cpu_abort(cpu_single_env, "%s: No GPIO line %i\n", __FUNCTION__, line); + hw_error("%s: No GPIO line %i\n", __FUNCTION__, line); s->handler[line] = handler; } |