Revision 22d83b14 hw/tsc210x.c

b/hw/tsc210x.c
684 684
                            "wrong value written into Audio 1\n");
685 685
#endif
686 686
        tsc2102_audio_rate_update(s);
687
        if (s->audio)
688
            tsc2102_audio_output_update(s);
687
        tsc2102_audio_output_update(s);
689 688
        return;
690 689

  
691 690
    case 0x01:
......
729 728
                            "wrong value written into Power\n");
730 729
#endif
731 730
        tsc2102_audio_rate_update(s);
732
        if (s->audio)
733
            tsc2102_audio_output_update(s);
731
        tsc2102_audio_output_update(s);
734 732
        return;
735 733

  
736 734
    case 0x06:	/* Audio Control 3 */
......
741 739
            fprintf(stderr, "tsc2102_audio_register_write: "
742 740
                            "wrong value written into Audio 3\n");
743 741
#endif
744
        if (s->audio)
745
            tsc2102_audio_output_update(s);
742
        tsc2102_audio_output_update(s);
746 743
        return;
747 744

  
748 745
    case 0x07:	/* LCH_BASS_BOOST_N0 */
......
1105 1102
    return 0;
1106 1103
}
1107 1104

  
1108
uWireSlave *tsc2102_init(qemu_irq pint, AudioState *audio)
1105
uWireSlave *tsc2102_init(qemu_irq pint)
1109 1106
{
1110 1107
    TSC210xState *s;
1111 1108

  
......
1120 1117
    s->pint = pint;
1121 1118
    s->model = 0x2102;
1122 1119
    s->name = "tsc2102";
1123
    s->audio = audio;
1120
    s->audio = AUD_init();;
1124 1121

  
1125 1122
    s->tr[0] = 0;
1126 1123
    s->tr[1] = 1;
......
1146 1143
    qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1,
1147 1144
                    "QEMU TSC2102-driven Touchscreen");
1148 1145

  
1149
    if (s->audio)
1150
        AUD_register_card(s->audio, s->name, &s->card);
1146
    AUD_register_card(s->audio, s->name, &s->card);
1151 1147

  
1152 1148
    qemu_register_reset((void *) tsc210x_reset, s);
1153 1149
    register_savevm(s->name, -1, 0,
......
1156 1152
    return &s->chip;
1157 1153
}
1158 1154

  
1159
uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq,
1160
                qemu_irq dav, AudioState *audio)
1155
uWireSlave *tsc2301_init(qemu_irq penirq, qemu_irq kbirq, qemu_irq dav)
1161 1156
{
1162 1157
    TSC210xState *s;
1163 1158

  
......
1174 1169
    s->davint = dav;
1175 1170
    s->model = 0x2301;
1176 1171
    s->name = "tsc2301";
1177
    s->audio = audio;
1172
    s->audio = AUD_init();
1178 1173

  
1179 1174
    s->tr[0] = 0;
1180 1175
    s->tr[1] = 1;
......
1200 1195
    qemu_add_mouse_event_handler(tsc210x_touchscreen_event, s, 1,
1201 1196
                    "QEMU TSC2301-driven Touchscreen");
1202 1197

  
1203
    if (s->audio)
1204
        AUD_register_card(s->audio, s->name, &s->card);
1198
    AUD_register_card(s->audio, s->name, &s->card);
1205 1199

  
1206 1200
    qemu_register_reset((void *) tsc210x_reset, s);
1207 1201
    register_savevm(s->name, -1, 0, tsc210x_save, tsc210x_load, s);

Also available in: Unified diff