← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/c128/c128mmu.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/c128/c128mmu.c
29
29
#include <stdio.h>
30
30
 
31
31
#include "c128mem.h"
 
32
#include "c128memrom.h"
32
33
#include "c128mmu.h"
33
34
#include "c64cart.h"
34
35
#include "cmdline.h"
254
255
        return mmu[addr & 0xf];
255
256
 
256
257
    if ((mmu[0] & 0x30) == 0x00)
257
 
        return kernal_read(addr);
 
258
        return c128memrom_kernal_read(addr);
258
259
    if ((mmu[0] & 0x30) == 0x10)
259
260
        return internal_function_rom_read(addr);
260
261