Revision 2ac71179 hw/pl080.c

b/hw/pl080.c
93 93
    if ((s->conf & PL080_CONF_E) == 0)
94 94
        return;
95 95

  
96
cpu_abort(cpu_single_env, "DMA active\n");
96
hw_error("DMA active\n");
97 97
    /* If we are already in the middle of a DMA operation then indicate that
98 98
       there may be new DMA requests and return immediately.  */
99 99
    if (s->running) {
......
111 111
                continue;
112 112
            flow = (ch->conf >> 11) & 7;
113 113
            if (flow >= 4) {
114
                cpu_abort(cpu_single_env,
114
                hw_error(
115 115
                    "pl080_run: Peripheral flow control not implemented\n");
116 116
            }
117 117
            src_id = (ch->conf >> 1) & 0x1f;
......
242 242
        return s->sync;
243 243
    default:
244 244
    bad_offset:
245
        cpu_abort(cpu_single_env, "pl080_read: Bad offset %x\n", (int)offset);
245
        hw_error("pl080_read: Bad offset %x\n", (int)offset);
246 246
        return 0;
247 247
    }
248 248
}
......
288 288
    case 10: /* SoftLBReq */
289 289
    case 11: /* SoftLSReq */
290 290
        /* ??? Implement these.  */
291
        cpu_abort(cpu_single_env, "pl080_write: Soft DMA not implemented\n");
291
        hw_error("pl080_write: Soft DMA not implemented\n");
292 292
        break;
293 293
    case 12: /* Configuration */
294 294
        s->conf = value;
295 295
        if (s->conf & (PL080_CONF_M1 | PL080_CONF_M1)) {
296
            cpu_abort(cpu_single_env,
297
                      "pl080_write: Big-endian DMA not implemented\n");
296
            hw_error("pl080_write: Big-endian DMA not implemented\n");
298 297
        }
299 298
        pl080_run(s);
300 299
        break;
......
303 302
        break;
304 303
    default:
305 304
    bad_offset:
306
        cpu_abort(cpu_single_env, "pl080_write: Bad offset %x\n", (int)offset);
305
        hw_error("pl080_write: Bad offset %x\n", (int)offset);
307 306
    }
308 307
    pl080_update(s);
309 308
}

Also available in: Unified diff