mirror of
https://github.com/RaySollium99/libpicofe.git
synced 2025-09-05 06:47:45 -04:00
pandora: tripplebuffer fbdev out, refactoring
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@845 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
fbe111032e
commit
b188c2b6d0
17 changed files with 404 additions and 171 deletions
|
|
@ -1,4 +1,7 @@
|
|||
# settings
|
||||
#use_fbdev = 1
|
||||
#fake_in_gp2x = 1
|
||||
|
||||
use_musashi = 1
|
||||
#use_fame = 1
|
||||
use_cz80 = 1
|
||||
|
|
@ -8,7 +11,6 @@ use_sh2drc = 1
|
|||
#drc_debug = 3
|
||||
#drc_debug_interp = 1
|
||||
#profile = 1
|
||||
#fake_in_gp2x = 1
|
||||
|
||||
-include Makefile.local
|
||||
|
||||
|
|
@ -24,8 +26,6 @@ ifeq "$(ARCH)" "arm"
|
|||
CFLAGS += -mcpu=arm920t
|
||||
DEFINES += ARM
|
||||
endif
|
||||
LDFLAGS += -lpthread
|
||||
LDFLAGS += -lX11
|
||||
|
||||
CC = $(CROSS)gcc
|
||||
|
||||
|
|
@ -37,6 +37,14 @@ OBJS += platform/common/main.o platform/common/emu.o platform/common/menu.o \
|
|||
platform/common/config.o platform/common/fonts.o platform/common/readpng.o \
|
||||
platform/common/input.o
|
||||
|
||||
ifeq "$(use_fbdev)" "1"
|
||||
DEFINES += FBDEV
|
||||
OBJS += fbdev.o
|
||||
else
|
||||
LDFLAGS += -lpthread
|
||||
LDFLAGS += -lX11
|
||||
endif
|
||||
|
||||
ifeq "$(fake_in_gp2x)" "1"
|
||||
DEFINES += IN_GP2X FAKE_IN_GP2X
|
||||
OBJS += platform/gp2x/in_gp2x.o
|
||||
|
|
|
|||
47
linux/emu.c
47
linux/emu.c
|
|
@ -17,18 +17,11 @@
|
|||
|
||||
|
||||
static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
|
||||
unsigned char temp_frame[320 * 240 * 2];
|
||||
unsigned char *PicoDraw2FB = temp_frame;
|
||||
static int osd_fps_x;
|
||||
char cpu_clk_name[] = "unused";
|
||||
|
||||
extern void update_screen(void);
|
||||
|
||||
|
||||
void pemu_prep_defconfig(void)
|
||||
{
|
||||
// XXX: move elsewhere
|
||||
g_menubg_ptr = temp_frame;
|
||||
}
|
||||
|
||||
void pemu_validate_config(void)
|
||||
|
|
@ -41,6 +34,7 @@ void pemu_validate_config(void)
|
|||
// FIXME: dupes from GP2X, need cleanup
|
||||
static void (*osd_text)(int x, int y, const char *text);
|
||||
|
||||
/*
|
||||
static void osd_text8(int x, int y, const char *text)
|
||||
{
|
||||
int len = strlen(text)*8;
|
||||
|
|
@ -55,6 +49,7 @@ static void osd_text8(int x, int y, const char *text)
|
|||
}
|
||||
emu_text_out8(x, y, text);
|
||||
}
|
||||
*/
|
||||
|
||||
static void osd_text16(int x, int y, const char *text)
|
||||
{
|
||||
|
|
@ -108,18 +103,16 @@ static int EmuScanBegin16(unsigned int num)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void pemu_update_display(const char *fps, const char *notice)
|
||||
void pemu_finalize_frame(const char *fps, const char *notice)
|
||||
{
|
||||
if (notice || (currentConfig.EmuOpt & EOPT_SHOW_FPS)) {
|
||||
if (notice)
|
||||
osd_text(4, g_screen_height - 8, notice);
|
||||
if (currentConfig.EmuOpt & EOPT_SHOW_FPS)
|
||||
osd_text(osd_fps_x, g_screen_height - 8, fps);
|
||||
osd_text(g_screen_width - 60, g_screen_height - 8, fps);
|
||||
}
|
||||
if ((PicoAHW & PAHW_MCD) && (currentConfig.EmuOpt & EOPT_EN_CD_LEDS))
|
||||
draw_cd_leds();
|
||||
|
||||
update_screen();
|
||||
}
|
||||
|
||||
void plat_video_toggle_renderer(int is_next, int force_16bpp, int is_menu)
|
||||
|
|
@ -139,7 +132,7 @@ void plat_video_menu_begin(void)
|
|||
|
||||
void plat_video_menu_end(void)
|
||||
{
|
||||
update_screen();
|
||||
plat_video_flip();
|
||||
}
|
||||
|
||||
void plat_status_msg_clear(void)
|
||||
|
|
@ -152,7 +145,8 @@ void plat_status_msg_clear(void)
|
|||
void plat_status_msg_busy_next(const char *msg)
|
||||
{
|
||||
plat_status_msg_clear();
|
||||
pemu_update_display("", msg);
|
||||
pemu_finalize_frame("", msg);
|
||||
plat_video_flip();
|
||||
emu_status_msg("");
|
||||
reset_timing = 1;
|
||||
}
|
||||
|
|
@ -202,29 +196,30 @@ static void updateSound(int len)
|
|||
|
||||
void pemu_sound_start(void)
|
||||
{
|
||||
static int PsndRate_old = 0, PicoOpt_old = 0, pal_old = 0;
|
||||
int target_fps = Pico.m.pal ? 50 : 60;
|
||||
|
||||
PsndOut = NULL;
|
||||
|
||||
if (currentConfig.EmuOpt & EOPT_EN_SOUND)
|
||||
{
|
||||
int snd_excess_add;
|
||||
if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old)
|
||||
PsndRerate(Pico.m.frame_count ? 1 : 0);
|
||||
int snd_excess_add, frame_samples;
|
||||
int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
|
||||
|
||||
PsndRerate(Pico.m.frame_count ? 1 : 0);
|
||||
|
||||
frame_samples = PsndLen;
|
||||
snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
|
||||
if (snd_excess_add != 0)
|
||||
frame_samples++;
|
||||
|
||||
snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
|
||||
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
|
||||
PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
|
||||
sndout_oss_start(PsndRate, 16, (PicoOpt&8)>>3);
|
||||
PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
|
||||
sndout_oss_start(PsndRate, frame_samples, is_stereo);
|
||||
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
|
||||
PicoWriteSound = updateSound;
|
||||
plat_update_volume(0, 0);
|
||||
memset(sndBuffer, 0, sizeof(sndBuffer));
|
||||
PsndOut = sndBuffer;
|
||||
PsndRate_old = PsndRate;
|
||||
PicoOpt_old = PicoOpt;
|
||||
pal_old = Pico.m.pal;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -243,8 +238,6 @@ void plat_debug_cat(char *str)
|
|||
|
||||
void emu_video_mode_change(int start_line, int line_count, int is_32cols)
|
||||
{
|
||||
osd_fps_x = 260;
|
||||
|
||||
// clear whole screen in all buffers
|
||||
memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
|
||||
}
|
||||
|
|
@ -292,10 +285,6 @@ void plat_wait_till_us(unsigned int us_to)
|
|||
}
|
||||
}
|
||||
|
||||
void plat_video_wait_vsync(void)
|
||||
{
|
||||
}
|
||||
|
||||
const char *plat_get_credits(void)
|
||||
{
|
||||
return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"
|
||||
|
|
|
|||
162
linux/fbdev.c
Normal file
162
linux/fbdev.c
Normal file
|
|
@ -0,0 +1,162 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
#include <unistd.h>
|
||||
#include <linux/fb.h>
|
||||
#include <linux/matroxfb.h>
|
||||
|
||||
#include "../common/emu.h"
|
||||
#include "fbdev.h"
|
||||
|
||||
#define FBDEV_MAX_BUFFERS 3
|
||||
|
||||
static int fbdev = -1;
|
||||
static void *fbdev_mem = MAP_FAILED;
|
||||
static int fbdev_mem_size;
|
||||
static struct fb_var_screeninfo fbvar_old;
|
||||
static struct fb_var_screeninfo fbvar_new;
|
||||
static int fbdev_buffer_write;
|
||||
|
||||
void *fbdev_buffers[FBDEV_MAX_BUFFERS];
|
||||
int fbdev_buffer_count;
|
||||
|
||||
void plat_video_flip(void)
|
||||
{
|
||||
int draw_buf;
|
||||
|
||||
if (fbdev_buffer_count < 2)
|
||||
return;
|
||||
|
||||
draw_buf = fbdev_buffer_write;
|
||||
fbdev_buffer_write++;
|
||||
if (fbdev_buffer_write >= fbdev_buffer_count)
|
||||
fbdev_buffer_write = 0;
|
||||
|
||||
fbvar_new.yoffset = fbvar_old.yres * draw_buf;
|
||||
g_screen_ptr = fbdev_buffers[fbdev_buffer_write];
|
||||
}
|
||||
|
||||
void plat_video_wait_vsync(void)
|
||||
{
|
||||
int arg = 0;
|
||||
ioctl(fbdev, FBIO_WAITFORVSYNC, &arg);
|
||||
}
|
||||
|
||||
int vout_fbdev_init(int *w, int *h)
|
||||
{
|
||||
static const char *fbdev_name = "/dev/fb0";
|
||||
int i, ret;
|
||||
|
||||
fbdev = open(fbdev_name, O_RDWR);
|
||||
if (fbdev == -1) {
|
||||
fprintf(stderr, "%s: ", fbdev_name);
|
||||
perror("open");
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = ioctl(fbdev, FBIOGET_VSCREENINFO, &fbvar_old);
|
||||
if (ret == -1) {
|
||||
perror("FBIOGET_VSCREENINFO ioctl");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
fbvar_new = fbvar_old;
|
||||
printf("%s: %ix%i@%d\n", fbdev_name, fbvar_old.xres, fbvar_old.yres, fbvar_old.bits_per_pixel);
|
||||
*w = fbvar_old.xres;
|
||||
*h = fbvar_old.yres;
|
||||
fbdev_buffer_count = FBDEV_MAX_BUFFERS; // be optimistic
|
||||
|
||||
if (fbvar_new.bits_per_pixel != 16) {
|
||||
printf(" switching to 16bpp\n");
|
||||
fbvar_new.bits_per_pixel = 16;
|
||||
ret = ioctl(fbdev, FBIOPUT_VSCREENINFO, &fbvar_new);
|
||||
if (ret == -1) {
|
||||
perror("FBIOPUT_VSCREENINFO ioctl");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
if (fbvar_new.yres_virtual < fbvar_old.yres * fbdev_buffer_count) {
|
||||
fbvar_new.yres_virtual = fbvar_old.yres * fbdev_buffer_count;
|
||||
ret = ioctl(fbdev, FBIOPUT_VSCREENINFO, &fbvar_new);
|
||||
if (ret == -1) {
|
||||
fbdev_buffer_count = 1;
|
||||
fprintf(stderr, "Warning: failed to increase virtual resolution, "
|
||||
"doublebuffering disabled\n");
|
||||
}
|
||||
}
|
||||
|
||||
fbdev_mem_size = *w * *h * 2 * fbdev_buffer_count;
|
||||
fbdev_mem = mmap(0, fbdev_mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);
|
||||
if (fbdev_mem == MAP_FAILED && fbdev_buffer_count > 1) {
|
||||
fbdev_mem_size = *w * *h * 2;
|
||||
fbdev_buffer_count = 1;
|
||||
fprintf(stderr, "Warning: can't map %d bytes, doublebuffering disabled\n", fbdev_mem_size);
|
||||
fbdev_mem = mmap(0, fbdev_mem_size, PROT_WRITE|PROT_READ, MAP_SHARED, fbdev, 0);
|
||||
}
|
||||
if (fbdev_mem == MAP_FAILED) {
|
||||
perror("mmap framebuffer");
|
||||
goto fail;
|
||||
}
|
||||
memset(fbdev_mem, 0, fbdev_mem_size);
|
||||
for (i = 0; i < fbdev_buffer_count; i++)
|
||||
fbdev_buffers[i] = (char *)fbdev_mem + i * *w * *h * 2;
|
||||
g_screen_ptr = fbdev_buffers[0];
|
||||
|
||||
// some checks
|
||||
ret = 0;
|
||||
ret = ioctl(fbdev, FBIO_WAITFORVSYNC, &ret);
|
||||
if (ret != 0)
|
||||
fprintf(stderr, "Warning: vsync doesn't seem to be supported\n");
|
||||
|
||||
if (fbdev_buffer_count > 1) {
|
||||
fbdev_buffer_write = 0;
|
||||
fbvar_new.yoffset = fbvar_old.yres * (fbdev_buffer_count - 1);
|
||||
ret = ioctl(fbdev, FBIOPAN_DISPLAY, &fbvar_new);
|
||||
if (ret != 0) {
|
||||
fbdev_buffer_count = 1;
|
||||
fprintf(stderr, "Warning: can't pan display, doublebuffering disabled\n");
|
||||
}
|
||||
}
|
||||
|
||||
printf("fbdev initialized.\n");
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
close(fbdev);
|
||||
return -1;
|
||||
}
|
||||
|
||||
void vout_fbdev_finish(void)
|
||||
{
|
||||
ioctl(fbdev, FBIOPUT_VSCREENINFO, &fbvar_old);
|
||||
if (fbdev_mem != MAP_FAILED)
|
||||
munmap(fbdev_mem, fbdev_mem_size);
|
||||
if (fbdev >= 0)
|
||||
close(fbdev);
|
||||
fbdev_mem = NULL;
|
||||
fbdev = -1;
|
||||
}
|
||||
|
||||
#if 0
|
||||
void *g_screen_ptr;
|
||||
int main()
|
||||
{
|
||||
int w, h;
|
||||
vout_fbdev_init(&w, &h);
|
||||
//while (1)
|
||||
{
|
||||
memset(g_screen_ptr, 0xff, fbdev_mem_size / 2);
|
||||
plat_video_wait_vsync();
|
||||
plat_video_flip();
|
||||
memset(g_screen_ptr, 0x00, fbdev_mem_size / 2);
|
||||
usleep(8000);
|
||||
// plat_video_wait_vsync();
|
||||
plat_video_flip();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
5
linux/fbdev.h
Normal file
5
linux/fbdev.h
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
int vout_fbdev_init(int *w, int *h);
|
||||
void vout_fbdev_finish(void);
|
||||
|
||||
extern void *fbdev_buffers[];
|
||||
extern int fbdev_buffer_count;
|
||||
62
linux/io.c
62
linux/io.c
|
|
@ -2,13 +2,6 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <pthread.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "../common/emu.h"
|
||||
#include "../common/menu.h"
|
||||
|
|
@ -17,15 +10,23 @@
|
|||
|
||||
#include "log_io.h"
|
||||
|
||||
unsigned long current_keys = 0;
|
||||
int current_keys;
|
||||
unsigned char *PicoDraw2FB;
|
||||
|
||||
#ifdef FBDEV
|
||||
|
||||
#include "fbdev.h"
|
||||
|
||||
#else
|
||||
|
||||
#include <pthread.h>
|
||||
#include <semaphore.h>
|
||||
|
||||
static int current_bpp = 16;
|
||||
static int current_pal[256];
|
||||
static const char *verstring = "PicoDrive " VERSION;
|
||||
static int scr_changed = 0, scr_w = SCREEN_WIDTH, scr_h = SCREEN_HEIGHT;
|
||||
|
||||
/* ifndef is for qemu build without video out */
|
||||
#ifndef ARM
|
||||
|
||||
/* 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,
|
||||
|
|
@ -245,23 +246,24 @@ static void xlib_init(void)
|
|||
sem_wait(&xlib_sem);
|
||||
sem_destroy(&xlib_sem);
|
||||
}
|
||||
#endif // !ARM
|
||||
|
||||
/* --- */
|
||||
|
||||
static void realloc_screen(void)
|
||||
{
|
||||
void *old = g_screen_ptr;
|
||||
int size = scr_w * scr_h * 2;
|
||||
g_screen_width = scr_w;
|
||||
g_screen_height = scr_h;
|
||||
g_screen_ptr = calloc(g_screen_width * g_screen_height * 2, 1);
|
||||
free(old);
|
||||
g_screen_ptr = realloc(g_screen_ptr, size);
|
||||
g_menubg_ptr = realloc(g_menubg_ptr, size);
|
||||
memset(g_screen_ptr, 0, size);
|
||||
memset(g_menubg_ptr, 0, size);
|
||||
PicoDraw2FB = g_menubg_ptr;
|
||||
scr_changed = 0;
|
||||
}
|
||||
|
||||
void update_screen(void)
|
||||
void plat_video_flip(void)
|
||||
{
|
||||
#ifndef ARM
|
||||
unsigned int *image;
|
||||
int pixel_count, i;
|
||||
|
||||
|
|
@ -301,29 +303,45 @@ void update_screen(void)
|
|||
realloc_screen();
|
||||
ximage_realloc(xlib_display, DefaultVisual(xlib_display, 0));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void plat_video_wait_vsync(void)
|
||||
{
|
||||
}
|
||||
|
||||
#endif // !FBDEV
|
||||
|
||||
void plat_early_init(void)
|
||||
{
|
||||
}
|
||||
|
||||
void plat_init(void)
|
||||
{
|
||||
#ifdef FBDEV
|
||||
int ret, w, h;
|
||||
ret = vout_fbdev_init(&w, &h);
|
||||
if (ret != 0)
|
||||
exit(1);
|
||||
g_screen_width = w;
|
||||
g_menubg_ptr = realloc(g_menubg_ptr, w * g_screen_height * 2);
|
||||
PicoDraw2FB = g_menubg_ptr;
|
||||
#else
|
||||
realloc_screen();
|
||||
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
|
||||
xlib_init();
|
||||
#endif
|
||||
|
||||
// snd
|
||||
sndout_oss_init();
|
||||
|
||||
#ifndef ARM
|
||||
xlib_init();
|
||||
#endif
|
||||
}
|
||||
|
||||
void plat_finish(void)
|
||||
{
|
||||
#ifdef FBDEV
|
||||
vout_fbdev_finish();
|
||||
#else
|
||||
free(g_screen_ptr);
|
||||
#endif
|
||||
sndout_oss_exit();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,21 +25,27 @@ int sndout_oss_init(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void sndout_oss_stop(void)
|
||||
{
|
||||
if (sounddev < 0)
|
||||
return;
|
||||
|
||||
ioctl(sounddev, SOUND_PCM_SYNC, 0);
|
||||
close(sounddev);
|
||||
sounddev = -1;
|
||||
}
|
||||
|
||||
int sndout_oss_start(int rate, int frame_samples, int stereo)
|
||||
{
|
||||
static int s_oldrate = 0, s_old_fsamples = 0, s_oldstereo = 0;
|
||||
int frag, bsize, bits, ret;
|
||||
|
||||
// if no settings change, we don't need to do anything,
|
||||
// since audio is never stopped
|
||||
if (rate == s_oldrate && s_old_fsamples == frame_samples && s_oldstereo == stereo)
|
||||
// GP2X: if no settings change, we don't need to do anything,
|
||||
// since audio is never stopped there
|
||||
if (sounddev >= 0 && rate == s_oldrate && s_old_fsamples == frame_samples && s_oldstereo == stereo)
|
||||
return 0;
|
||||
|
||||
if (sounddev >= 0) {
|
||||
ioctl(sounddev, SOUND_PCM_SYNC, 0);
|
||||
close(sounddev);
|
||||
}
|
||||
|
||||
sndout_oss_stop();
|
||||
sounddev = open("/dev/dsp", O_WRONLY|O_ASYNC);
|
||||
if (sounddev == -1)
|
||||
{
|
||||
|
|
@ -72,8 +78,10 @@ int sndout_oss_start(int rate, int frame_samples, int stereo)
|
|||
if (ret < 0)
|
||||
perror("failed to set audio format");
|
||||
|
||||
#ifdef __GP2X__
|
||||
// not sure if this is still needed (avoiding driver bugs?)
|
||||
usleep(192*1024);
|
||||
#endif
|
||||
|
||||
printf("sndout_oss_start: %d/%dbit/%s, %d buffers of %i bytes\n",
|
||||
rate, bits, stereo ? "stereo" : "mono", frag >> 16, 1 << (frag & 0xffff));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
int sndout_oss_init(void);
|
||||
int sndout_oss_start(int rate, int frame_samples, int stereo);
|
||||
void sndout_oss_stop(void);
|
||||
int sndout_oss_write(const void *buff, int len);
|
||||
int sndout_oss_can_write(int bytes);
|
||||
void sndout_oss_sync(void);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue