← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/c64/c64io.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/c64/c64io.c
50
50
        && addr >= sid_stereo_address_start
51
51
        && addr < sid_stereo_address_end)
52
52
        return sid2_read(addr);
 
53
#ifdef HAVE_TFE
 
54
    if (tfe_enabled)
 
55
        return tfe_read((WORD)(addr & 0x0f));
 
56
#endif
53
57
    if (mem_cartridge_type != CARTRIDGE_NONE)
54
58
        return cartridge_read_io1(addr);
55
59
#ifdef HAVE_RS232
56
60
    if (acia_de_enabled)
57
 
        return acia1_read(addr & 0x03);
58
 
#endif
59
 
 
60
 
#ifdef HAVE_TFE
61
 
    if (tfe_enabled)
62
 
        return tfe_read((WORD)(addr & 0x0f));
63
 
#endif
64
 
 
 
61
        return acia1_read((WORD)(addr & 0x03));
 
62
#endif
65
63
    return vicii_read_phi1();
66
64
}
67
65
 
71
69
        && addr >= sid_stereo_address_start
72
70
        && addr < sid_stereo_address_end)
73
71
        sid2_store(addr, value);
 
72
#ifdef HAVE_TFE
 
73
    if (tfe_enabled)
 
74
        tfe_store((WORD)(addr & 0x0f), value);
 
75
#endif
74
76
    if (mem_cartridge_type != CARTRIDGE_NONE)
75
77
        cartridge_store_io1(addr, value);
76
78
#ifdef HAVE_RS232
77
79
    if (acia_de_enabled)
78
 
        acia1_store(addr & 0x03, value);
79
 
#endif
80
 
 
81
 
#ifdef HAVE_TFE
82
 
    if (tfe_enabled)
83
 
        tfe_store((WORD)(addr & 0x0f), value);
84
 
#endif
85
 
 
 
80
        acia1_store((WORD)(addr & 0x03), value);
 
81
#endif
86
82
    return;
87
83
}
88
84
 
92
88
        && addr >= sid_stereo_address_start
93
89
        && addr < sid_stereo_address_end)
94
90
        return sid2_read(addr);
 
91
    if (mem_cartridge_type == CARTRIDGE_RETRO_REPLAY)
 
92
        return cartridge_read_io2(addr);
 
93
    if (reu_enabled)
 
94
        return reu_read((WORD)(addr & 0x0f));
95
95
    if (mem_cartridge_type != CARTRIDGE_NONE)
96
96
        return cartridge_read_io2(addr);
97
97
    if (emu_id_enabled && addr >= 0xdfa0)
98
98
        return emuid_read((WORD)(addr - 0xdfa0));
99
 
    if (reu_enabled)
100
 
        return reu_read((WORD)(addr & 0x0f));
101
99
 
102
100
    return vicii_read_phi1();
103
101
}
108
106
        && addr >= sid_stereo_address_start
109
107
        && addr < sid_stereo_address_end)
110
108
        sid2_store(addr, value);
111
 
    if (mem_cartridge_type != CARTRIDGE_NONE) {
 
109
    if (mem_cartridge_type == CARTRIDGE_RETRO_REPLAY) {
112
110
        cartridge_store_io2(addr, value);
113
111
        return;
114
112
    }
116
114
        reu_store((WORD)(addr & 0x0f), value);
117
115
        return;
118
116
    }
 
117
    if (mem_cartridge_type != CARTRIDGE_NONE) {
 
118
        cartridge_store_io2(addr, value);
 
119
        return;
 
120
    }
119
121
    return;
120
122
}
121
123