← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/autostart.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
http://bugs.debian.org/287640
http://bugs.debian.org/286767
http://bugs.debian.org/152952
http://bugs.debian.org/207942
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/autostart.c
128
128
 
129
129
    line_length = (int)(lnmx < 0 ? -lnmx : mem_read((WORD)(lnmx)) + 1);
130
130
 
131
 
    if (!kbd_buf_is_empty())
 
131
    if (!kbdbuf_is_empty())
132
132
        return NOT_YET;
133
133
 
134
134
    if (blink_mode == AUTOSTART_WAIT_BLINK && cursor_column != 0)
258
258
static void disk_attention_callback(void)
259
259
{
260
260
    if (autostart_run_mode == AUTOSTART_MODE_RUN)
261
 
        kbd_buf_feed("RUN\r");
 
261
        kbdbuf_feed("RUN:\r");
262
262
 
263
263
    machine_bus_attention_callback_set(NULL);
264
264
 
278
278
        log_message(autostart_log, "Loading file.");
279
279
        if (autostart_program_name) {
280
280
            tmp = util_concat("LOAD\"", autostart_program_name, "\"\r", NULL);
281
 
            kbd_buf_feed(tmp);
 
281
            kbdbuf_feed(tmp);
282
282
            lib_free(tmp);
283
283
        } else {
284
 
            kbd_buf_feed("LOAD\r");
 
284
            kbdbuf_feed("LOAD\r");
285
285
        }
286
286
        if (tape_tap_attched()) {
287
287
            autostartmode = AUTOSTART_PRESSPLAYONTAPE;
318
318
    switch (check("READY.", AUTOSTART_WAIT_BLINK)) {
319
319
      case YES:
320
320
        log_message(autostart_log, "Starting program.");
321
 
        kbd_buf_feed("RUN\r");
 
321
        kbdbuf_feed("RUN\r");
322
322
        autostartmode = AUTOSTART_DONE;
323
323
        break;
324
324
      case NO:
362
362
            tmp = lib_msprintf("LOAD\"%s\",8,1\r", autostart_program_name);
363
363
        else
364
364
            tmp = lib_stralloc("LOAD\"*\",8,1\r");
365
 
        kbd_buf_feed(tmp);
 
365
        kbdbuf_feed(tmp);
366
366
        lib_free(tmp);
367
367
 
368
368
        if (!traps) {
369
369
            if (autostart_run_mode == AUTOSTART_MODE_RUN)
370
 
                kbd_buf_feed("RUN\r");
 
370
                kbdbuf_feed("RUN\r");
371
371
            autostartmode = AUTOSTART_DONE;
372
372
        } else {
373
373
            autostartmode = AUTOSTART_LOADINGDISK;