diff options
| author | notaz | 2011-09-15 00:33:03 +0300 |
|---|---|---|
| committer | notaz | 2011-09-17 00:11:36 +0300 |
| commit | 366631aa62737a8a715e80bcb35cb198fae5fd29 (patch) | |
| tree | 30e8aca3b050c501603aa89f0357f115074c229f /frontend | |
| parent | faf8bb13afeebb4bbbae94cb11c57cd95b08e1dc (diff) | |
| download | pcsx_rearmed-366631aa62737a8a715e80bcb35cb198fae5fd29.tar.gz pcsx_rearmed-366631aa62737a8a715e80bcb35cb198fae5fd29.tar.bz2 pcsx_rearmed-366631aa62737a8a715e80bcb35cb198fae5fd29.zip | |
fix some minor frontend issues
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/pl_gun_ts.c | 2 | ||||
| -rw-r--r-- | frontend/plat_omap.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/frontend/pl_gun_ts.c b/frontend/pl_gun_ts.c index 63cf33f..3ee9c25 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 5939dcb..6cc4eaa 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"); |