renamed saturn.intenable to saturn.interruptable
This commit is contained in:
parent
919114eb6c
commit
1057a1471a
4 changed files with 13 additions and 13 deletions
|
@ -140,11 +140,11 @@ void do_return_interupt( void )
|
|||
{
|
||||
if ( saturn.int_pending ) {
|
||||
saturn.int_pending = 0;
|
||||
saturn.intenable = 0;
|
||||
saturn.interruptable = 0;
|
||||
saturn.PC = 0xf;
|
||||
} else {
|
||||
saturn.PC = pop_return_addr();
|
||||
saturn.intenable = 1;
|
||||
saturn.interruptable = 1;
|
||||
|
||||
if ( adj_time_pending ) {
|
||||
schedule_event = 0;
|
||||
|
@ -156,20 +156,20 @@ void do_return_interupt( void )
|
|||
void do_interupt( void )
|
||||
{
|
||||
interrupt_called = 1;
|
||||
if ( saturn.intenable ) {
|
||||
if ( saturn.interruptable ) {
|
||||
push_return_addr( saturn.PC );
|
||||
saturn.PC = 0xf;
|
||||
saturn.intenable = 0;
|
||||
saturn.interruptable = 0;
|
||||
}
|
||||
}
|
||||
|
||||
void do_kbd_int( void )
|
||||
{
|
||||
interrupt_called = 1;
|
||||
if ( saturn.intenable ) {
|
||||
if ( saturn.interruptable ) {
|
||||
push_return_addr( saturn.PC );
|
||||
saturn.PC = 0xf;
|
||||
saturn.intenable = 0;
|
||||
saturn.interruptable = 0;
|
||||
} else
|
||||
saturn.int_pending = 1;
|
||||
}
|
||||
|
@ -304,7 +304,7 @@ void do_shutdown( void )
|
|||
start_timer( IDLE_TIMER );
|
||||
|
||||
if ( is_zero_register( saturn.OUT, OUT_FIELD ) ) {
|
||||
saturn.intenable = 1;
|
||||
saturn.interruptable = 1;
|
||||
saturn.int_pending = 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -2165,7 +2165,7 @@ inline void schedule( void )
|
|||
old_sched_instr = instructions;
|
||||
|
||||
if ( ( sched_timer2 -= steps ) <= 0 ) {
|
||||
if ( !saturn.intenable )
|
||||
if ( !saturn.interruptable )
|
||||
sched_timer2 = SCHED_TIMER2;
|
||||
else
|
||||
sched_timer2 = saturn.t2_tick;
|
||||
|
@ -2297,7 +2297,7 @@ inline void schedule( void )
|
|||
schedule_event = sched_adjtime;
|
||||
|
||||
if ( ( sched_timer1 -= steps ) <= 0 ) {
|
||||
if ( !saturn.intenable )
|
||||
if ( !saturn.interruptable )
|
||||
sched_timer1 = SCHED_TIMER1;
|
||||
else
|
||||
sched_timer1 = saturn.t1_tick;
|
||||
|
|
|
@ -155,7 +155,7 @@ void init_saturn( void )
|
|||
saturn.version[ 2 ] = PATCHLEVEL;
|
||||
saturn.hexmode = HEX;
|
||||
saturn.rstkp = -1;
|
||||
saturn.intenable = 1;
|
||||
saturn.interruptable = 1;
|
||||
saturn.int_pending = 0;
|
||||
saturn.kbd_ien = 1;
|
||||
saturn.timer1 = 0;
|
||||
|
@ -370,7 +370,7 @@ int read_state_file( FILE* fp )
|
|||
for ( i = 0; i < 9; i++ )
|
||||
if ( !read_16( fp, ( word_16* )&saturn.keybuf.rows[ i ] ) )
|
||||
return 0;
|
||||
if ( !read_8( fp, &saturn.intenable ) )
|
||||
if ( !read_8( fp, &saturn.interruptable ) )
|
||||
return 0;
|
||||
if ( !read_8( fp, &saturn.int_pending ) )
|
||||
return 0;
|
||||
|
@ -901,7 +901,7 @@ int write_state_file( char* filename )
|
|||
write_16( fp, ( word_16* )&saturn.rstkp );
|
||||
for ( i = 0; i < 9; i++ )
|
||||
write_16( fp, ( word_16* )&saturn.keybuf.rows[ i ] );
|
||||
write_8( fp, &saturn.intenable );
|
||||
write_8( fp, &saturn.interruptable );
|
||||
write_8( fp, &saturn.int_pending );
|
||||
write_8( fp, &saturn.kbd_ien );
|
||||
write_8( fp, &saturn.disp_io );
|
||||
|
|
|
@ -215,7 +215,7 @@ typedef struct saturn_t {
|
|||
|
||||
keystate_t keybuf;
|
||||
|
||||
unsigned char intenable;
|
||||
unsigned char interruptable;
|
||||
unsigned char int_pending;
|
||||
unsigned char kbd_ien;
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue