diff --git a/src/arch/os2/os2driver.c b/src/arch/os2/os2driver.c index 3a7d4e4..ed50198 100644 --- a/src/arch/os2/os2driver.c +++ b/src/arch/os2/os2driver.c @@ -423,6 +423,23 @@ x_full_screen(int do_full) return; } + +// OG Adding release +void x_release_kimage(Kimage* kimage_ptr) +{ + if (kimage_ptr->dev_handle == (void*)-1) + { + free(kimage_ptr->data_ptr); + kimage_ptr->data_ptr = NULL; + } +} + +// OG Addding ratio +int x_calc_ratio(float x,float y) +{ + return 1; +} + void os2_abort(HWND g_hwnd_frame, HWND g_hwnd_client) { diff --git a/src/moremem.c b/src/moremem.c index 0ede05d..8c30b50 100644 --- a/src/moremem.c +++ b/src/moremem.c @@ -155,7 +155,7 @@ int transwarp_low_val = 0; __declspec(align(256)) #endif unsigned char transwarpcode[][32] -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(__OS2__) __attribute__ ((aligned(256))) #endif ={ diff --git a/src/sim65816.c b/src/sim65816.c index 669bd58..f17939c 100644 --- a/src/sim65816.c +++ b/src/sim65816.c @@ -731,6 +731,11 @@ void do_reset() { + // OG Cleared remaining IRQS on RESET + extern int g_irq_pending; + extern int g_scan_int_events ; + extern int g_c023_val; + g_c068_statereg = 0x08 + 0x04 + 0x01; /* rdrom, lcbank2, intcx */ g_c035_shadow_reg = 0; @@ -763,13 +768,8 @@ do_reset() g_stepping = 0; - // OG Cleared remaining IRQS on RESET - extern int g_irq_pending; - extern int g_scan_int_events ; - extern int g_c023_val; - - if (g_irq_pending) - halt_printf("*** irq remainings...\n"); + if (g_irq_pending) + halt_printf("*** irq remainings...\n"); } @@ -900,6 +900,10 @@ int gsportmain(int argc, char **argv) { int diff; + int skip_amt; + int tmp1; + int i; + char *final_arg = 0; // OG Restoring globals sim65816_initglobals(); @@ -908,11 +912,6 @@ gsportmain(int argc, char **argv) //OG Disabling argument parsing #ifndef ACTIVEGS - int skip_amt; - int tmp1; - int i; - char *final_arg = 0; - /* parse args */ for(i = 1; i < argc; i++) { if(!strcmp("-badrd", argv[i])) { diff --git a/src/video.c b/src/video.c index 500417d..dc818d2 100644 --- a/src/video.c +++ b/src/video.c @@ -3391,6 +3391,7 @@ video_push_kimages() int left_pix, right_pix; int left, right; int line_div8; + float ratiox = 0,ratioy = 0; if(g_border_sides_refresh_needed) { g_border_sides_refresh_needed = 0; @@ -3407,8 +3408,6 @@ video_push_kimages() GET_ITIMER(start_time); - float ratiox,ratioy; - if (x_calc_ratio(ratiox,ratioy)) { line = 0;