more sms wip, better ROM detect, line callback change

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@762 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-08-27 21:44:52 +00:00
parent 9569ea52ed
commit 86c1049d1f
8 changed files with 69 additions and 43 deletions

View file

@ -65,7 +65,7 @@ ifeq "$(amalgamate)" "1"
OBJS += ../../picoAll.o
else
OBJS += pico/area.o pico/cart.o pico/memory.o pico/misc.o pico/pico.o pico/sek.o pico/z80if.o \
pico/videoport.o pico/draw2.o pico/draw.o pico/patch.o pico/debug.o
pico/videoport.o pico/draw2.o pico/draw.o pico/mode4.o pico/sms.o pico/patch.o pico/debug.o
# Pico - CD
OBJS += pico/cd/pico.o pico/cd/memory.o pico/cd/sek.o pico/cd/LC89510.o \
pico/cd/cd_sys.o pico/cd/cd_file.o pico/cd/cue.o pico/cd/gfx_cd.o \
@ -120,12 +120,7 @@ DIRS = platform platform/gp2x platform/linux platform/common pico pico/cd pico/p
all: mkdirs PicoDrive
include ../common/common_arm.mak
platform/common/menu.o : revision.h
revision.h:
@echo "#define REVISION \"`svn info | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
@diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
include ../common/revision.mak
# partial linking helps profiled builds due to section merging
PicoDrive.o : $(OBJS) ../common/helix/$(CROSS)helix-mp3.a

View file

@ -220,7 +220,6 @@ static void draw_pico_ptr(void)
static int EmuScanBegin16(unsigned int num)
{
if (!(Pico.video.reg[1]&8)) num += 8;
DrawLineDest = (unsigned short *) g_screen_ptr + g_screen_width * num;
return 0;
@ -228,7 +227,6 @@ static int EmuScanBegin16(unsigned int num)
static int EmuScanBegin8(unsigned int num)
{
if (!(Pico.video.reg[1]&8)) num += 8;
DrawLineDest = (unsigned char *) g_screen_ptr + g_screen_width * num;
return 0;
@ -247,8 +245,6 @@ static int EmuScanEnd16_rot(unsigned int num)
{
if ((num & 3) != 3)
return 0;
if (!(Pico.video.reg[1] & 8))
num += 8;
rotated_blit16(g_screen_ptr, rot_buff, num + 1,
!(Pico.video.reg[12] & 1) && !(PicoOpt & POPT_EN_SOFTSCALE));
return 0;
@ -264,8 +260,6 @@ static int EmuScanEnd8_rot(unsigned int num)
{
if ((num & 3) != 3)
return 0;
if (!(Pico.video.reg[1] & 8))
num += 8;
rotated_blit8(g_screen_ptr, rot_buff, num + 1,
!(Pico.video.reg[12] & 1));
return 0;
@ -439,7 +433,6 @@ static void vidResetMode(void)
}
else if (currentConfig.EmuOpt & EOPT_16BPP) {
PicoDrawSetColorFormat(1);
PicoDrawSetColorFormatMode4(1);
if (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) {
gp2x_video_changemode(-16);
PicoScanBegin = EmuScanBegin16_rot;