← Back to branch summary

~ubuntu-branches/ubuntu/raring/vice/raring

« back to all changes in this revision

Viewing changes to src/init.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2009-03-31 00:37:15 UTC
  • mfrom: (1.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: james.westby@ubuntu.com-20090331003715-mzclchtl0dp7fcl0
Tags: upstream-2.1.dfsg
Import upstream version 2.1.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/init.c
29
29
 
30
30
#include "archdep.h"
31
31
#include "attach.h"
 
32
#include "autostart.h"
32
33
#include "cmdline.h"
33
34
#include "console.h"
34
35
#include "debug.h"
47
48
#include "log.h"
48
49
#include "machine-bus.h"
49
50
#include "machine.h"
 
51
#include "monitor.h"
50
52
#include "maincpu.h"
51
53
#include "network.h"
52
54
#include "palette.h"
80
82
        init_resource_fail("system file locator");
81
83
        return -1;
82
84
    }
 
85
    if (autostart_resources_init() < 0) {
 
86
        init_resource_fail("autostart");
 
87
        return -1;
 
88
    }
83
89
    if (romset_resources_init() < 0) {
84
90
        init_resource_fail("romset");
85
91
        return -1;
165
171
        init_cmdline_options_fail("UI");
166
172
        return -1;
167
173
    }
 
174
    if (autostart_cmdline_options_init() < 0) {
 
175
        init_resource_fail("autostart");
 
176
        return -1;
 
177
    }
168
178
    if (fliplist_cmdline_options_init() < 0) {
169
179
        init_cmdline_options_fail("flip list");
170
180
        return -1;
181
191
        init_cmdline_options_fail("event");
182
192
        return -1;
183
193
    }
 
194
    if (monitor_cmdline_options_init() < 0) {
 
195
        init_cmdline_options_fail("monitor");
 
196
        return -1;
 
197
    }
184
198
#ifdef DEBUG
185
199
    if (debug_cmdline_options_init() < 0) {
186
200
        init_cmdline_options_fail("debug");