RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-06 15:48:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pico fixes

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@446 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-05-16 19:18:40 +00:00
parent ed367a3f7c
commit 213c16adcb
5 changed files with 71 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Pico/Pico/Memory.c
View file

@ -38,12 +38,12 @@ static u32 PicoReadPico8(u32 a)
d = ~d;
break;
case 0x05: d = (PicoPicohw.pen_pos[0] >> 8) & 3; break; // what is MS bit for? Games read it..
case 0x07: d = PicoPicohw.pen_pos[0] & 0xff; break;
case 0x09: d = (PicoPicohw.pen_pos[1] >> 8) & 3; break;
case 0x0b: d = PicoPicohw.pen_pos[1] & 0xff; break;
case 0x05: d = (PicoPicohw.pen_pos[0] >> 8); break; // what is MS bit for? Games read it..
case 0x07: d = PicoPicohw.pen_pos[0] & 0xff; break;
case 0x09: d = (PicoPicohw.pen_pos[1] >> 8); break;
case 0x0b: d = PicoPicohw.pen_pos[1] & 0xff; break;
case 0x0d: d = (1 << (PicoPicohw.page & 7)) - 1; break;
case 0x12: d = 0x80; break;
case 0x12: d = PicoPicohw.fifo_bytes == 0 ? 0x80 : 0; break; // guess
default:
elprintf(EL_UIO, "r8 : %06x, %02x @%06x", a&0xffffff, (u8)d, SekPc);
break;
@ -72,8 +72,10 @@ static u32 PicoReadPico16(u32 a)
goto end;
}
if (a == 0x800010)
if (a == 0x800010)
d = (PicoPicohw.fifo_bytes > 0x3f) ? 0 : (0x3f - PicoPicohw.fifo_bytes);
else if (a == 0x800012)
d = PicoPicohw.fifo_bytes == 0 ? 0x8000 : 0; // guess
elprintf(EL_UIO, "r16: %06x, %04x @%06x", a&0xffffff, d, SekPc);
@ -156,7 +158,12 @@ static void PicoWritePico16(u32 a,u16 d)
PicoPicohw.xpcm_ptr++;
}
}
else if (a == 0x800012) PicoPicohw.r12 = d;
else if (a == 0x800012) {
int r12_old = PicoPicohw.r12;
PicoPicohw.r12 = d;
if (r12_old != d)
PicoReratePico();
}
elprintf(EL_UIO, "w16: %06x, %04x", a&0xffffff, d);
}

13
Pico/Pico/Pico.c
View file

@ -6,14 +6,15 @@
picohw_state PicoPicohw;
static int prev_line_cnt_irq3 = 0, prev_line_cnt_irq5 = 0;
static int fifo_bytes_line = (16000<<16)/60/262/2; // fifo bytes/line. FIXME: other rates, modes
static int fifo_bytes_line = (16000<<16)/60/262/2;
PICO_INTERNAL void PicoReratePico(void)
{
int rate = (PicoPicohw.r12 & 0xf) ? 16000 : 8000;
if (Pico.m.pal)
fifo_bytes_line = (16000<<16)/50/312/2;
else fifo_bytes_line = (16000<<16)/60/262/2;
PicoPicoPCMRerate();
fifo_bytes_line = (rate<<16)/50/312/2;
else fifo_bytes_line = (rate<<16)/60/262/2;
PicoPicoPCMRerate(rate);
}
static void PicoLinePico(int count)
@ -74,8 +75,8 @@ PICO_INTERNAL int PicoInitPico(void)
PicoAHW = PAHW_PICO;
memset(&PicoPicohw, 0, sizeof(PicoPicohw));
PicoPicohw.pen_pos[0] = 0x03c + 352/2;
PicoPicohw.pen_pos[1] = 0x200 + 252/2;
PicoPicohw.pen_pos[0] = 0x03c + 320/2;
PicoPicohw.pen_pos[1] = 0x200 + 240/2;
prev_line_cnt_irq3 = prev_line_cnt_irq5 = 0;
// map version register

13
Pico/Pico/xpcm.c
View file

@ -28,7 +28,7 @@ static const int TableQuant[8] =
};
// changed using trial and error..
//const int quant_mul[16] = { 1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15 };
//static const int quant_mul[16] = { 1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15 };
static const int quant_mul[16] = { 1, 3, 5, 7, 9, 11, 13, -1, -1, -3, -5, -7, -9, -11, -13, -15 };
static int sample = 0, quant = 0, sgn = 0;
@ -42,19 +42,20 @@ PICO_INTERNAL void PicoPicoPCMReset(void)
memset(PicoPicohw.xpcm_buffer, 0, sizeof(PicoPicohw.xpcm_buffer));
}
PICO_INTERNAL void PicoPicoPCMRerate(void)
PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate)
{
stepsamples = (PsndRate<<10)/16000;
stepsamples = (PsndRate<<10)/xpcm_rate;
}
#define XSHIFT 7
#define XSHIFT 6
#define do_sample() \
{ \
sample += quant * quant_mul[srcval] >> XSHIFT; \
int delta = quant * quant_mul[srcval] >> XSHIFT; \
sample += delta - (delta >> 2); /* 3/4 */ \
quant = (quant * TableQuant[srcval&7]) >> ADPCMSHIFT; \
Limit(quant, 0x6000, 0x7f); \
Limit(sample, 32767/2, -32768/2); \
Limit(sample, 32767*3/4, -32768*3/4); \
}
PICO_INTERNAL void PicoPicoPCMUpdate(short *buffer, int length, int stereo)

2
Pico/PicoInt.h
View file

@ -448,7 +448,7 @@ PICO_INTERNAL void PicoReratePico(void);
// Pico/xpcm.c
PICO_INTERNAL void PicoPicoPCMUpdate(short *buffer, int length, int stereo);
PICO_INTERNAL void PicoPicoPCMReset(void);
PICO_INTERNAL void PicoPicoPCMRerate(void);
PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate);
// Sek.c
PICO_INTERNAL int SekInit(void);