mirror of
https://github.com/mauiaaron/apple2.git
synced 2024-06-09 07:29:38 +00:00
always support //e
This commit is contained in:
Aaron Culliney
parent
f5d1735f28
commit
b03a8e6fd8
|
|
@ -1731,7 +1731,6 @@ op_TYA:
|
|||
|
||||
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
|
||||
/* ----------------------------------------------------------------------
|
||||
65c02 routines and instructions
|
||||
|
|
@ -1989,7 +1988,6 @@ op_TSB_zpage: # 04
|
|||
op_UNK_65c02:
|
||||
Continue
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
/* ----------------------------------------------------------------------
|
||||
Undocumented 6502 (Illegal instructions)
|
||||
|
|
@ -2821,7 +2819,6 @@ E(cpu65__nmosbrk)
|
|||
.long op_INC_abs_x
|
||||
.long op_UNK
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
|
||||
E(cpu65__cmos)
|
||||
.long op_BRK
|
||||
|
|
@ -3081,8 +3078,6 @@ E(cpu65__cmos)
|
|||
.long op_INC_abs_x
|
||||
.long op_UNK_65c02
|
||||
|
||||
#endif /* HAVE_IIE */
|
||||
|
||||
E(cpu65__nmos)
|
||||
.long op_BRK
|
||||
.long op_ORA_ind_x
|
||||
|
|
|
|||
|
|
@ -81,7 +81,6 @@ extern void init_lex(char *buf, int size);
|
|||
1 = bank 1
|
||||
------------------------------------------------------------------------- */
|
||||
int c_get_current_rambank(int addrs) {
|
||||
#ifdef APPLE_IIE
|
||||
if ((addrs >= 0x200) && (addrs < 0xD000))
|
||||
{
|
||||
|
||||
|
|
@ -133,10 +132,6 @@ int c_get_current_rambank(int addrs) {
|
|||
|
||||
/* executing in ALTZP space. */
|
||||
return !!(softswitches & SS_ALTZP);
|
||||
|
||||
#else
|
||||
return 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
|
|
@ -758,10 +753,8 @@ static int will_branch() {
|
|||
return (int) !(cpu65_current.f & V_Flag);
|
||||
case 0x70: /* BVS */
|
||||
return (int) (cpu65_current.f & V_Flag);
|
||||
#ifdef APPLE_IIE
|
||||
case 0x80: /* BRA */
|
||||
return 1;
|
||||
#endif
|
||||
case 0x90: /* BCC */
|
||||
return (int) !(cpu65_current.f & C_Flag);
|
||||
case 0xb0: /* BCS */
|
||||
|
|
@ -831,7 +824,6 @@ void clear_halt_opcode(unsigned char opcode) {
|
|||
op_breakpoints[opcode] = 0;
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* -------------------------------------------------------------------------
|
||||
set_halt_65c02 () = set a breakpoint on all 65c02 instructions.
|
||||
assumes that you are in //e mode...
|
||||
|
|
@ -872,7 +864,6 @@ void clear_halt_65c02() {
|
|||
clear_halt_opcode((uchar)0xD2); clear_halt_opcode((uchar)0xDA);
|
||||
clear_halt_opcode((uchar)0xF2); clear_halt_opcode((uchar)0xFA);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
at_haltpt () - tests if at haltpt
|
||||
|
|
@ -1022,7 +1013,6 @@ void show_misc_info() {
|
|||
sprintf(second_buf[i++], "HIRES (%04X): %s",
|
||||
SW_HIRES + !!(softswitches & SS_HIRES),
|
||||
(softswitches & SS_HIRES) ? "on" : "off");
|
||||
#ifdef APPLE_IIE
|
||||
sprintf(second_buf[i++], "80STORE (%04X): %s",
|
||||
SW_80STORE + !!(softswitches & SS_80STORE),
|
||||
(softswitches & SS_80STORE) ? "on" : "off");
|
||||
|
|
@ -1056,7 +1046,6 @@ void show_misc_info() {
|
|||
/* sprintf(second_buf[i++], "RDVBLBAR: %s", (SLOTCXROM & 0x80) */
|
||||
/* ? "on" : "off"); */
|
||||
|
||||
#endif
|
||||
num_buffer_lines = i;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -686,35 +686,19 @@ E(video_redraw)
|
|||
|
||||
/* 24 rows text/lores page 0 */
|
||||
movl $23, %ebx
|
||||
#ifdef APPLE_IIE
|
||||
UpdateRows(iie_soft_write_,0,$0x427)
|
||||
#else
|
||||
UpdateRows(video__write_,0,$0x427)
|
||||
#endif
|
||||
|
||||
/* 24 rows text/lores page 1 */
|
||||
movl $23, %ebx
|
||||
#ifdef APPLE_IIE
|
||||
UpdateRows(iie_soft_write_,1,$0x827)
|
||||
#else
|
||||
UpdateRows(video__write_,1,$0x827)
|
||||
#endif
|
||||
|
||||
/* 192 rows hires page 0 */
|
||||
movl $191, %ebx
|
||||
#ifdef APPLE_IIE
|
||||
UpdateHiresRows(iie_soft_write_,0,$0x2027)
|
||||
#else
|
||||
UpdateHiresRows(video__write_,0,$0x2027)
|
||||
#endif
|
||||
|
||||
/* 192 rows hires page 1 */
|
||||
movl $191, %ebx
|
||||
#ifdef APPLE_IIE
|
||||
UpdateHiresRows(iie_soft_write_,1,$0x4027)
|
||||
#else
|
||||
UpdateHiresRows(video__write_,1,$0x4027)
|
||||
#endif
|
||||
|
||||
popl SN(softswitches)
|
||||
popal
|
||||
|
|
@ -756,7 +740,6 @@ E(video__write_text1_mixed)
|
|||
jz plot_block1
|
||||
ret
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* video__write_2e_text0 - handle text page //e specific */
|
||||
E(video__write_2e_text0)
|
||||
addl SN(base_textwrt), EffectiveAddr_E
|
||||
|
|
@ -824,7 +807,6 @@ iie_soft_write_text1_mixed:
|
|||
jnz ram_nop # NOP (in auxram)
|
||||
jmp plot_character1 # 40 col text
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
E(video__write_even0)
|
||||
movb %al, SN(apple_ii_64k)(,EffectiveAddr_E,1)
|
||||
|
|
@ -858,7 +840,6 @@ E(video__write_odd0_mixed)
|
|||
jnz plot_odd_byte0
|
||||
ret
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* video__write_2e_even0 - handle hires page //e specific */
|
||||
E(video__write_2e_even0)
|
||||
addl SN(base_hgrwrt), EffectiveAddr_E
|
||||
|
|
@ -931,7 +912,6 @@ iie_soft_write_odd0_mixed:
|
|||
1: testl $SS_HGRWRT, SN(softswitches)
|
||||
jnz ram_nop # in auxram
|
||||
jmp plot_odd_byte0 # plot hires
|
||||
#endif
|
||||
|
||||
E(video__write_even1)
|
||||
movb %al, SN(apple_ii_64k)(,EffectiveAddr_E,1)
|
||||
|
|
@ -965,7 +945,6 @@ E(video__write_odd1_mixed)
|
|||
jnz plot_odd_byte1
|
||||
ret
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* video__write_2e_even1 - write hires page1 //e specific */
|
||||
E(video__write_2e_even1)
|
||||
addl SN(base_ramwrt), EffectiveAddr_E
|
||||
|
|
@ -1100,8 +1079,6 @@ plot_80character1:
|
|||
ret
|
||||
#endif /* _640x400 */
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
|
||||
/* plot character on first text page */
|
||||
.align 4
|
||||
|
|
|
|||
|
|
@ -43,12 +43,6 @@ static int altdrive;
|
|||
/*#else*/
|
||||
/*#define undoc_supported 0*/
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
#define iie_supported 1
|
||||
#else
|
||||
#define iie_supported 0
|
||||
#endif
|
||||
|
||||
static void pad_string(char *s, char c, int len) {
|
||||
char *p;
|
||||
|
||||
|
|
@ -852,11 +846,6 @@ void c_interface_parameters()
|
|||
static int cur_y = 0, cur_off = 0, cur_x = 0, cur_pos = 0;
|
||||
int current_mode = apple_mode;
|
||||
|
||||
if (!iie_supported && (current_mode == 2))
|
||||
{
|
||||
current_mode = apple_mode = 0;
|
||||
}
|
||||
|
||||
/* reset the x position, so we don't lose our cursor if path changes */
|
||||
cur_x = 0;
|
||||
video_setpage( 0 );
|
||||
|
|
@ -891,14 +880,9 @@ void c_interface_parameters()
|
|||
temp[24] = '\0';
|
||||
break;
|
||||
case 2:
|
||||
#ifdef APPLE_IIE
|
||||
sprintf(temp, "%s", (apple_mode == 0) ? "][+ " :
|
||||
(apple_mode == 1) ? "][+ undocumented" :
|
||||
"//e ");
|
||||
#else
|
||||
sprintf(temp, "%s", (apple_mode == 0) ? "][+ " :
|
||||
"][+ undocumented");
|
||||
#endif
|
||||
break;
|
||||
case 3:
|
||||
sprintf(temp, "%s", (color_mode == 0) ? "Black/White " :
|
||||
|
|
@ -1070,11 +1054,6 @@ void c_interface_parameters()
|
|||
apple_mode = 2;
|
||||
}
|
||||
|
||||
if ((apple_mode == 2) && !iie_supported)
|
||||
{
|
||||
apple_mode = 1;
|
||||
}
|
||||
|
||||
break;
|
||||
case 3: /* color mode */
|
||||
if (color_mode == 0)
|
||||
|
|
@ -1197,11 +1176,6 @@ void c_interface_parameters()
|
|||
apple_mode = 0;
|
||||
}
|
||||
|
||||
if ((apple_mode == 2) && !iie_supported)
|
||||
{
|
||||
apple_mode = 0;
|
||||
}
|
||||
|
||||
break;
|
||||
case 3: /* color mode */
|
||||
color_mode++;
|
||||
|
|
@ -1487,7 +1461,6 @@ void c_interface_keyboard_layout()
|
|||
"| (Press any key to exit) |",
|
||||
"||||||||||||||||||||||||||||||||||||||||" };
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
static char screen2[24][41] =
|
||||
{ "||||||||||||||||||||||||||||||||||||||||",
|
||||
"| Apple //e US Keyboard Layout |",
|
||||
|
|
@ -1513,13 +1486,11 @@ void c_interface_keyboard_layout()
|
|||
"||||||||||||||||||||||||||||||||||||||||",
|
||||
"| (Press any key to exit) |",
|
||||
"||||||||||||||||||||||||||||||||||||||||" };
|
||||
#endif
|
||||
|
||||
int i;
|
||||
|
||||
video_setpage( 0 );
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == 2)
|
||||
{
|
||||
c_interface_translate_screen(screen2);
|
||||
|
|
@ -1529,7 +1500,6 @@ void c_interface_keyboard_layout()
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
c_interface_translate_screen(screen1);
|
||||
for (i = 0; i < 24; i++)
|
||||
|
|
|
|||
|
|
@ -106,7 +106,6 @@ static int apple_ii_keymap_shifted[128] =
|
|||
-1, -1, -1, -1, -1, -1, -1, kF4 /* pause */, /* 112-119 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1 }; /* 120-127 */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* ----------------------------------------------------
|
||||
//e Keymap. Mapping scancodes to Apple //e US Keyboard
|
||||
---------------------------------------------------- */
|
||||
|
|
@ -199,7 +198,6 @@ static int apple_iie_keymap_shift_ctrl[128] =
|
|||
kPGUP, 8, 21, kEND, 10, kPGDN, JB2, 127, /* 104-111 */
|
||||
-1, -1, -1, -1, -1, -1, -1, kF4 /* pause */, /* 112-119 */
|
||||
-1, -1, -1, -1, -1, -1, -1, -1 }; /* 120-127 */
|
||||
#endif
|
||||
|
||||
static unsigned short max_speed = 0;
|
||||
static char key_pressed[ 256 ];
|
||||
|
|
@ -411,7 +409,6 @@ void c_read_raw_key(int scancode, int pressed) {
|
|||
int *keymap = NULL;
|
||||
|
||||
/* determine which key mapping to use */
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE || in_mygetch)
|
||||
{
|
||||
/* set/reset caps lock */
|
||||
|
|
@ -450,7 +447,6 @@ void c_read_raw_key(int scancode, int pressed) {
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
if (key_pressed[ SCODE_L_CTRL ] ||
|
||||
key_pressed[ SCODE_R_CTRL ])
|
||||
|
|
@ -472,7 +468,6 @@ void c_read_raw_key(int scancode, int pressed) {
|
|||
/* key is pressed */
|
||||
if (pressed)
|
||||
{
|
||||
|
||||
key_pressed[ scancode ] = 1;
|
||||
|
||||
switch (keymap[ scancode ])
|
||||
|
|
|
|||
|
|
@ -229,7 +229,6 @@ _read_switch_secondary:
|
|||
popal
|
||||
ret
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* PAGE2 off. if 80STORE on then we use main text page1, and if HIRES
|
||||
on we also use main hires page1, regardless of RAMRD and
|
||||
RAMWRT. */
|
||||
|
|
@ -286,7 +285,6 @@ _iie_page2_on_80store_off: # no 80STORE
|
|||
popal
|
||||
/* call SN(video_redraw)# redraw */
|
||||
ret
|
||||
#endif
|
||||
|
||||
E(read_switch_graphics)
|
||||
testl $SS_TEXT, SN(softswitches)
|
||||
|
|
@ -330,7 +328,6 @@ E(read_switch_hires)
|
|||
call SN(video_redraw)
|
||||
ret
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* HIRES off. use RAMRD/RAMWRT offsets for hires page 1. */
|
||||
E(iie_hires_off)
|
||||
testl $SS_HIRES, SN(softswitches) # already off?
|
||||
|
|
@ -371,7 +368,6 @@ iie_hires_on_80store_aux:
|
|||
iie_hires_on_80store_off:
|
||||
call SN(video_redraw) # update screen
|
||||
ret
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
@ -571,7 +567,6 @@ lc_c08b_exit:
|
|||
* misc //e functions
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
|
||||
/* 80STORE off. use RAMRD/RAMWRT for text/hires display page 1 */
|
||||
E(iie_80store_off)
|
||||
|
|
@ -974,4 +969,3 @@ E(iie_read_slot_expansion)
|
|||
E(iie_disable_slot_expansion)
|
||||
ret
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
|
|
|||
78
src/misc.c
78
src/misc.c
|
|
@ -41,9 +41,7 @@
|
|||
---------------------------------- */
|
||||
|
||||
static unsigned char apple_ii_rom[12288];
|
||||
#ifdef APPLE_IIE
|
||||
static unsigned char apple_iie_rom[32768]; /* //e */
|
||||
#endif
|
||||
|
||||
pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
|
||||
pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
|
||||
|
|
@ -60,7 +58,6 @@ GLUE_BANK_MAYBEWRITE(write_ram_bank,base_d000_wrt)
|
|||
GLUE_BANK_READ(read_ram_lc,base_e000_rd)
|
||||
GLUE_BANK_MAYBEWRITE(write_ram_lc,base_e000_wrt)
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
|
||||
GLUE_BANK_READ(iie_read_ram_default,base_ramrd)
|
||||
GLUE_BANK_WRITE(iie_write_ram_default,base_ramwrt)
|
||||
|
|
@ -98,8 +95,6 @@ void c_set_primary_char()
|
|||
video_redraw();
|
||||
}
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
c_initialize_font(): Initialize ROM character table to primary char set
|
||||
|
|
@ -128,14 +123,12 @@ void c_initialize_tables() {
|
|||
/* reset everything */
|
||||
for (i = 0; i < 0x10000; i++)
|
||||
{
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[i].r = iie_read_ram_default;
|
||||
cpu65_vmem[i].w = iie_write_ram_default;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
cpu65_vmem[i].r = read_ram_default;
|
||||
cpu65_vmem[i].w = write_ram_default;
|
||||
|
|
@ -165,7 +158,6 @@ void c_initialize_tables() {
|
|||
|
||||
/* done common initialization */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* initialize zero-page, //e specific */
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
|
|
@ -178,9 +170,6 @@ void c_initialize_tables() {
|
|||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* initialize first text & hires page, which are specially bank switched
|
||||
*
|
||||
* video_set() substitutes it's own hooks for all visible write locations
|
||||
|
|
@ -203,8 +192,6 @@ void c_initialize_tables() {
|
|||
iie_write_screen_hole_hires_page0;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* softswich rom */
|
||||
for (i = 0xC000; i < 0xC100; i++)
|
||||
{
|
||||
|
|
@ -218,11 +205,7 @@ void c_initialize_tables() {
|
|||
for (i = 0xC100; i < 0xD000; i++)
|
||||
{
|
||||
cpu65_vmem[i].r =
|
||||
#ifdef APPLE_IIE
|
||||
iie_read_ram_default;
|
||||
#else
|
||||
read_ram_default;
|
||||
#endif
|
||||
cpu65_vmem[i].w =
|
||||
ram_nop;
|
||||
}
|
||||
|
|
@ -241,7 +224,6 @@ void c_initialize_tables() {
|
|||
read_keyboard_strobe;
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
|
||||
|
|
@ -298,8 +280,6 @@ void c_initialize_tables() {
|
|||
iie_check_vbl;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* random number generator */
|
||||
for (i = 0xC020; i < 0xC030; i++)
|
||||
{
|
||||
|
|
@ -316,15 +296,12 @@ void c_initialize_tables() {
|
|||
cpu65_vmem[0xC051].w =
|
||||
read_switch_text;
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[0xC01A].r =
|
||||
iie_check_text;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* MIXED switch */
|
||||
cpu65_vmem[0xC052].r =
|
||||
cpu65_vmem[0xC052].w =
|
||||
|
|
@ -333,7 +310,6 @@ void c_initialize_tables() {
|
|||
cpu65_vmem[0xC053].w =
|
||||
read_switch_mixed;
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[0xC01B].r =
|
||||
|
|
@ -348,14 +324,12 @@ void c_initialize_tables() {
|
|||
iie_page2_off;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
cpu65_vmem[0xC054].r =
|
||||
cpu65_vmem[0xC054].w =
|
||||
read_switch_primary_page;
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[0xC01C].r =
|
||||
|
|
@ -370,7 +344,6 @@ void c_initialize_tables() {
|
|||
iie_page2_on;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
cpu65_vmem[0xC055].r =
|
||||
cpu65_vmem[0xC055].w =
|
||||
|
|
@ -378,7 +351,6 @@ void c_initialize_tables() {
|
|||
}
|
||||
|
||||
/* HIRES switch */
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[0xC01D].r =
|
||||
|
|
@ -391,7 +363,6 @@ void c_initialize_tables() {
|
|||
iie_hires_on;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
cpu65_vmem[0xC056].r =
|
||||
cpu65_vmem[0xC056].w =
|
||||
|
|
@ -417,7 +388,6 @@ void c_initialize_tables() {
|
|||
cpu65_vmem[0xC065].r =
|
||||
cpu65_vmem[0xC06D].r =
|
||||
read_gc1;
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[0xC066].r =
|
||||
|
|
@ -426,7 +396,6 @@ void c_initialize_tables() {
|
|||
iie_read_gc3;
|
||||
}
|
||||
|
||||
#endif
|
||||
for (i = 0xC070; i < 0xC080; i++)
|
||||
{
|
||||
cpu65_vmem[i].r =
|
||||
|
|
@ -434,7 +403,6 @@ void c_initialize_tables() {
|
|||
read_gc_strobe;
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
/* IOUDIS switch & read_gc_strobe */
|
||||
|
|
@ -456,9 +424,6 @@ void c_initialize_tables() {
|
|||
iie_dhires_off;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* language card softswitches */
|
||||
cpu65_vmem[0xC080].r = cpu65_vmem[0xC080].w =
|
||||
cpu65_vmem[0xC084].r = cpu65_vmem[0xC084].w =
|
||||
|
|
@ -485,36 +450,7 @@ void c_initialize_tables() {
|
|||
cpu65_vmem[0xC08B].r = cpu65_vmem[0xC08B].w =
|
||||
cpu65_vmem[0xC08F].r = cpu65_vmem[0xC08F].w =
|
||||
(apple_mode == IIE_MODE) ? iie_c08b : lc_c08b;
|
||||
#else /* !APPLE_IIE */
|
||||
/* language card softswitches */
|
||||
cpu65_vmem[0xC080].r = cpu65_vmem[0xC080].w =
|
||||
cpu65_vmem[0xC084].r = cpu65_vmem[0xC084].w =
|
||||
lc_c080;
|
||||
cpu65_vmem[0xC081].r = cpu65_vmem[0xC081].w =
|
||||
cpu65_vmem[0xC085].r = cpu65_vmem[0xC085].w =
|
||||
lc_c081;
|
||||
cpu65_vmem[0xC082].r = cpu65_vmem[0xC082].w =
|
||||
cpu65_vmem[0xC086].r = cpu65_vmem[0xC086].w =
|
||||
lc_c082;
|
||||
cpu65_vmem[0xC083].r = cpu65_vmem[0xC083].w =
|
||||
cpu65_vmem[0xC087].r = cpu65_vmem[0xC087].w =
|
||||
lc_c083;
|
||||
|
||||
cpu65_vmem[0xC088].r = cpu65_vmem[0xC088].w =
|
||||
cpu65_vmem[0xC08C].r = cpu65_vmem[0xC08C].w =
|
||||
lc_c088;
|
||||
cpu65_vmem[0xC089].r = cpu65_vmem[0xC089].w =
|
||||
cpu65_vmem[0xC08D].r = cpu65_vmem[0xC08D].w =
|
||||
lc_c089;
|
||||
cpu65_vmem[0xC08A].r = cpu65_vmem[0xC08A].w =
|
||||
cpu65_vmem[0xC08E].r = cpu65_vmem[0xC08E].w =
|
||||
lc_c08a;
|
||||
cpu65_vmem[0xC08B].r = cpu65_vmem[0xC08B].w =
|
||||
cpu65_vmem[0xC08F].r = cpu65_vmem[0xC08F].w =
|
||||
lc_c08b;
|
||||
#endif /* !APPLE_IIE */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* slot i/o area */
|
||||
for (i = 0xC100; i < 0xC300; i++)
|
||||
{
|
||||
|
|
@ -543,7 +479,6 @@ void c_initialize_tables() {
|
|||
cpu65_vmem[0xCFFF].r =
|
||||
cpu65_vmem[0xCFFF].w =
|
||||
iie_disable_slot_expansion;
|
||||
#endif
|
||||
|
||||
video_set(0);
|
||||
|
||||
|
|
@ -559,9 +494,7 @@ void c_initialize_apple_ii_memory()
|
|||
FILE *f;
|
||||
int i;
|
||||
static int ii_rom_loaded = 0;
|
||||
#ifdef APPLE_IIE
|
||||
static int iie_rom_loaded = 0;
|
||||
#endif
|
||||
|
||||
for (i = 0; i < 0x10000; i++)
|
||||
{
|
||||
|
|
@ -598,7 +531,6 @@ void c_initialize_apple_ii_memory()
|
|||
ii_rom_loaded = 1;
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (!iie_rom_loaded)
|
||||
{
|
||||
snprintf(temp, TEMPSIZE, "%s/apple_IIe.rom", system_path);
|
||||
|
|
@ -617,8 +549,6 @@ void c_initialize_apple_ii_memory()
|
|||
iie_rom_loaded = 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
for (i = 0xD000; i < 0x10000; i++)
|
||||
{
|
||||
apple_ii_64k[0][i] = apple_ii_rom[i - 0xD000];
|
||||
|
|
@ -634,7 +564,6 @@ void c_initialize_apple_ii_memory()
|
|||
language_card[0][i] = apple_ii_rom[i + 0x1000];
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
/* load the rom from 0xC000, slot rom main, internal rom aux */
|
||||
|
|
@ -657,7 +586,6 @@ void c_initialize_apple_ii_memory()
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
/* softswitch memory HACK - why this? */
|
||||
{
|
||||
for (i = 0xC100; i < 0xD000; i++)
|
||||
|
|
@ -686,7 +614,6 @@ void c_initialize_sound()
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* -------------------------------------------------------------------------
|
||||
c_initialize_iie_switches
|
||||
------------------------------------------------------------------------- */
|
||||
|
|
@ -709,7 +636,6 @@ void c_initialize_iie_switches() {
|
|||
c8rom_offset = 0x10000; /* c8rom internal */
|
||||
base_cxrom = apple_ii_64k[0]; /* cxrom peripheral */
|
||||
}
|
||||
#endif
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
void c_initialize_vm()
|
||||
|
|
@ -721,9 +647,7 @@ void c_initialize_vm() {
|
|||
c_initialize_sound(); /* sound system */
|
||||
c_init_6(); /* drive ][, slot 6 */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
c_initialize_iie_switches(); /* set the //e softswitches */
|
||||
#endif
|
||||
|
||||
#ifdef MOUSE_EMULATION
|
||||
c_initialize_mouse();
|
||||
|
|
@ -758,13 +682,11 @@ static void reinitialize(void)
|
|||
|
||||
video_redraw();
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_set(CPU65_C02);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
if (apple_mode == IIU_MODE)
|
||||
{
|
||||
cpu65_set(CPU65_NMOS);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#define SW_MIXED 0xC052
|
||||
#define SW_PAGE2 0xC054
|
||||
#define SW_HIRES 0xC056
|
||||
#ifdef APPLE_IIE
|
||||
#define SW_80STORE 0xC000
|
||||
#define SW_RAMRD 0xC002
|
||||
#define SW_RAMWRT 0xC004
|
||||
|
|
@ -37,7 +36,6 @@
|
|||
#define SW_SLOTCXROM 0xC006
|
||||
#define SW_DHIRES 0xC05E
|
||||
#define SW_IOUDIS 0xC07E
|
||||
#endif
|
||||
|
||||
/* Text characters */
|
||||
extern const unsigned char ucase_glyphs[0x200];
|
||||
|
|
@ -62,7 +60,6 @@ int argc;
|
|||
#define TEMPSIZE 4096
|
||||
char temp[ TEMPSIZE ]; /* should be >=4096 (stuff depends on this) */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
/* memory offsets from softswitches */
|
||||
int c8rom_offset;
|
||||
|
||||
|
|
@ -82,8 +79,6 @@ extern unsigned char *base_e000_wrt;
|
|||
extern unsigned char *base_c3rom;
|
||||
extern unsigned char *base_cxrom;
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
/* softswitches */
|
||||
|
||||
extern int softswitches;
|
||||
|
|
@ -180,7 +175,6 @@ read_ram_bank(),
|
|||
write_ram_lc(),
|
||||
read_ram_lc();
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
void iie_write_ram_default(),
|
||||
iie_read_ram_default(),
|
||||
|
||||
|
|
@ -253,7 +247,6 @@ iie_check_page2(),
|
|||
iie_check_ioudis(),
|
||||
iie_check_dhires(),
|
||||
iie_check_vbl();
|
||||
#endif /* APPLE_IIE */
|
||||
#endif /* !__ASSEMBLER__ */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -295,8 +295,6 @@ const struct opcode_struct opcodes_6502[256] =
|
|||
{ "???", addr_implied },
|
||||
};
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
|
||||
const struct opcode_struct opcodes_65c02[256] =
|
||||
{
|
||||
{ "BRK", addr_implied },
|
||||
|
|
@ -557,8 +555,6 @@ const struct opcode_struct opcodes_65c02[256] =
|
|||
{ "???", addr_implied },
|
||||
};
|
||||
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
const struct opcode_struct opcodes_undoc[256] =
|
||||
{
|
||||
{ "BRK", addr_implied },
|
||||
|
|
|
|||
|
|
@ -101,12 +101,8 @@ static const struct match_table modes_table[] =
|
|||
{
|
||||
{ "][+", II_MODE },
|
||||
{ "][+ undocumented", IIU_MODE },
|
||||
#ifdef APPLE_IIE
|
||||
{ "//e", IIE_MODE },
|
||||
{ 0, IIE_MODE }
|
||||
#else /* !APPLE_IIE */
|
||||
{ 0, IIU_MODE }
|
||||
#endif /* !APPLE_IIE */
|
||||
};
|
||||
|
||||
static const struct match_table color_table[] =
|
||||
|
|
|
|||
|
|
@ -212,7 +212,6 @@ video__write_odd1(),
|
|||
video__write_even1_mixed(),
|
||||
video__write_odd1_mixed();
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
void video__write_2e_text0(),
|
||||
video__write_2e_text0_mixed(),
|
||||
video__write_2e_text1(),
|
||||
|
|
@ -225,7 +224,6 @@ video__write_2e_odd1(),
|
|||
video__write_2e_even1(),
|
||||
video__write_2e_odd1_mixed(),
|
||||
video__write_2e_even1_mixed();
|
||||
#endif /* APPLE_IIE */
|
||||
|
||||
#endif /* !__ASSEMBLER__ */
|
||||
|
||||
|
|
|
|||
12
src/vidsup.c
12
src/vidsup.c
|
|
@ -126,7 +126,6 @@ unsigned char video__dhires2[256] = {
|
|||
0x7,0x7,0x7,0x7,0x7,0x7,0x7,0x7,0xf,0xf,0xb,0xb,0xf,0xf,0xf,0xf,
|
||||
};
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
c_initialize_dhires_values()
|
||||
|
|
@ -158,7 +157,6 @@ static void c_initialize_dhires_values(void) {
|
|||
video__dhires2[i+0x80] = video__dhires2[i];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* -------------------------------------------------------------------------
|
||||
c_initialize_hires_values()
|
||||
|
|
@ -563,7 +561,6 @@ static void c_initialize_tables_video(void) {
|
|||
{
|
||||
for (x = 0; x < 40; x++) /* 40 cols */
|
||||
{
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
/* //e mode: text/lores page 0 */
|
||||
|
|
@ -572,7 +569,6 @@ static void c_initialize_tables_video(void) {
|
|||
video__write_2e_text0_mixed;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
/* ][+ modes: text/lores page 0 */
|
||||
cpu65_vmem[ video__line_offset[ y ] + x + 0x400].w =
|
||||
|
|
@ -580,7 +576,6 @@ static void c_initialize_tables_video(void) {
|
|||
video__write_text0_mixed;
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[ video__line_offset[ y ] + x + 0x800].w =
|
||||
|
|
@ -588,7 +583,6 @@ static void c_initialize_tables_video(void) {
|
|||
video__write_2e_text1_mixed;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
/* ][+ modes: text/lores page 1 in main memory */
|
||||
cpu65_vmem[ video__line_offset[ y ] + x + 0x800].w =
|
||||
|
|
@ -599,7 +593,6 @@ static void c_initialize_tables_video(void) {
|
|||
for (i = 0; i < 8; i++)
|
||||
{
|
||||
/* //e mode: hires/double hires page 0 */
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[ 0x2000 + video__line_offset[ y ]
|
||||
|
|
@ -611,7 +604,6 @@ static void c_initialize_tables_video(void) {
|
|||
}
|
||||
/* ][+ modes: hires page 0 */
|
||||
else
|
||||
#endif
|
||||
{
|
||||
cpu65_vmem[ 0x2000 + video__line_offset[ y ]
|
||||
+ 0x400 * i + x ].w =
|
||||
|
|
@ -621,7 +613,6 @@ static void c_initialize_tables_video(void) {
|
|||
video__write_even0_mixed);
|
||||
}
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
if (apple_mode == IIE_MODE)
|
||||
{
|
||||
cpu65_vmem[ 0x4000 + video__line_offset[ y ]
|
||||
|
|
@ -633,7 +624,6 @@ static void c_initialize_tables_video(void) {
|
|||
}
|
||||
/* ][+ modes: hires page 1 */
|
||||
else
|
||||
#endif
|
||||
{
|
||||
cpu65_vmem[ 0x4000 + video__line_offset[ y ]
|
||||
+ 0x400 * i + x ].w =
|
||||
|
|
@ -668,9 +658,7 @@ void video_set(int flags)
|
|||
c_initialize_row_col_tables(); /* precalculate hires offsets */
|
||||
c_initialize_tables_video(); /* memory jump tables for video */
|
||||
|
||||
#ifdef APPLE_IIE
|
||||
c_initialize_dhires_values(); /* set up dhires colors */
|
||||
#endif
|
||||
}
|
||||
|
||||
void video_loadfont_int(int first, int quantity, const unsigned char *data)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user