X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=linux%2Fgp2x.c;h=bcd7c7c3ea017af9a26f6cdc97b81ad83252fd1c;hb=45deb4099e6d20780376e6425d43107120a10bc6;hp=cb1d8d2274021889caa80e8ab7b46dc99ef3657e;hpb=73a853695e1a82252b5c773f07cceae005e249ff;p=libpicofe.git diff --git a/linux/gp2x.c b/linux/gp2x.c index cb1d8d2..bcd7c7c 100644 --- a/linux/gp2x.c +++ b/linux/gp2x.c @@ -1,4 +1,4 @@ -/* faking/emulating gp2x.c by using gtk */ +/* faking/emulating gp2x by using gtk */ #include #include #include @@ -12,23 +12,25 @@ #include #include -#include "../gp2x/emu.h" -#include "../gp2x/gp2x.h" #include "../gp2x/version.h" +#include "../common/emu.h" +#include "../common/menu.h" +#include "../common/readpng.h" #include "sndout_oss.h" -#include "usbjoy.h" #include "log_io.h" -void *gp2x_screen; unsigned long current_keys = 0; static int current_bpp = 8; static int current_pal[256]; static const char *verstring = "PicoDrive " VERSION; +static int scr_changed = 0, scr_w = SCREEN_WIDTH, scr_h = SCREEN_HEIGHT; // dummies -char *ext_menu = 0, *ext_state = 0; int mix_32_to_16l_level; +int crashed_940 = 0; +int default_cpu_clock = 123; +void *gp2x_memregs = NULL; /* gtk */ struct gtk_global_struct @@ -48,6 +50,12 @@ static void destroy (GtkWidget *widget, gpointer data) gtk_main_quit (); } +/* faking GP2X pad */ +enum { GP2X_UP=0x1, GP2X_LEFT=0x4, GP2X_DOWN=0x10, GP2X_RIGHT=0x40, + GP2X_START=1<<8, GP2X_SELECT=1<<9, GP2X_L=1<<10, GP2X_R=1<<11, + GP2X_A=1<<12, GP2X_B=1<<13, GP2X_X=1<<14, GP2X_Y=1<<15, + GP2X_VOL_UP=1<<23, GP2X_VOL_DOWN=1<<22, GP2X_PUSH=1<<27 }; + static gint key_press_event (GtkWidget *widget, GdkEventKey *event) { switch (event->hardware_keycode) @@ -111,17 +119,14 @@ static gint key_release_event (GtkWidget *widget, GdkEventKey *event) return 0; } -/* -void gdk_drawable_get_size (GdkDrawable *drawable, - gint *width, - gint *height); -**/ - static void size_allocate_event(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data) { - gint w, h; - gdk_drawable_get_size(gtk_items.window, &w, &h); - printf("%dx%d %dx%d\n", allocation->width, allocation->height, w, h); + // printf("%dx%d\n", allocation->width, allocation->height); + if (scr_w != allocation->width - 2 || scr_h != allocation->height - 2) { + scr_w = allocation->width - 2; + scr_h = allocation->height - 2; + scr_changed = 1; + } } static void *gtk_threadf(void *targ) @@ -153,7 +158,7 @@ static void *gtk_threadf(void *targ) g_signal_connect (G_OBJECT (gtk_items.window), "size_allocate", G_CALLBACK (size_allocate_event), NULL); - gtk_container_set_border_width (GTK_CONTAINER (gtk_items.window), 2); + gtk_container_set_border_width (GTK_CONTAINER (gtk_items.window), 1); gtk_window_set_title ((GtkWindow *) gtk_items.window, verstring); box = gtk_hbox_new(FALSE, 0); @@ -198,40 +203,28 @@ void finalize_image(guchar *pixels, gpointer data) /* --- */ -void gp2x_init(void) +static void realloc_screen(void) { - printf("entering init()\n"); fflush(stdout); - - gp2x_screen = malloc(320*240*2 + 320*2); - memset(gp2x_screen, 0, 320*240*2 + 320*2); - - // snd - sndout_oss_init(); - - gtk_initf(); - - usbjoy_init(); - - printf("exitting init()\n"); fflush(stdout); -} - -void gp2x_deinit(void) -{ - free(gp2x_screen); - sndout_oss_exit(); - usbjoy_deinit(); + void *old = g_screen_ptr; + g_screen_width = scr_w; + g_screen_height = scr_h; + g_screen_ptr = calloc(g_screen_width * g_screen_height * 2, 1); + free(old); + scr_changed = 0; } -/* video */ -void gp2x_video_flip(void) +/* gp2x/emu.c stuff, most to be rm'd */ +static void gp2x_video_flip_(void) { GdkPixbuf *pixbuf; unsigned char *image; - int i; + int pixel_count, i; + + pixel_count = g_screen_width * g_screen_height; gdk_threads_enter(); - image = malloc (320*240*3); + image = malloc(pixel_count * 3); if (image == NULL) { gdk_threads_leave(); @@ -240,10 +233,10 @@ void gp2x_video_flip(void) if (current_bpp == 8) { - unsigned char *pixels = gp2x_screen; + unsigned char *pixels = g_screen_ptr; int pix; - for (i = 0; i < 320*240; i++) + for (i = 0; i < pixel_count; i++) { pix = current_pal[pixels[i]]; image[3 * i + 0] = pix >> 16; @@ -253,9 +246,9 @@ void gp2x_video_flip(void) } else { - unsigned short *pixels = gp2x_screen; + unsigned short *pixels = g_screen_ptr; - for (i = 0; i < 320*240; i++) + for (i = 0; i < pixel_count; i++) { /* in: rrrr rggg gggb bbbb */ /* out: rrrr r000 gggg gg00 bbbb b000 */ @@ -266,148 +259,158 @@ void gp2x_video_flip(void) } pixbuf = gdk_pixbuf_new_from_data (image, GDK_COLORSPACE_RGB, - FALSE, 8, 320, 240, 320*3, finalize_image, NULL); + FALSE, 8, g_screen_width, g_screen_height, + g_screen_width * 3, finalize_image, NULL); gtk_image_set_from_pixbuf (GTK_IMAGE (gtk_items.pixmap1), pixbuf); g_object_unref (pixbuf); gdk_threads_leave(); -} - -void gp2x_video_flip2(void) -{ - gp2x_video_flip(); -} -void gp2x_video_changemode(int bpp) -{ - current_bpp = bpp; + if (scr_changed) + realloc_screen(); } -void gp2x_video_changemode2(int bpp) +static void gp2x_video_changemode_ll_(int bpp) { current_bpp = bpp; } -void gp2x_video_setpalette(int *pal, int len) +static void gp2x_video_setpalette_(int *pal, int len) { memcpy(current_pal, pal, len*4); } -void gp2x_video_flush_cache(void) +void gp2x_memcpy_all_buffers(void *data, int offset, int len) { } -void gp2x_video_RGB_setscaling(int v_offs, int W, int H) +void gp2x_memset_all_buffers(int offset, int byte, int len) { + memset((char *)g_screen_ptr + offset, byte, len); } -void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len) +void gp2x_video_changemode(int bpp) { - if ((char *)gp2x_screen + offset != data) - memcpy((char *)gp2x_screen + offset, data, len); + gp2x_video_changemode_ll_(bpp); } -void gp2x_memcpy_all_buffers(void *data, int offset, int len) +void gp2x_make_fb_bufferable(int yes) { - memcpy((char *)gp2x_screen + offset, data, len); } - -void gp2x_memset_all_buffers(int offset, int byte, int len) +int soc_detect(void) { - memset((char *)gp2x_screen + offset, byte, len); + return 0; } -void gp2x_pd_clone_buffer2(void) -{ - memset(gp2x_screen, 0, 320*240*2); -} +/* plat */ +static char menu_bg_buffer[320*240*2]; +char cpu_clk_name[16] = "GP2X CPU clocks"; -/* joy */ -unsigned long gp2x_joystick_read(int allow_usb_joy) +void plat_video_menu_enter(int is_rom_loaded) { - unsigned long value = current_keys; - int i; + if (is_rom_loaded) + { + // darken the active framebuffer + memset(g_screen_ptr, 0, 320*8*2); + menu_darken_bg((char *)g_screen_ptr + 320*8*2, 320*224, 1); + memset((char *)g_screen_ptr + 320*232*2, 0, 320*8*2); + } + else + { + char buff[256]; - if (allow_usb_joy && num_of_joys > 0) { - // check the usb joy as well.. - usbjoy_update(); - for (i = 0; i < num_of_joys; i++) - value |= usbjoy_check(i); + // should really only happen once, on startup.. + emu_make_path(buff, "skin/background.png", sizeof(buff)); + if (readpng(g_screen_ptr, buff, READPNG_BG) < 0) + memset(g_screen_ptr, 0, 320*240*2); } - return value; -} + memcpy(menu_bg_buffer, g_screen_ptr, 320*240*2); -int gp2x_touchpad_read(int *x, int *y) -{ - return -1; + // switch to 16bpp + gp2x_video_changemode_ll_(16); + gp2x_video_flip_(); } -/* 940 */ -int crashed_940 = 0; -void Pause940(int yes) +void plat_video_menu_begin(void) { + memcpy(g_screen_ptr, menu_bg_buffer, 320*240*2); } -void Reset940(int yes, int bank) +void plat_video_menu_end(void) { + gp2x_video_flip_(); } -/* faking gp2x cpuctrl.c */ -void cpuctrl_init(void) +void plat_validate_config(void) { +// PicoOpt &= ~POPT_EXT_FM; } -void cpuctrl_deinit(void) +void plat_early_init(void) { } -void set_FCLK(unsigned MHZ) +void plat_init(void) { -} + realloc_screen(); + memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2); -void Disable_940(void) -{ -} + // snd + sndout_oss_init(); -void gp2x_video_wait_vsync(void) -{ + gtk_initf(); } -void set_RAM_Timings(int tRC, int tRAS, int tWR, int tMRD, int tRFC, int tRP, int tRCD) +void plat_finish(void) { + free(g_screen_ptr); + sndout_oss_exit(); } -void set_gamma(int g100, int A_SNs_curve) +/* nasty */ +static void do_nothing() { } -void set_LCD_custom_rate(int rate) +void *gp2x_video_flip = gp2x_video_flip_; +void *gp2x_video_flip2 = gp2x_video_flip_; +void *gp2x_video_changemode_ll = gp2x_video_changemode_ll_; +void *gp2x_video_setpalette = gp2x_video_setpalette_; + +void *gp2x_video_RGB_setscaling = do_nothing; +void *gp2x_video_wait_vsync = do_nothing; +void *gp2x_set_cpuclk = do_nothing; +void *set_lcd_custom_rate = do_nothing; +void *unset_lcd_custom_rate = do_nothing; +void *set_lcd_gamma = do_nothing; +void *set_ram_timings = do_nothing; +void *unset_ram_timings = do_nothing; + +/* joy */ +int gp2x_touchpad_read(int *x, int *y) { + return -1; } -void unset_LCD_custom_rate(void) +/* misc */ +void spend_cycles(int c) { + usleep(c/200); } -/* squidgehack.c */ -int mmuhack(void) +int mp3_get_bitrate(FILE *f, int size) { - return 0; + return 128; } - -int mmuunhack(void) +void mp3_start_play(FILE *f, int pos) { - return 0; } - -/* misc */ -void spend_cycles(int c) +void mp3_update(int *buffer, int length, int stereo) { - usleep(c/200); } /* lprintf */