← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vice/trusty

« back to all changes in this revision

Viewing changes to src/cbm2/cbm2rom.c

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2013-07-28 20:38:23 UTC
  • mfrom: (1.2.5)
  • mto: This revision was merged to the branch mainline in revision 27.
  • Revision ID: package-import@ubuntu.com-20130728203823-w495rps5wuykespp
Tags: upstream-2.4.dfsg
Import upstream version 2.4.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cbm2/cbm2rom.c
1
1
/*
2
 
 * cbm2rom.c 
 
2
 * cbm2rom.c - CBM-6x0/7x0 rom code.
3
3
 *
4
4
 * Written by
5
5
 *  Andreas Boose <viceteam@t-online.de>
37
37
#include "crtc.h"
38
38
#include "kbdbuf.h"
39
39
#include "log.h"
 
40
#include "machine.h"
40
41
#include "resources.h"
41
42
#include "sysfile.h"
42
43
#include "tape.h"
89
90
            return -1;
90
91
        }
91
92
 
92
 
        if (!cbm2_isC500) {
93
 
            memmove(mem_chargen_rom + 4096, mem_chargen_rom + 2048, 2048);
 
93
        memmove(mem_chargen_rom + 4096, mem_chargen_rom + 2048, 2048);
94
94
 
95
 
            /* Inverted chargen into second half. This is a hardware feature.*/
96
 
            for (i = 0; i < 2048; i++) {
97
 
                mem_chargen_rom[i + 2048] = mem_chargen_rom[i] ^ 0xff;
98
 
                mem_chargen_rom[i + 6144] = mem_chargen_rom[i + 4096] ^ 0xff;
99
 
            }
 
95
        /* Inverted chargen into second half. This is a hardware feature.*/
 
96
        for (i = 0; i < 2048; i++) {
 
97
            mem_chargen_rom[i + 2048] = mem_chargen_rom[i] ^ 0xff;
 
98
            mem_chargen_rom[i + 6144] = mem_chargen_rom[i + 4096] ^ 0xff;
100
99
        }
101
100
    }
102
101
 
103
 
    if (cbm2_isC500) {
104
 
        /* VIC-II config */
105
 
    } else {
106
 
        crtc_set_chargen_addr(mem_chargen_rom, CBM2_CHARGEN_ROM_SIZE >> 4);
107
 
    }
 
102
    crtc_set_chargen_addr(mem_chargen_rom, CBM2_CHARGEN_ROM_SIZE >> 4);
108
103
 
109
104
    return 0;
110
105
}
280
275
    if (cbm2rom_load_cart_6(rom_name) < 0)
281
276
        return -1;
282
277
 
283
 
    if (cbm2_isC500) {
284
 
        /* VIC-II config */
285
 
    } else {
286
 
        crtc_set_screen_addr(mem_rom + 0xd000);
287
 
    }
 
278
    crtc_set_screen_addr(mem_rom + 0xd000);
288
279
 
289
280
    return 0;
290
281
}
291