Revision 2ac71179 hw/omap2.c

b/hw/omap2.c
1070 1070
qemu_irq *omap2_gpio_in_get(struct omap_gpif_s *s, int start)
1071 1071
{
1072 1072
    if (start >= s->modules * 32 || start < 0)
1073
        cpu_abort(cpu_single_env, "%s: No GPIO line %i\n",
1074
                        __FUNCTION__, start);
1073
        hw_error("%s: No GPIO line %i\n", __FUNCTION__, start);
1075 1074
    return s->module[start >> 5].in + (start & 31);
1076 1075
}
1077 1076

  
1078 1077
void omap2_gpio_out_set(struct omap_gpif_s *s, int line, qemu_irq handler)
1079 1078
{
1080 1079
    if (line >= s->modules * 32 || line < 0)
1081
        cpu_abort(cpu_single_env, "%s: No GPIO line %i\n", __FUNCTION__, line);
1080
        hw_error("%s: No GPIO line %i\n", __FUNCTION__, line);
1082 1081
    s->module[line >> 5].handler[line & 31] = handler;
1083 1082
}
1084 1083

  
......
1399 1398
                int chipselect)
1400 1399
{
1401 1400
    if (chipselect < 0 || chipselect >= s->chnum)
1402
        cpu_abort(cpu_single_env, "%s: Bad chipselect %i\n",
1403
                        __FUNCTION__, chipselect);
1401
        hw_error("%s: Bad chipselect %i\n", __FUNCTION__, chipselect);
1404 1402

  
1405 1403
    s->ch[chipselect].txrx = txrx;
1406 1404
    s->ch[chipselect].opaque = opaque;
......
2642 2640
        case omap3430:
2643 2641
            return 0x1b7ae02f;	/* ES 2 */
2644 2642
        default:
2645
            cpu_abort(cpu_single_env, "%s: Bad mpu model\n", __FUNCTION__);
2643
            hw_error("%s: Bad mpu model\n", __FUNCTION__);
2646 2644
        }
2647 2645

  
2648 2646
    case 0x208:	/* PRODUCTION_ID_reg for OMAP2 */
......
2659 2657
        case omap3430:
2660 2658
            return 0x000000f0;
2661 2659
        default:
2662
            cpu_abort(cpu_single_env, "%s: Bad mpu model\n", __FUNCTION__);
2660
            hw_error("%s: Bad mpu model\n", __FUNCTION__);
2663 2661
        }
2664 2662

  
2665 2663
    case 0x20c:
......
2673 2671
        case omap3430:
2674 2672
            return 0xcafeb7ae;	/* ES 2 */
2675 2673
        default:
2676
            cpu_abort(cpu_single_env, "%s: Bad mpu model\n", __FUNCTION__);
2674
            hw_error("%s: Bad mpu model\n", __FUNCTION__);
2677 2675
        }
2678 2676

  
2679 2677
    case 0x218:	/* DIE_ID_reg */

Also available in: Unified diff