← Back to branch summary

~ubuntu-branches/ubuntu/quantal/vice/quantal

« back to all changes in this revision

Viewing changes to src/machine.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2006-07-30 19:15:59 UTC
  • mto: (9.1.1 lenny) (1.1.6 upstream)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20060730191559-g31ymd2mk102kzff
Tags: upstream-1.19
Import upstream version 1.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/machine.c
53
53
#include "maincpu.h"
54
54
#include "mem.h"
55
55
#include "monitor.h"
 
56
#include "network.h"
56
57
#include "printer.h"
57
58
#include "resources.h"
58
59
#include "romset.h"
116
117
    if (event_playback_active())
117
118
        return;
118
119
 
119
 
    event_record(EVENT_RESETCPU, (void *)&mode, sizeof(mode));
120
 
 
121
 
    machine_trigger_reset_internal(mode);
 
120
    if (network_connected()) {
 
121
        network_event_record(EVENT_RESETCPU, (void *)&mode, sizeof(mode));
 
122
    } else {
 
123
        event_record(EVENT_RESETCPU, (void *)&mode, sizeof(mode));
 
124
        machine_trigger_reset_internal(mode);
 
125
    }
122
126
}
123
127
 
124
128
void machine_reset_event_playback(CLOCK offset, void *data)
231
235
 
232
236
    event_shutdown();
233
237
 
 
238
    network_shutdown();
 
239
 
234
240
    fsdevice_resources_shutdown();
235
241
    disk_image_resources_shutdown();
236
242
    machine_resources_shutdown();