← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/pet/petrom.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/pet/petrom.c
358
358
    if (petres.kernal_checksum == PET_KERNAL4_CHECKSUM) {
359
359
        if (petres.kernal_checksum != last_kernal)
360
360
            log_message(petrom_log, "Identified Kernal 4 ROM by checksum.");
361
 
        kbd_buf_init(0x26f, 0x9e, 10,
362
 
                     (CLOCK)(PET_PAL_CYCLES_PER_RFSH * PET_PAL_RFSH_PER_SEC));
 
361
        kbdbuf_init(0x26f, 0x9e, 10,
 
362
                    (CLOCK)(PET_PAL_CYCLES_PER_RFSH * PET_PAL_RFSH_PER_SEC));
363
363
        tape_init(&tapeinit4);
364
364
        if (petres.editor_checksum == PET_EDIT4B80_CHECKSUM) {
365
365
            if (petres.editor_checksum != last_editor)
384
384
        if (petres.kernal_checksum != last_kernal)
385
385
            log_message(petrom_log, "Identified Kernal 2 ROM by checksum.");
386
386
        petres.rom_video = 40;
387
 
        kbd_buf_init(0x26f, 0x9e, 10,
388
 
                     (CLOCK)(PET_PAL_CYCLES_PER_RFSH * PET_PAL_RFSH_PER_SEC));
 
387
        kbdbuf_init(0x26f, 0x9e, 10,
 
388
                    (CLOCK)(PET_PAL_CYCLES_PER_RFSH * PET_PAL_RFSH_PER_SEC));
389
389
        autostart_init((CLOCK)(3 * PET_PAL_RFSH_PER_SEC
390
390
                       * PET_PAL_CYCLES_PER_RFSH), 0,
391
391
                       0xa7, 0xc4, 0xc6, -40);
394
394
        if (petres.kernal_checksum != last_kernal)
395
395
            log_message(petrom_log, "Identified Kernal 1 ROM by checksum.");
396
396
        petres.rom_video = 40;
397
 
        kbd_buf_init(0x20f, 0x20d, 10,
398
 
                     (CLOCK)(PET_PAL_CYCLES_PER_RFSH * PET_PAL_RFSH_PER_SEC));
 
397
        kbdbuf_init(0x20f, 0x20d, 10,
 
398
                    (CLOCK)(PET_PAL_CYCLES_PER_RFSH * PET_PAL_RFSH_PER_SEC));
399
399
        autostart_init((CLOCK)(3 * PET_PAL_RFSH_PER_SEC
400
400
                       * PET_PAL_CYCLES_PER_RFSH), 0,
401
401
                       0x224, 0xe0, 0xe2, -40);
539
539
    /* De-initialize kbd-buf, autostart and tape stuff here before
540
540
       reloading the ROM the traps are installed in.  */
541
541
    /* log_warning(pet_mem_log, "Deinstalling Traps"); */
542
 
    kbd_buf_init(0, 0, 0, 0);
 
542
    kbdbuf_init(0, 0, 0, 0);
543
543
    autostart_init(0, 0, 0, 0, 0, 0);
544
544
    tape_deinstall();
545
545
 
572
572
    /* De-initialize kbd-buf, autostart and tape stuff here before
573
573
       reloading the ROM the traps are installed in.  */
574
574
    /* log_warning(pet_mem_log, "Deinstalling Traps"); */
575
 
    kbd_buf_init(0, 0, 0, 0);
 
575
    kbdbuf_init(0, 0, 0, 0);
576
576
    autostart_init(0, 0, 0, 0, 0, 0);
577
577
    tape_deinstall();
578
578