← Back to branch summary

~ubuntu-branches/ubuntu/raring/vice/raring

« back to all changes in this revision

Viewing changes to src/cbm2/cbm2mem.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2009-03-31 00:37:15 UTC
  • mfrom: (1.1.7 upstream) (9.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090331003715-i5yisvcfv7mgz3eh
Tags: 2.1.dfsg-1
http://bugs.debian.org/495937
http://bugs.debian.org/501181
* New major upstream release (closes: #495937).
* Add desktop files (closes: #501181).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cbm2/cbm2mem.c
42
42
#include "emuid.h"
43
43
#include "kbdbuf.h"
44
44
#include "machine.h"
 
45
 
 
46
#ifdef WATCOM_COMPILE
 
47
#include "../mem.h"
 
48
#else
45
49
#include "mem.h"
 
50
#endif
 
51
 
46
52
#include "monitor.h"
47
53
#include "ram.h"
48
54
#include "resources.h"
1140
1146
    return mem_ioreg_list;
1141
1147
}
1142
1148
 
1143
 
void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns)
 
1149
void mem_get_screen_parameter(WORD *base, BYTE *rows, BYTE *columns, int *bank)
1144
1150
{
1145
 
    /* FIXME */
1146
 
    *base = 0;
 
1151
    *base = 0xd000;
1147
1152
    *rows = 25;
1148
 
    *columns = 80;
 
1153
    *columns = (cbm2_isC500) ? 40 : 80;
 
1154
    *bank = 16;
1149
1155
}
1150
1156
 
1151
1157
void mem_color_ram_to_snapshot(BYTE *color_ram)