From: notaz Date: Wed, 14 Sep 2011 21:33:03 +0000 (+0300) Subject: fix some minor frontend issues X-Git-Tag: r10~50 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=366631aa62737a8a715e80bcb35cb198fae5fd29 fix some minor frontend issues --- diff --git a/frontend/pl_gun_ts.c b/frontend/pl_gun_ts.c index 63cf33f9..3ee9c25b 100644 --- a/frontend/pl_gun_ts.c +++ b/frontend/pl_gun_ts.c @@ -106,7 +106,7 @@ struct tsdev *pl_gun_ts_init(void) return ts; fail_config: - pts_close(ltsh); + pts_close(ts); fail_open: fail_dlsym: dlclose(ltsh); diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c index 5939dcbd..6cc4eaa7 100644 --- a/frontend/plat_omap.c +++ b/frontend/plat_omap.c @@ -29,7 +29,7 @@ int g_layer_w = 640, g_layer_h = 480; struct vout_fbdev *layer_fb; -static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, int first_call) +static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h) { struct omapfb_plane_info pi = { 0, }; struct omapfb_mem_info mi = { 0, }; @@ -55,7 +55,7 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, in perror("SETUP_PLANE"); } - if (first_call) { + if (mi.size < 640*512*3*3) { mi.size = 640*512*3*3; ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi); if (ret != 0) { @@ -85,7 +85,7 @@ int omap_enable_layer(int enabled) pl_set_gun_rect(g_layer_x, g_layer_y, g_layer_w, g_layer_h); return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), enabled, - g_layer_x, g_layer_y, g_layer_w, g_layer_h, 0); + g_layer_x, g_layer_y, g_layer_w, g_layer_h); } void plat_video_menu_enter(int is_rom_loaded) @@ -138,7 +138,7 @@ void plat_init(void) exit(1); } - ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h, 1); + ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h); close(fd); if (ret != 0) { fprintf(stderr, "failed to set up layer, exiting.\n"); diff --git a/pandora/pcsx.sh b/pandora/pcsx.sh index 2062e782..2077a29a 100755 --- a/pandora/pcsx.sh +++ b/pandora/pcsx.sh @@ -10,6 +10,7 @@ echo absolute > /proc/pandora/nub1/mode # restore stuff if pcsx crashes ./picorestore +sudo -n /usr/pandora/scripts/op_lcdrate.sh 60 echo "$nub0mode" > /proc/pandora/nub0/mode echo "$nub1mode" > /proc/pandora/nub1/mode