← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vice/trusty

« back to all changes in this revision

Viewing changes to src/init.c

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2013-07-28 20:38:23 UTC
  • mfrom: (1.1.10) (9.2.7 sid)
  • Revision ID: package-import@ubuntu.com-20130728203823-1h8s6bcv22oundul
Tags: 2.4.dfsg-1
http://bugs.debian.org/693065
http://bugs.debian.org/693641
http://bugs.debian.org/686400
http://bugs.debian.org/714136
* New upstream release (closes: #693065, #693641).
* Drop vice-ffmpeg.patch , applied upstream.
* Disable architecture specific compilation (closes: #686400, #714136).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/init.c
142
142
        init_resource_fail("network");
143
143
        return -1;
144
144
    }
 
145
    if (monitor_resources_init() < 0) {
 
146
        init_resource_fail("monitor");
 
147
        return -1;
 
148
    }
145
149
#ifdef HAVE_NETWORK
146
150
    if (monitor_network_resources_init() < 0) {
147
151
        init_resource_fail("monitor");
175
179
        init_cmdline_options_fail("system file locator");
176
180
        return -1;
177
181
    }
178
 
    if ((!(vsid_mode && video_disabled_mode)) && ui_cmdline_options_init() < 0) {
 
182
    if (!video_disabled_mode && ui_cmdline_options_init() < 0) {
179
183
        init_cmdline_options_fail("UI");
180
184
        return -1;
181
185
    }
182
 
    if (!vsid_mode && autostart_cmdline_options_init() < 0) {
183
 
        init_resource_fail("autostart");
184
 
        return -1;
185
 
    }
186
 
    if (!vsid_mode && fliplist_cmdline_options_init() < 0) {
187
 
        init_cmdline_options_fail("flip list");
188
 
        return -1;
189
 
    }
190
 
    if (!vsid_mode && file_system_cmdline_options_init() < 0) {
191
 
        init_cmdline_options_fail("attach");
192
 
        return -1;
193
 
    }
194
 
    if (!vsid_mode && disk_image_cmdline_options_init() < 0) {
195
 
        init_cmdline_options_fail("disk image");
196
 
        return -1;
197
 
    }
198
 
    if (!vsid_mode && event_cmdline_options_init() < 0) {
199
 
        init_cmdline_options_fail("event");
200
 
        return -1;
 
186
    if (machine_class != VICE_MACHINE_VSID) {
 
187
        if (autostart_cmdline_options_init() < 0) {
 
188
            init_resource_fail("autostart");
 
189
            return -1;
 
190
        }
 
191
        if (fliplist_cmdline_options_init() < 0) {
 
192
            init_cmdline_options_fail("flip list");
 
193
            return -1;
 
194
        }
 
195
        if (file_system_cmdline_options_init() < 0) {
 
196
            init_cmdline_options_fail("attach");
 
197
            return -1;
 
198
        }
 
199
        if (disk_image_cmdline_options_init() < 0) {
 
200
            init_cmdline_options_fail("disk image");
 
201
            return -1;
 
202
        }
 
203
        if (event_cmdline_options_init() < 0) {
 
204
            init_cmdline_options_fail("event");
 
205
            return -1;
 
206
        }
201
207
    }
202
208
    if (monitor_cmdline_options_init() < 0) {
203
209
        init_cmdline_options_fail("monitor");
214
220
        return -1;
215
221
    }
216
222
 
217
 
    if (!vsid_mode && fsdevice_cmdline_options_init() < 0) {
218
 
        init_cmdline_options_fail("file system");
219
 
        return -1;
 
223
    if (machine_class != VICE_MACHINE_VSID) {
 
224
        if (fsdevice_cmdline_options_init() < 0) {
 
225
            init_cmdline_options_fail("file system");
 
226
            return -1;
 
227
        }
220
228
    }
221
 
    if ((!(vsid_mode && video_disabled_mode)) && joystick_init_cmdline_options() < 0) {
 
229
    if (!video_disabled_mode && joystick_init_cmdline_options() < 0) {
222
230
        init_cmdline_options_fail("joystick");
223
231
        return -1;
224
232
    }
225
 
    if (!vsid_mode && kbdbuf_cmdline_options_init() < 0) {
226
 
        init_cmdline_options_fail("keyboard");
227
 
        return -1;
228
 
    }
229
 
    if (!vsid_mode && ram_cmdline_options_init() < 0) {
230
 
        init_cmdline_options_fail("RAM");
231
 
        return -1;
232
 
    }
233
 
    if (!vsid_mode && gfxoutput_cmdline_options_init() < 0) {
234
 
        init_cmdline_options_fail("GFXOUTPUT");
235
 
        return -1;
 
233
    if (machine_class != VICE_MACHINE_VSID) {
 
234
        if (kbdbuf_cmdline_options_init() < 0) {
 
235
            init_cmdline_options_fail("keyboard");
 
236
            return -1;
 
237
        }
 
238
        if (ram_cmdline_options_init() < 0) {
 
239
            init_cmdline_options_fail("RAM");
 
240
            return -1;
 
241
        }
 
242
        if (gfxoutput_cmdline_options_init() < 0) {
 
243
            init_cmdline_options_fail("GFXOUTPUT");
 
244
            return -1;
 
245
        }
236
246
    }
237
247
#ifdef HAVE_NETWORK
238
248
    if (monitor_network_cmdline_options_init() < 0) {
253
263
        palette_init();
254
264
    }
255
265
 
256
 
    if (!vsid_mode) {
 
266
    if (machine_class != VICE_MACHINE_VSID) {
257
267
        gfxoutput_init();
258
268
        screenshot_init();
259
269
 
272
282
    }
273
283
 
274
284
    /* FIXME: what's about uimon_init??? */
275
 
    if (!vsid_mode && console_init() < 0) {
 
285
    /* the monitor console MUST be available, because of for example cpujam,
 
286
       or -initbreak from cmdline.
 
287
    */
 
288
    if (console_init() < 0) {
276
289
        log_error(LOG_DEFAULT, "Console initialization failed.");
277
290
        return -1;
278
291
    }
283
296
        joystick_init();
284
297
    }
285
298
 
286
 
    if (!vsid_mode) {
 
299
    if (machine_class != VICE_MACHINE_VSID) {
287
300
        disk_image_init();
288
301
        vdrive_init();
289
302
    }