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

diff --git a/common/emu.c b/common/emu.c
index 1cecc39..aca54be 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -245,8 +245,11 @@ static int emu_cd_check(int *pregion, const char *fname_in)
 static int detect_media(const char *fname)\r
 {\r
        static const short sms_offsets[] = { 0x7ff0, 0x3ff0, 0x1ff0 };\r
+       static const char *sms_exts[] = { "sms", "gg", "sg" };\r
+       static const char *md_exts[] = { "gen", "bin", "smd" };\r
+       char buff0[32], buff[32];\r
+       unsigned short *d16;\r
        pm_file *pmf;\r
-       char buff[32];\r
        char ext[5];\r
        int i;\r
 \r
@@ -264,34 +267,69 @@ static int detect_media(const char *fname)
        if (pmf == NULL)\r
                return PM_BAD;\r
 \r
-       if (pm_read(buff, 32, pmf) != 32) {\r
+       if (pm_read(buff0, 32, pmf) != 32) {\r
                pm_close(pmf);\r
                return PM_BAD;\r
        }\r
 \r
-       if (strncasecmp("SEGADISCSYSTEM", buff + 0x00, 14) == 0 ||\r
-           strncasecmp("SEGADISCSYSTEM", buff + 0x10, 14) == 0) {\r
+       if (strncasecmp("SEGADISCSYSTEM", buff0 + 0x00, 14) == 0 ||\r
+           strncasecmp("SEGADISCSYSTEM", buff0 + 0x10, 14) == 0) {\r
                pm_close(pmf);\r
                return PM_CD;\r
        }\r
 \r
+       /* check for SMD evil */\r
+       if (pmf->size >= 0x4200 && (pmf->size & 0x3fff) == 0x200) {\r
+               if (pm_seek(pmf, sms_offsets[0] + 0x200, SEEK_SET) == sms_offsets[0] + 0x200 &&\r
+                   pm_read(buff, 16, pmf) == 16 &&\r
+                   strncmp("TMR SEGA", buff, 8) == 0)\r
+                       goto looks_like_sms;\r
+\r
+               /* could parse further but don't bother */\r
+               goto extension_check;\r
+       }\r
+\r
+       /* MD header? Act as TMSS BIOS here */\r
+       if (pm_seek(pmf, 0x100, SEEK_SET) == 0x100 && pm_read(buff, 16, pmf) == 16) {\r
+               if (strncmp(buff, "SEGA", 4) == 0 || strncmp(buff, " SEG", 4) == 0)\r
+                       goto looks_like_md;\r
+       }\r
+\r
        for (i = 0; i < array_size(sms_offsets); i++) {\r
                if (pm_seek(pmf, sms_offsets[i], SEEK_SET) != sms_offsets[i])\r
-                       goto not_mark3;         /* actually it could be but can't be detected */\r
+                       continue;\r
 \r
                if (pm_read(buff, 16, pmf) != 16)\r
-                       goto not_mark3;\r
+                       continue;\r
 \r
-               if (strncasecmp("TMR SEGA", buff, 8) == 0) {\r
-                       pm_close(pmf);\r
-                       return PM_MARK3;\r
-               }\r
+               if (strncmp("TMR SEGA", buff, 8) == 0)\r
+                       goto looks_like_sms;\r
+       }\r
+\r
+extension_check:\r
+       /* probably some headerless thing. Maybe check the extension after all. */\r
+       for (i = 0; i < array_size(md_exts); i++)\r
+               if (strcasecmp(pmf->ext, md_exts[i]) == 0)\r
+                       goto looks_like_md;\r
+\r
+       for (i = 0; i < array_size(sms_exts); i++)\r
+               if (strcasecmp(pmf->ext, sms_exts[i]) == 0)\r
+                       goto looks_like_sms;\r
+\r
+       /* If everything else fails, make a guess on the reset vector */\r
+       d16 = (unsigned short *)(buff0 + 4);\r
+       if ((((d16[0] << 16) | d16[1]) & 0xffffff) >= pmf->size) {\r
+               lprintf("bad MD reset vector, assuming SMS\n");\r
+               goto looks_like_sms;\r
        }\r
 \r
-not_mark3:\r
+looks_like_md:\r
        pm_close(pmf);\r
-       /* the main emu function is to emulate MD, so assume MD */\r
        return PM_MD_CART;\r
+\r
+looks_like_sms:\r
+       pm_close(pmf);\r
+       return PM_MARK3;\r
 }\r
 \r
 static int extract_text(char *dest, const unsigned char *src, int len, int swab)\r
@@ -450,6 +488,7 @@ int emu_reload_rom(char *rom_fname)
 \r
        shutdown_MCD();\r
        PicoPatchUnload();\r
+       PicoAHW = 0;\r
 \r
        if (media_type == PM_CD)\r
        {\r

diff --git a/common/menu.c b/common/menu.c
index dff1b39..08117df 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -1803,7 +1803,7 @@ static void debug_menu_loop(void)
                {\r
                        case 0:\r
                                if (inp & PBTN_MOK)\r
-                                       SekStepM68k();\r
+                                       PDebugCPUStep();\r
                                if (inp & PBTN_MA3) {\r
                                        while (inp & PBTN_MA3)\r
                                                inp = in_menu_wait_any(-1);\r

diff --git a/common/revision.mak b/common/revision.mak
new file mode 100644 (file)
index 0000000..03093e3
--- /dev/null
+++ b/common/revision.mak
@@ -0,0 +1,8 @@
+platform/common/menu.o : revision.h
+
+revision.h: FORCE
+       @echo "#define REVISION \"`svn info -r HEAD | grep Revision | cut -c 11-`\"" > /tmp/r.tmp
+       @diff -q $@ /tmp/r.tmp > /dev/null 2>&1 || mv -f /tmp/r.tmp $@
+
+FORCE:
+

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

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

diff --git a/linux/Makefile b/linux/Makefile
index be932ed..033d3bd 100644 (file)
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -97,16 +97,13 @@ PicoDrive : $(OBJS) ../common/helix/helix_mp3_x86.a
        $(CC) $(CFLAGS) $^ $(LDFLAGS) -lm -lpng -Wl,-Map=PicoDrive.map -o $@
 
 mkdirs:
-       mkdir -p $(DIRS)
+       @mkdir -p $(DIRS)
+
+include ../common/revision.mak
 
 pico/carthw/svp/compiler.o : ../../pico/carthw/svp/gen_arm.c
 pico/pico.o pico/cd/pico.o : ../../pico/pico_cmn.c ../../pico/pico_int.h
 pico/memory.o pico/cd/memory.o : ../../pico/memory_cmn.c ../../pico/pico_int.h
-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 $@
 
 ../../cpu/musashi/m68kops.c :
        @make -C ../../cpu/musashi

diff --git a/pandora/emu.c b/pandora/emu.c
index a9a2119..3fbda4a 100644 (file)
--- a/pandora/emu.c
+++ b/pandora/emu.c
@@ -186,7 +186,6 @@ static void draw_pico_ptr(void)
 \r
 static int EmuScanBegin16(unsigned int num)\r
 {\r
-       if (!(Pico.video.reg[1]&8)) num += 8;\r
        DrawLineDest = (unsigned short *)g_screen_ptr + num*800 + 800/2 - 320/2;\r
        //int w = (Pico.video.reg[12]&1) ? 320 : 256;\r
        //DrawLineDest = (unsigned short *)g_screen_ptr + num*w;\r
@@ -204,7 +203,6 @@ static int EmuScanEnd16(unsigned int num)
        int sh = Pico.video.reg[0xC]&8;\r
        int len, mask = 0xff;\r
 \r
-       if (!(Pico.video.reg[1]&8)) num += 8;\r
        pd=(unsigned short *)g_screen_ptr + num*800*2 + 800/2 - 320*2/2;\r
 \r
        if (Pico.m.dirtyPal)\r

diff --git a/psp/emu.c b/psp/emu.c
index e0e1ca1..5eca789 100644 (file)
--- a/psp/emu.c
+++ b/psp/emu.c
@@ -261,8 +261,6 @@ static void EmuScanPrepare(void)
 
 static int EmuScanSlowBegin(unsigned int num)
 {
-       if (!(Pico.video.reg[1]&8)) num += 8;
-
        if (!dynamic_palette)
                HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
 
@@ -271,8 +269,6 @@ static int EmuScanSlowBegin(unsigned int num)
 
 static int EmuScanSlowEnd(unsigned int num)
 {
-       if (!(Pico.video.reg[1]&8)) num += 8;
-
        if (Pico.m.dirtyPal) {
                if (!dynamic_palette) {
                        do_slowmode_lines(num);