mirror of
https://github.com/RaySollium99/picodrive.git
synced 2025-09-05 07:17:45 -04:00
redo OSS frag setup. Compute real pollux rate
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@896 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz
parent
45285368c0
commit
9f6a4e907b
6 changed files with 88 additions and 68 deletions
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
#include "plat_gp2x.h"
|
||||
#include "soc.h"
|
||||
#include "soc_pollux.h"
|
||||
#include "../common/plat.h"
|
||||
#include "../common/menu.h"
|
||||
#include "../common/arm_utils.h"
|
||||
|
|
@ -733,21 +734,22 @@ void pemu_sound_start(void)
|
|||
if (currentConfig.EmuOpt & EOPT_EN_SOUND)
|
||||
{
|
||||
int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
|
||||
int target_fps = Pico.m.pal ? 50 : 60;
|
||||
int frame_samples, snd_excess_add;
|
||||
int snd_rate_oss = PsndRate;
|
||||
gp2x_soc_t soc;
|
||||
|
||||
memset(sndBuffer, 0, sizeof(sndBuffer));
|
||||
PsndOut = sndBuffer;
|
||||
PicoWriteSound = updateSound;
|
||||
plat_update_volume(0, 0);
|
||||
|
||||
printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
|
||||
PsndRate, PsndLen, is_stereo, Pico.m.pal);
|
||||
sndout_oss_start(snd_rate_oss, is_stereo, 1);
|
||||
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
|
||||
|
||||
soc = soc_detect();
|
||||
if (soc == SOCID_POLLUX) {
|
||||
/* POLLUX pain: DPLL1 / mclk_div / bitclk_div / 4 */
|
||||
switch (PsndRate) {
|
||||
case 44100: PsndRate = 44171; break; // 44170.673077
|
||||
case 22050: PsndRate = 22086; break; // 22085.336538
|
||||
case 11025: PsndRate = 11043; break; // 11042.668269
|
||||
default: break;
|
||||
}
|
||||
}
|
||||
if (soc == SOCID_POLLUX)
|
||||
PsndRate = pollux_get_real_snd_rate(PsndRate);
|
||||
|
||||
#define SOUND_RERATE_FLAGS (POPT_EN_FM|POPT_EN_PSG|POPT_EN_STEREO|POPT_EXT_FM|POPT_EN_MCD_CDDA)
|
||||
if (PsndRate != PsndRate_old || Pico.m.pal != pal_old || ((PicoOpt & POPT_EXT_FM) && crashed_940) ||
|
||||
|
|
@ -755,40 +757,25 @@ void pemu_sound_start(void)
|
|||
PsndRerate(Pico.m.frame_count ? 1 : 0);
|
||||
}
|
||||
|
||||
memset(sndBuffer, 0, sizeof(sndBuffer));
|
||||
PsndOut = sndBuffer;
|
||||
PicoWriteSound = updateSound;
|
||||
PsndRate_old = PsndRate;
|
||||
PicoOpt_old = PicoOpt;
|
||||
pal_old = Pico.m.pal;
|
||||
plat_update_volume(0, 0);
|
||||
|
||||
frame_samples = PsndLen;
|
||||
snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
|
||||
if (snd_excess_add != 0)
|
||||
frame_samples++;
|
||||
if (soc == SOCID_POLLUX)
|
||||
frame_samples *= 2; /* force larger buffer */
|
||||
|
||||
printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
|
||||
PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
|
||||
sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
|
||||
sndout_oss_start(snd_rate_oss, frame_samples, is_stereo);
|
||||
|
||||
/* Wiz's sound hardware needs more prebuffer */
|
||||
if (soc == SOCID_POLLUX)
|
||||
updateSound(frame_samples);
|
||||
}
|
||||
}
|
||||
|
||||
static const int sound_rates[] = { 44100, 32000, 22050, 16000, 11025, 8000 };
|
||||
|
||||
void pemu_sound_stop(void)
|
||||
{
|
||||
/* get back from Wiz pain */
|
||||
switch (PsndRate) {
|
||||
case 44171: PsndRate = 44100; break;
|
||||
case 22086: PsndRate = 22050; break;
|
||||
case 11043: PsndRate = 11025; break;
|
||||
default: break;
|
||||
int i;
|
||||
|
||||
/* get back from Pollux pain */
|
||||
PsndRate += 1000;
|
||||
for (i = 0; i < ARRAY_SIZE(sound_rates); i++) {
|
||||
if (PsndRate >= sound_rates[i]) {
|
||||
PsndRate = sound_rates[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -801,7 +788,6 @@ void pemu_forced_frame(int no_scale, int do_emu)
|
|||
{
|
||||
int po_old = PicoOpt;
|
||||
|
||||
doing_bg_frame = 1;
|
||||
PicoOpt &= ~POPT_ALT_RENDERER;
|
||||
PicoOpt |= POPT_ACC_SPRITES;
|
||||
if (!no_scale)
|
||||
|
|
@ -815,13 +801,14 @@ void pemu_forced_frame(int no_scale, int do_emu)
|
|||
PicoDrawSetCallbacks(NULL, NULL);
|
||||
Pico.m.dirtyPal = 1;
|
||||
|
||||
doing_bg_frame = 1;
|
||||
if (do_emu)
|
||||
PicoFrame();
|
||||
else
|
||||
PicoFrameDrawOnly();
|
||||
doing_bg_frame = 0;
|
||||
|
||||
g_menubg_src_ptr = g_screen_ptr;
|
||||
doing_bg_frame = 0;
|
||||
PicoOpt = po_old;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,8 @@ static int fbdev = -1;
|
|||
|
||||
static char cpuclk_was_changed = 0;
|
||||
static unsigned short memtimex_old[2];
|
||||
static unsigned int pllsetreg0;
|
||||
static unsigned int pllsetreg0_old;
|
||||
static unsigned int timer_drift; // count per real second
|
||||
static int last_pal_setting = 0;
|
||||
|
||||
|
||||
|
|
@ -219,13 +220,13 @@ static int gp2x_read_battery_(void)
|
|||
#define TIMER_BASE3 0x1980
|
||||
#define TIMER_REG(x) memregl[(TIMER_BASE3 + x) >> 2]
|
||||
|
||||
unsigned int gp2x_get_ticks_us_(void)
|
||||
static unsigned int gp2x_get_ticks_us_(void)
|
||||
{
|
||||
TIMER_REG(0x08) = 0x4b; /* run timer, latch value */
|
||||
return TIMER_REG(0);
|
||||
}
|
||||
|
||||
unsigned int gp2x_get_ticks_ms_(void)
|
||||
static unsigned int gp2x_get_ticks_ms_(void)
|
||||
{
|
||||
/* approximate /= 1000 */
|
||||
unsigned long long v64;
|
||||
|
|
@ -261,10 +262,42 @@ static int decode_pll(unsigned int reg)
|
|||
return v;
|
||||
}
|
||||
|
||||
int pollux_get_real_snd_rate(int req_rate)
|
||||
{
|
||||
int clk0_src, clk1_src, rate, div;
|
||||
|
||||
clk0_src = (memregl[0xdbc4>>2] >> 1) & 7;
|
||||
clk1_src = (memregl[0xdbc8>>2] >> 1) & 7;
|
||||
if (clk0_src > 1 || clk1_src != 7) {
|
||||
fprintf(stderr, "get_real_snd_rate: bad clk sources: %d %d\n", clk0_src, clk1_src);
|
||||
return req_rate;
|
||||
}
|
||||
|
||||
rate = decode_pll(clk0_src ? memregl[0xf008>>2] : memregl[0xf004>>2]);
|
||||
|
||||
// apply divisors
|
||||
div = ((memregl[0xdbc4>>2] >> 4) & 0x1f) + 1;
|
||||
rate /= div;
|
||||
div = ((memregl[0xdbc8>>2] >> 4) & 0x1f) + 1;
|
||||
rate /= div;
|
||||
rate /= 64;
|
||||
|
||||
//printf("rate %d\n", rate);
|
||||
rate -= rate * timer_drift / 1000000;
|
||||
printf("adjusted rate: %d\n", rate);
|
||||
|
||||
if (rate < 8000-1000 || rate > 44100+1000) {
|
||||
fprintf(stderr, "get_real_snd_rate: got bad rate: %d\n", rate);
|
||||
return req_rate;
|
||||
}
|
||||
|
||||
return rate;
|
||||
}
|
||||
|
||||
void pollux_init(void)
|
||||
{
|
||||
struct fb_fix_screeninfo fbfix;
|
||||
int i, ret, rate;
|
||||
int i, ret, rate, timer_div;
|
||||
|
||||
memdev = open("/dev/mem", O_RDWR);
|
||||
if (memdev == -1) {
|
||||
|
|
@ -320,16 +353,18 @@ void pollux_init(void)
|
|||
/* find what PLL1 runs at, for the timer */
|
||||
rate = decode_pll(memregl[0xf008>>2]);
|
||||
printf("PLL1 @ %dHz\n", rate);
|
||||
rate /= 1000000;
|
||||
|
||||
/* setup timer */
|
||||
if (1 <= rate && rate <= 256) {
|
||||
timer_div = (rate + 500000) / 1000000;
|
||||
if (1 <= timer_div && timer_div <= 256) {
|
||||
timer_drift = (rate - (timer_div * 1000000)) / timer_div;
|
||||
|
||||
if (TIMER_REG(0x08) & 8) {
|
||||
fprintf(stderr, "warning: timer in use, overriding!\n");
|
||||
timer_cleanup();
|
||||
}
|
||||
|
||||
TIMER_REG(0x44) = ((rate - 1) << 4) | 2; /* using PLL1, divide by it's rate */
|
||||
TIMER_REG(0x44) = ((timer_div - 1) << 4) | 2; /* using PLL1, divide by it's rate */
|
||||
TIMER_REG(0x40) = 0x0c; /* clocks on */
|
||||
TIMER_REG(0x08) = 0x6b; /* run timer, clear irq, latch value */
|
||||
|
||||
|
|
@ -344,7 +379,7 @@ void pollux_init(void)
|
|||
gp2x_get_ticks_us = plat_get_ticks_us_good;
|
||||
}
|
||||
|
||||
pllsetreg0 = memregl[0xf004>>2];
|
||||
pllsetreg0_old = memregl[0xf004>>2];
|
||||
memtimex_old[0] = memregs[0x14802>>1];
|
||||
memtimex_old[1] = memregs[0x14804>>1];
|
||||
|
||||
|
|
@ -384,7 +419,7 @@ void pollux_finish(void)
|
|||
gp2x_video_changemode_ll_(16);
|
||||
unset_ram_timings_();
|
||||
if (cpuclk_was_changed) {
|
||||
memregl[0xf004>>2] = pllsetreg0;
|
||||
memregl[0xf004>>2] = pllsetreg0_old;
|
||||
memregl[0xf07c>>2] |= 0x8000;
|
||||
}
|
||||
timer_cleanup();
|
||||
|
|
|
|||
2
platform/gp2x/soc_pollux.h
Normal file
2
platform/gp2x/soc_pollux.h
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
|
||||
int pollux_get_real_snd_rate(int req_rate);
|
||||
Loading…
Add table
Add a link
Reference in a new issue