From 471a94f89091606949ad6f91a28147e11bf65e0e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 9 Dec 2014 21:37:58 +0100 Subject: Move IN_MEMORY_C ifdefs to memory.c --- main.h | 70 ------------------------------------------------------------------ 1 file changed, 70 deletions(-) (limited to 'main.h') diff --git a/main.h b/main.h index 41317a9..09b651d 100644 --- a/main.h +++ b/main.h @@ -118,76 +118,6 @@ extern u32 virtual_frame_count; extern u32 max_frameskip; extern u32 num_skipped_frames; -#ifdef IN_MEMORY_C - -extern timer_type timer[4]; -static u32 prescale_table[] = { 0, 6, 8, 10 }; - -#define count_timer(timer_number) \ - timer[timer_number].reload = 0x10000 - value; \ - if(timer_number < 2) \ - { \ - u32 timer_reload = \ - timer[timer_number].reload << timer[timer_number].prescale; \ - sound_update_frequency_step(timer_number); \ - } \ - -#define adjust_sound_buffer(timer_number, channel) \ - if(timer[timer_number].direct_sound_channels & (0x01 << channel)) \ - { \ - direct_sound_channel[channel].buffer_index = \ - (gbc_sound_buffer_index + buffer_adjust) % BUFFER_SIZE; \ - } \ - -#define trigger_timer(timer_number) \ - if(value & 0x80) \ - { \ - if(timer[timer_number].status == TIMER_INACTIVE) \ - { \ - u32 prescale = prescale_table[value & 0x03]; \ - u32 timer_reload = timer[timer_number].reload; \ - \ - if((value >> 2) & 0x01) \ - timer[timer_number].status = TIMER_CASCADE; \ - else \ - timer[timer_number].status = TIMER_PRESCALE; \ - \ - timer[timer_number].prescale = prescale; \ - timer[timer_number].irq = (value >> 6) & 0x01; \ - \ - address16(io_registers, 0x100 + (timer_number * 4)) = \ - -timer_reload; \ - \ - timer_reload <<= prescale; \ - timer[timer_number].count = timer_reload; \ - \ - if(timer_reload < execute_cycles) \ - execute_cycles = timer_reload; \ - \ - if(timer_number < 2) \ - { \ - u32 buffer_adjust = \ - (u32)(((float)(cpu_ticks - gbc_sound_last_cpu_ticks) * \ - sound_frequency) / GBC_BASE_RATE) * 2; \ - \ - sound_update_frequency_step(timer_number); \ - adjust_sound_buffer(timer_number, 0); \ - adjust_sound_buffer(timer_number, 1); \ - } \ - } \ - } \ - else \ - { \ - if(timer[timer_number].status != TIMER_INACTIVE) \ - { \ - timer[timer_number].status = TIMER_INACTIVE; \ - timer[timer_number].stop_cpu_ticks = cpu_ticks; \ - } \ - } \ - address16(io_registers, 0x102 + (timer_number * 4)) = value; \ - -#endif // IN_MEMORY_C - void change_ext(const char *src, char *buffer, const char *extension); void make_rpath(char *buff, size_t size, const char *ext); -- cgit v1.2.3