2310b8

diff --git a/audio.cpp b/audio.cpp
index 02fb7e73268c038b09221c97cda7b7dc756da72d..411c685ac0c45d31d783f6e3d96c7da7b8912a8f 100644 (file)
--- a/audio.cpp
+++ b/audio.cpp
@@ -44,9 +44,9 @@
 #include <math.h>
 
 #define MAX_EV ~0ul
-//#define DEBUG_AUDIO
+#define DEBUG_AUDIO 0
 #define DEBUG_CHANNEL_MASK 15
-//#define TEST_AUDIO
+#define TEST_AUDIO 0
 
 #define PERIOD_MIN 4
 #define PERIOD_MIN_NONCE 60
@@ -100,7 +100,7 @@ struct audio_channel_data {
        int sinc_output_state;
        sinc_queue_t sinc_queue[SINC_QUEUE_LENGTH];
        int sinc_queue_length;
-#ifdef TEST_AUDIO
+#if TEST_AUDIO > 0
        bool hisample, losample;
        bool have_dat;
        int per_original;
@@ -1038,14 +1038,14 @@ static int audio_work_to_do;
 static void zerostate (int nr)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        write_log (L"%d: ZEROSTATE\n", nr);
 #endif
        cdp->state = 0;
        cdp->evtime = MAX_EV;
        cdp->intreq2 = 0;
        cdp->dmaenstore = false;
-#ifdef TEST_AUDIO
+#if TEST_AUDIO > 0
        cdp->have_dat = false;
 #endif
 
@@ -1122,16 +1122,11 @@ uae_u16 audio_dmal (void)
        uae_u16 dmal = 0;
        for (int nr = 0; nr < 4; nr++) {
                struct audio_channel_data *cdp = audio_channel + nr;
-               // hpos offset hack, no need for expensive event
-               if (cdp->drhpos > 0 && cdp->drhpos < maxhpos - 4) {
-                       if (cdp->dr)
-                               dmal |= 1 << (nr * 2);
-                       if (cdp->dsr)
-                               dmal |= 1 << (nr * 2 + 1);
-                       cdp->dr = cdp->dsr = false;
-               } else {
-                       cdp->drhpos = 1;
-               }
+               if (cdp->dr)
+                       dmal |= 1 << (nr * 2);
+               if (cdp->dsr)
+                       dmal |= 1 << (nr * 2 + 1);
+               cdp->dr = cdp->dsr = false;
        }
        return dmal;
 }
@@ -1144,7 +1139,7 @@ static int isirq (int nr)
 static void setirq (int nr, int which)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr))
                write_log (L"SETIRQ%d (%d,%d) PC=%08X\n", nr, which, isirq (nr) ? 1 : 0, M68K_GETPC);
 #endif
@@ -1154,7 +1149,7 @@ static void setirq (int nr, int which)
 static void newsample (int nr, sample8_t sample)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (!debugchannel (nr))
                sample = 0;
 #endif
@@ -1167,16 +1162,15 @@ static void newsample (int nr, sample8_t sample)
 STATIC_INLINE void setdr (int nr)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
-#ifdef TEST_AUDIO
-       if (cdp->dr)
+#if TEST_AUDIO > 0
+       if (debugchannel (nr) && cdp->dr)
                write_log (L"%d: DR already active (STATE=%d)\n", nr, cdp->state);
 #endif
        cdp->drhpos = current_hpos ();
        cdp->dr = true;
        if (cdp->wlen == 1) {
                cdp->dsr = true;
-               cdp->drhpos++;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
                if (debugchannel (nr))
                        write_log (L"DSR%d PT=%08X PC=%08X\n", nr, cdp->pt, M68K_GETPC);
 #endif
@@ -1202,13 +1196,19 @@ static void loaddat (int nr, bool modper)
                        cdp[1].vol = cdp->dat;
                }
        } else {
-#ifdef TEST_AUDIO
-               if (cdp->hisample || cdp->losample)
-                       write_log (L"%d: high or low sample not used\n", nr);
+#if TEST_AUDIO > 0
+               if (debugchannel (nr)) {
+                       if (cdp->hisample || cdp->losample)
+                               write_log (L"%d: high or low sample not used\n", nr);
+                       if (!cdp->have_dat)
+                               write_log (L"%d: dat not updated. STATE=%d 1=%04x 2=%04x\n", nr, cdp->state, cdp->dat, cdp->dat2);
+               }
                cdp->hisample = cdp->losample = true;
-               if (!cdp->have_dat)
-                       write_log (L"%d: dat not updated. STATE=%d\n", nr, cdp->state);
                cdp->have_dat = false;
+#endif
+#if DEBUG_AUDIO > 1
+               if (debugchannel (nr))
+                       write_log (L"LOAD%dDAT: New:%04x, Old:%04x\n", nr, cdp->dat, cdp->dat2);
 #endif
                cdp->dat2 = cdp->dat;
        }
@@ -1249,7 +1249,7 @@ static void audio_state_channel2 (int nr, bool perfin)
        if ((cdp->state == 2 || cdp->state == 3) && usehacks () && !chan_ena && old_dma) {
                // DMA switched off, state=2/3 and "too fast CPU": kill DMA instantly
                // or CPU timed DMA wait routines in common tracker players will lose notes
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
                write_log (L"%d: INSTADMAOFF\n", nr, M68K_GETPC);
 #endif
                newsample (nr, (cdp->dat2 >> 0) & 0xff);
@@ -1259,7 +1259,7 @@ static void audio_state_channel2 (int nr, bool perfin)
                return;
        }
 
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr) && old_dma != chan_ena) {
                write_log (L"%d:DMA=%d IRQ=%d PC=%08x\n", nr, chan_ena, isirq (nr) ? 1 : 0, M68K_GETPC);
        }
@@ -1282,10 +1282,10 @@ static void audio_state_channel2 (int nr, bool perfin)
                                // normal hardware behavior: latch it after first DMA fetch comes
                                cdp->dsr = true;
                        }
-#ifdef TEST_AUDIO
+#if TEST_AUDIO > 0
                        cdp->have_dat = false;
 #endif
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
                        if (debugchannel (nr))
                                write_log (L"%d:0>1: LEN=%d PC=%08x\n", nr, cdp->wlen, M68K_GETPC);
 #endif
@@ -1314,8 +1314,8 @@ static void audio_state_channel2 (int nr, bool perfin)
                }
                if (!cdp->dat_written)
                        return;
-#ifdef TEST_AUDIO
-               if (!cdp->have_dat)
+#if TEST_AUDIO > 0
+               if (debugchannel (nr) && !cdp->have_dat)
                        write_log (L"%d: state 1 but no have_dat\n", nr);
                cdp->have_dat = false;
                cdp->losample = cdp->hisample = false;
@@ -1334,7 +1334,7 @@ static void audio_state_channel2 (int nr, bool perfin)
                }
                if (!cdp->dat_written)
                        return;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
                if (debugchannel (nr))
                        write_log (L"%d:>5: LEN=%d PT=%08X PC=%08X\n", nr, cdp->wlen, cdp->pt, M68K_GETPC);
 #endif
@@ -1349,8 +1349,8 @@ static void audio_state_channel2 (int nr, bool perfin)
                break;
        case 2:
                if (cdp->pbufldl) {
-#ifdef TEST_AUDIO
-                       if (cdp->hisample == false)
+#if TEST_AUDIO > 0
+                       if (debugchannel (nr) && cdp->hisample == false)
                                write_log (L"%d: high sample used twice\n", nr);
                        cdp->hisample = false;
 #endif
@@ -1377,8 +1377,8 @@ static void audio_state_channel2 (int nr, bool perfin)
                break;
        case 3:
                if (cdp->pbufldl) {
-#ifdef TEST_AUDIO
-                       if (cdp->losample == false)
+#if TEST_AUDIO > 0
+                       if (debugchannel (nr) && cdp->losample == false)
                                write_log (L"%d: low sample used twice\n", nr);
                        cdp->losample = false;
 #endif
@@ -1395,9 +1395,9 @@ static void audio_state_channel2 (int nr, bool perfin)
                                setdr (nr);
                } else {
                        if (isirq (nr)) {
-#ifdef DEBUG_AUDIO
-                       if (debugchannel (nr))
-                               write_log (L"%d: IDLE\n", nr);
+#if DEBUG_AUDIO > 0
+                               if (debugchannel (nr))
+                                       write_log (L"%d: IDLE\n", nr);
 #endif                 
                                zerostate (nr);
                                return;
@@ -1776,16 +1776,16 @@ void AUDxDAT (int nr, uae_u16 v, uaecptr addr)
        struct audio_channel_data *cdp = audio_channel + nr;
        int chan_ena = (dmacon & DMA_MASTER) && (dmacon & (1 << nr));
 
-#ifdef DEBUG_AUDIO
-       if (debugchannel (nr) && (!chan_ena || addr == 0xffffffff || (cdp->state != 2 && cdp->state != 3)))
+#if DEBUG_AUDIO > 0
+       if (debugchannel (nr) && (DEBUG_AUDIO > 1 || (!chan_ena || addr == 0xffffffff || (cdp->state != 2 && cdp->state != 3))))
                write_log (L"AUD%dDAT: %04X ADDR=%08X LEN=%d/%d %d,%d,%d %06X\n", nr,
                v, addr, cdp->wlen, cdp->len, cdp->state, chan_ena, isirq (nr) ? 1 : 0, M68K_GETPC);
 #endif
        cdp->dat = v;
        cdp->dat_written = true;
-#ifdef TEST_AUDIO
-       if (cdp->have_dat)
-               write_log (L"%d: audxdat but old dat not yet used\n", nr);
+#if TEST_AUDIO > 0
+       if (debugchannel (nr) && cdp->have_dat)
+               write_log (L"%d: audxdat 1=%04x 2=%04x but old dat not yet used\n", nr, cdp->dat, cdp->dat2);
        cdp->have_dat = true;
 #endif
        if (cdp->state == 2 || cdp->state == 3) {
@@ -1795,7 +1795,7 @@ void AUDxDAT (int nr, uae_u16 v, uaecptr addr)
                                cdp->intreq2 = true;
                                if (sampleripper_enabled)
                                        do_samplerip (cdp);
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
                                if (debugchannel (nr))
                                        write_log (L"AUD%d looped, IRQ=%d, LC=%08X LEN=%d\n", nr, isirq (nr) ? 1 : 0, cdp->pt, cdp->wlen);
 #endif
@@ -1817,7 +1817,7 @@ void AUDxDAT (int nr, uae_u16 v)
        AUDxDAT (nr, v, 0xffffffff);
 }
 
-uaecptr audio_getpt (int nr, int reset)
+uaecptr audio_getpt (int nr, bool reset)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
        uaecptr p = cdp->pt;
@@ -1833,7 +1833,7 @@ void AUDxLCH (int nr, uae_u16 v)
        audio_activate ();
        update_audio ();
        cdp->lc = (cdp->lc & 0xffff) | ((uae_u32)v << 16);
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr))
                write_log (L"AUD%dLCH: %04X %08X\n", nr, v, M68K_GETPC);
 #endif
@@ -1845,7 +1845,7 @@ void AUDxLCL (int nr, uae_u16 v)
        audio_activate ();
        update_audio ();
        cdp->lc = (cdp->lc & ~0xffff) | (v & 0xFFFE);
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr))
                write_log (L"AUD%dLCL: %04X %08X\n", nr, v, M68K_GETPC);
 #endif
@@ -1854,10 +1854,12 @@ void AUDxLCL (int nr, uae_u16 v)
 void AUDxPER (int nr, uae_u16 v)
 {
        struct audio_channel_data *cdp = audio_channel + nr;
-       unsigned long per = v * CYCLE_UNIT;
+       unsigned long per;
 
        audio_activate ();
        update_audio ();
+
+       per = v * CYCLE_UNIT;
        if (per == 0)
                per = PERIOD_MAX - 1;
 
@@ -1877,11 +1879,11 @@ void AUDxPER (int nr, uae_u16 v)
                        events_schedule ();
                }
        }
-#ifdef TEST_AUDIO
+#if TEST_AUDIO > 0
        cdp->per_original = v;
 #endif
        cdp->per = per;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr))
                write_log (L"AUD%dPER: %d %08X\n", nr, v, M68K_GETPC);
 #endif
@@ -1893,7 +1895,7 @@ void AUDxLEN (int nr, uae_u16 v)
        audio_activate ();
        update_audio ();
        cdp->len = v;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr))
                write_log (L"AUD%dLEN: %d %08X\n", nr, v, M68K_GETPC);
 #endif
@@ -1906,7 +1908,7 @@ void AUDxVOL (int nr, uae_u16 v)
        audio_activate ();
        update_audio ();
        cdp->vol = v2;
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
        if (debugchannel (nr))
                write_log (L"AUD%dVOL: %d %08X\n", nr, v2, M68K_GETPC);
 #endif
@@ -1923,7 +1925,7 @@ void audio_update_adkmasks (void)
        audio_channel[3].adk_mask = (((t >> 3) & 1) - 1);
        if ((prevcon & 0xff) != (adkcon & 0xff)) {
                audio_activate ();
-#ifdef DEBUG_AUDIO
+#if DEBUG_AUDIO > 0
                write_log (L"ADKCON=%02x %08X\n", adkcon & 0xff, M68K_GETPC);
 #endif
                prevcon = adkcon;

diff --git a/blkdev.cpp b/blkdev.cpp
index 68d988e985d863bfbad4f96ab8c219fb7c988eda..5ecdcef94b8ac4726d089223116af633c49a4ae7 100644 (file)
--- a/blkdev.cpp
+++ b/blkdev.cpp
@@ -554,11 +554,15 @@ void blkdev_vsync (void)
 
 static int do_scsi (int unitnum, uae_u8 *cmd, int cmdlen)
 {
-       return 0;
+       uae_u8 *p = device_func[unitnum]->exec_out (unitnum, cmd, cmdlen);
+       return p != NULL;
 }
 static int do_scsi (int unitnum, uae_u8 *cmd, int cmdlen, uae_u8 *out, int outsize)
 {
-       return 0;
+       uae_u8 *p = device_func[unitnum]->exec_in (unitnum, cmd, cmdlen, &outsize);
+       if (p)
+               memcpy (out, p, outsize);
+       return p != NULL;
 }
 
 static int failunit (int unitnum)
@@ -730,9 +734,6 @@ int sys_command_cd_read (int unitnum, uae_u8 *data, int block, int size)
                return 0;
        if (device_func[unitnum]->read == NULL) {
                uae_u8 cmd[12] = { 0xbe, 0, block >> 24, block >> 16, block >> 8, block >> 0, size >> 16, size >> 8, size >> 0, 0x10, 0, 0 };
-               cmd[1] = 2 << 3; // 2048
-               if (!do_scsi (unitnum, cmd, sizeof cmd, data, size * 2048))
-                       cmd[1] = 4 << 3; // 2048 mode2
                v = do_scsi (unitnum, cmd, sizeof cmd, data, size * 2048);
        } else {
                v = device_func[unitnum]->read (unitnum, data, block, size);
@@ -937,13 +938,13 @@ void scsi_log_before (uae_u8 *cdb, int cdblen, uae_u8 *data, int datalen)
 {
        int i;
        for (i = 0; i < cdblen; i++) {
-               write_log (L"%s%02X", i > 0 ? "." : "", cdb[i]);
+               write_log (L"%s%02X", i > 0 ? L"." : L"", cdb[i]);
        }
        write_log (L"\n");
        if (data) {
                write_log (L"DATAOUT: %d\n", datalen);
                for (i = 0; i < datalen && i < 100; i++)
-                       write_log (L"%s%02X", i > 0 ? "." : "", data[i]);
+                       write_log (L"%s%02X", i > 0 ? L"." : L"", data[i]);
                if (datalen > 0)
                        write_log (L"\n");
        }
@@ -954,13 +955,13 @@ void scsi_log_after (uae_u8 *data, int datalen, uae_u8 *sense, int senselen)
        int i;
        write_log (L"DATAIN: %d\n", datalen);
        for (i = 0; i < datalen && i < 100 && data; i++)
-               write_log (L"%s%02X", i > 0 ? "." : "", data[i]);
+               write_log (L"%s%02X", i > 0 ? L"." : L"", data[i]);
        if (data && datalen > 0)
                write_log (L"\n");
        if (senselen > 0) {
                write_log (L"SENSE: %d,", senselen);
                for (i = 0; i < senselen && i < 32; i++) {
-                       write_log (L"%s%02X", i > 0 ? "." : "", sense[i]);
+                       write_log (L"%s%02X", i > 0 ? L"." : L"", sense[i]);
                }
                write_log (L"\n");
        }
@@ -1470,6 +1471,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                                        goto errreq;
                                start = toc->toc[toc->first_track_offset + start].paddress;
                        }
+                       sys_command_cd_pause (unitnum, 0);
                        sys_command_cd_play (unitnum, start, end, scan);
                        scsi_len = 0;
                }
@@ -1490,6 +1492,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                                goto errreq;
                        int start = toc->toc[toc->first_track_offset + strack - 1].paddress;
                        int end = etrack == toc->last_track ? toc->lastaddress : toc->toc[toc->first_track_offset + etrack - 1 + 1].paddress;
+                       sys_command_cd_pause (unitnum, 0);
                        if (!sys_command_cd_play (unitnum, start, end, 0))
                                goto notdatatrack;
                        scsi_len = 0;
@@ -1511,6 +1514,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                        if (end > di.toc.lastaddress)
                                end = di.toc.lastaddress;
                        if (len > 0) {
+                               sys_command_cd_pause (unitnum, 0);
                                if (!sys_command_cd_play (unitnum, start, start + len, 0))
                                        goto notdatatrack;
                        }
@@ -1534,6 +1538,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                        if (start > end)
                                goto errreq;
                        if (start < end)
+                               sys_command_cd_pause (unitnum, 0);
                                if (!sys_command_cd_play (unitnum, start, end, 0))
                                        goto notdatatrack;
                        scsi_len = 0;
@@ -1546,7 +1551,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                                goto nodisk;
                        int start = rl (cmdbuf + 2);
                        int len;
-                       if (cmd= 0xa5)
+                       if (cmd = 0xa5)
                                len = rl (cmdbuf + 6);
                        else
                                len = rw (cmdbuf + 7);
@@ -1559,6 +1564,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                                int end = start + len;
                                if (end > di.toc.lastaddress)
                                        end = di.toc.lastaddress;
+                               sys_command_cd_pause (unitnum, 0);
                                if (!sys_command_cd_play (unitnum, start, end, 0))
                                        goto notdatatrack;
                        }
@@ -1583,6 +1589,7 @@ static int scsi_emulate (int unitnum, uae_u8 *cmdbuf, int scsi_cmd_len,
                        if (start > end)
                                goto errreq;
                        if (start < end) {
+                               sys_command_cd_pause (unitnum, 0);
                                if (!sys_command_cd_play (unitnum, start, end, 0))
                                        goto notdatatrack;
                        }

diff --git a/blkdev_cdimage.cpp b/blkdev_cdimage.cpp
index 4c485dbca1034ab6269d8b5cb68e3c8cec3787de..6937e66f9571fb14fbadb16ace9f75aca0e723eb 100644 (file)
--- a/blkdev_cdimage.cpp
+++ b/blkdev_cdimage.cpp
@@ -447,8 +447,9 @@ static void *cdda_play_func (void *v)
                if (!cdu->cdda_play)
                        goto end;
 
-               if (idleframes <= 0 && !isaudiotrack (&cdu->di.toc, cdda_pos)) {
+               if (idleframes <= 0 && cdda_pos >= cdu->cdda_start && !isaudiotrack (&cdu->di.toc, cdda_pos)) {
                        setstate (cdu, AUDIO_STATUS_PLAY_ERROR);
+                       write_log (L"IMAGE CDDA: attempted to play data track %d\n", cdda_pos);
                        goto end; // data track?
                }
 
@@ -528,7 +529,7 @@ static void *cdda_play_func (void *v)
                }
 
                if (bufon[0] == 0 && bufon[1] == 0) {
-                       while (cdu->cdda_paused && cdu->cdda_play > 0)
+                       while (cdu->cdda_paused && cdu->cdda_play == oldplay)
                                Sleep (10);
                }
 

diff --git a/cfgfile.cpp b/cfgfile.cpp
index 6659af13e0a585f1445efd61af87cfa7a7083f38..a8d8ae26eb0527baf12e30f0a24703f6643744b1 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -3565,7 +3565,7 @@ void default_prefs (struct uae_prefs *p, int type)
        p->gfx_xcenter_pos = -1; p->gfx_ycenter_pos = -1;
        p->gfx_xcenter_size = -1; p->gfx_ycenter_size = -1;
        p->gfx_max_horizontal = RES_HIRES;
-       p->gfx_max_vertical = 1;
+       p->gfx_max_vertical = VRES_DOUBLE;
        p->color_mode = 2;
        p->gfx_blackerthanblack = 0;
        p->gfx_backbuffers = 2;

diff --git a/custom.cpp b/custom.cpp
index f53fae88ee8769fed2c035b20b15eeca40ea6fa2..6ea56076ac12074e72e376411a904022178df252 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -5321,7 +5321,7 @@ static void dmal_emu (uae_u32 v)
        if (v >= 6) {
                v -= 6;
                int nr = v / 2;
-               uaecptr pt = audio_getpt (nr, v & 1);
+               uaecptr pt = audio_getpt (nr, (v & 1) != 0);
                uae_u16 dat = chipmem_wget_indirect (pt);
 #ifdef DEBUGGER
                if (debug_dma)
@@ -5358,6 +5358,7 @@ static void dmal_func (uae_u32 v)
        dmal_emu (v);
        events_dmal (0);
 }
+
 static void dmal_func2 (uae_u32 v)
 {
        for (int i = 0; i < 6 + 8; i += 2) {
@@ -5386,7 +5387,7 @@ static void events_dmal (int hp)
        } else if (currprefs.cachesize) {
                dmal_func2 (0);
        } else {
-               event2_newevent2 (hp, 17, dmal_func2);
+               event2_newevent2 (hp, 13, dmal_func2);
        }
 }
 
@@ -5400,9 +5401,11 @@ static void events_dmal_hsync (void)
        if (!dmal)
                return;
        dmal_hpos = 0;
-       for (int i = 0; i < 6 + 8; i += 2) {
-               if (dmal & (3 << i)) {
-                       alloc_cycle_ext (i + 7, CYCLE_MISC);
+       if (currprefs.cpu_cycle_exact) {
+               for (int i = 0; i < 6 + 8; i += 2) {
+                       if (dmal & (3 << i)) {
+                               alloc_cycle_ext (i + 7, CYCLE_MISC);
+                       }
                }
        }
        events_dmal (7);
@@ -5532,7 +5535,6 @@ static void hsync_handler_post (bool isvsync)
                CIA_vsync_posthandler (ciasyncs);
        }
 
-
        if (vpos == equ_vblank_endline + 1 && lof_current != lof_store) {
                // argh, line=0 field decision was wrong, someone did
                // something stupid and changed LOF

diff --git a/debug.cpp b/debug.cpp
index 074ba5d65ed28ccd6210b0336d2b582783d865ef..93bcf23ba5f50a58e4831414469cb902b8dc9d2d 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -34,6 +34,7 @@
 #include "crc32.h"
 #include "cpummu.h"
 #include "rommgr.h"
+#include "inputrecord.h"
 
 int debugger_active;
 static uaecptr skipaddr_start, skipaddr_end;
@@ -1013,6 +1014,8 @@ static void decode_dma_record (int hpos, int vpos, int toggle, bool logfile)
 }
 void log_dma_record (void)
 {
+       if (!input_record && !input_play)
+               return;
        if (!debug_dma)
                debug_dma = 1;
        decode_dma_record (0, 0, 0, true);
@@ -2466,12 +2469,72 @@ static void show_exec_tasks (void)
        }
 }
 
+static uaecptr get_base (const uae_char *name)
+{
+       uaecptr v = get_long (4);
+       addrbank *b = &get_mem_bank(v);
+
+       if (!b || !b->check (v, 400) || b->flags != ABFLAG_RAM)
+               return 0;
+       v += 378; // liblist
+       while (v = get_long (v)) {
+               uae_u32 v2;
+               uae_u8 *p;
+               b = &get_mem_bank (v);
+               if (!b || !b->check (v, 32) || b->flags != ABFLAG_RAM)
+                       goto fail;
+               v2 = get_long (v + 10); // name
+               b = &get_mem_bank (v2);
+               if (!b || !b->check (v2, 20))
+                       goto fail;
+               if (b->flags != ABFLAG_ROM && b->flags != ABFLAG_RAM)
+                       return 0;
+               p = b->xlateaddr (v2);
+               if (!memcmp (p, name, strlen (name) + 1))
+                       return v;
+       }
+       return 0;
+fail:
+       return 0xffffffff;
+}
+
+static TCHAR *getfrombstr(uaecptr pp)
+{
+       uae_u8 *p = get_real_address ((uaecptr)(pp << 2));
+       TCHAR *s = xmalloc (TCHAR, p[0] + 1);
+       return au_copy (s, p[0] + 1, (char*)p + 1);
+}
+
 static void show_exec_lists (TCHAR t)
 {
        uaecptr execbase = get_long (4);
        uaecptr list = 0, node;
 
-       if (_totupper (t) == 'I') {
+       if (_totupper (t) == 'O') { // doslist
+               uaecptr dosbase = get_base ("dos.library");
+               if (dosbase) {
+                       uaecptr rootnode = get_long (dosbase + 34);
+                       uaecptr dosinfo = get_long (rootnode + 24) << 2;
+                       uaecptr doslist = get_long (dosinfo + 4) << 2;
+                       while (doslist) {
+                               int type = get_long (doslist + 4);
+                               uaecptr msgport = get_long (doslist + 8);
+                               TCHAR *name = getfrombstr (get_long (doslist + 40));
+                               console_out_f (L"%08x: %d %08x '%s'\n", doslist, type, msgport, name);
+                               if (type == 0) {
+                                       console_out_f (L" - H=%08x Stack=%5d Pri=%2d Start=%08x Seg=%08x GV=%08x\n",
+                                               get_long (doslist + 16) << 2, get_long (doslist + 20),
+                                               get_long (doslist + 24), get_long (doslist + 28),
+                                               get_long (doslist + 32) << 2, get_long (doslist + 36));
+                               }
+                               xfree (name);
+                               doslist = get_long (doslist) << 2;
+                       }
+               } else {
+                       console_out_f (L"can't find dos.library\n");
+               }
+               return;
+       } else if (_totupper (t) == 'I') { // interrupts
                static const int it[] = {  1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0 };
                static const int it2[] = { 1, 1, 1, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 6, 6, 7 };
                list = execbase + 84;

diff --git a/include/audio.h b/include/audio.h
index c1cd3b67545b2e085e742671340c7d467cc83079..030629a6fa51ef7473b2d5c61a0d901839051707 100644 (file)
--- a/include/audio.h
+++ b/include/audio.h
@@ -23,7 +23,7 @@ extern void AUDxLEN (int nr, uae_u16 value);
 
 extern uae_u16 audio_dmal (void);
 extern void audio_state_machine (void);
-extern uaecptr audio_getpt (int nr, int reset);
+extern uaecptr audio_getpt (int nr, bool reset);
 
 extern int init_audio (void);
 extern void ahi_install (void);

diff --git a/include/custom.h b/include/custom.h
index 655c35399d6242bfcf6d219d9e16067bf20316bc..a4304bc9af13cec60412966709c2c0f8ae4c073e 100644 (file)
--- a/include/custom.h
+++ b/include/custom.h
@@ -170,6 +170,7 @@ extern int xbluecolor_s, xbluecolor_b, xbluecolor_m;
 #define RES_MAX 2
 #define VRES_NONDOUBLE 0
 #define VRES_DOUBLE 1
+#define VRES_QUAD 2
 #define VRES_MAX 1
 
 /* calculate shift depending on resolution (replaced "decided_hires ? 4 : 8") */

diff --git a/include/events.h b/include/events.h
index 40b4c1ba8294f0d54a451424ba55abfa53aa4e41..8f41d7dda7a9b62dbc29aa1d199194ea2aedccf3 100644 (file)
--- a/include/events.h
+++ b/include/events.h
@@ -50,7 +50,7 @@ struct ev2
 };
 
 enum {
-    ev_hsync, ev_audio, ev_cia, ev_misc,
+    ev_hsync, ev_cia, ev_misc, ev_audio,
     ev_max
 };
 

diff --git a/main.cpp b/main.cpp
index 953c592cf610ce30a7ed7c121028df540240c3fc..7212e2def73a7c6711ce4a725182ec4039714d8c 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -568,7 +568,12 @@ static void parse_cmdline (int argc, TCHAR **argv)
                        exit (0);
                } else if (_tcsncmp (argv[i], L"-cdimage=", 9) == 0) {
                        TCHAR *txt = parsetextpath (argv[i] + 9);
-                       cfgfile_parse_option (&currprefs, L"cdimage0", txt, 0);
+                       TCHAR *txt2 = xmalloc(TCHAR, _tcslen(txt) + 2);
+                       _tcscpy(txt2, txt);
+                       if (_tcsrchr(txt2, ',') != NULL)
+                               _tcscat(txt2, L",");
+                       cfgfile_parse_option (&currprefs, L"cdimage0", txt2, 0);
+                       xfree(txt2);
                        xfree (txt);
                } else {
                        if (argv[i][0] == '-' && argv[i][1] != '\0') {

diff --git a/newcpu.cpp b/newcpu.cpp
index bd3e2c9cafced3f1b2be5c233c43f3a1c083c2ec..85876c76c60ca073c96ca9ba946abade461175c3 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -9,6 +9,7 @@
 #define MOVEC_DEBUG 0
 #define MMUOP_DEBUG 2
 #define DEBUG_CD32CDTVIO 0
+#define EXCEPTION3_DEBUG 0
 
 #include "sysconfig.h"
 #include "sysdeps.h"
@@ -5060,7 +5061,9 @@ static void exception3f (uae_u32 opcode, uaecptr addr, int writeaccess, int inst
        last_writeaccess_for_exception_3 = writeaccess;
        last_instructionaccess_for_exception_3 = instructionaccess;
        Exception (3);
-       //activate_debugger();
+#if EXCEPTION3_DEBUG
+       activate_debugger();
+#endif
 }
 
 void exception3 (uae_u32 opcode, uaecptr addr)

diff --git a/od-win32/blkdev_win32_ioctl.cpp b/od-win32/blkdev_win32_ioctl.cpp
index 7126a83601d082dc95f5895df5842adff8c7de55..ce98340972e2521887b5950304bd022cfa4e9081 100644 (file)
--- a/od-win32/blkdev_win32_ioctl.cpp
+++ b/od-win32/blkdev_win32_ioctl.cpp
@@ -489,6 +489,7 @@ static void *cdda_play (void *v)
        int i;
        int oldplay;
        int idleframes;
+       int muteframes;
        int readblocksize = 2352 + 96;
 
        while (ciw->cdda_play == 0)
@@ -510,6 +511,7 @@ static void *cdda_play (void *v)
 
                if (oldplay != ciw->cdda_play) {
                        idleframes = 0;
+                       muteframes = 0;
                        bool seensub = false;
                        struct _timeb tb1, tb2;
                        _ftime (&tb1);
@@ -525,7 +527,10 @@ static void *cdda_play (void *v)
                                idleframes = -1;
                        }
                        // force spin up
-                       read_block (ciw, -1, cda->buffers[bufnum], cdda_pos, num_sectors, readblocksize);
+                       if (isaudiotrack (&ciw->di.toc, cdda_pos))
+                               read_block (ciw, -1, cda->buffers[bufnum], cdda_pos, num_sectors, readblocksize);
+                       if (!isaudiotrack (&ciw->di.toc, cdda_pos - 150))
+                               muteframes = 75;
 
                        if (ciw->cdda_scan == 0) {
                                // find possible P-subchannel=1 and fudge starting point so that
@@ -533,7 +538,7 @@ static void *cdda_play (void *v)
                                bool seenindex = false;
                                for (int sector = cdda_pos - 200; sector < cdda_pos; sector++) {
                                        uae_u8 *dst = cda->buffers[bufnum];
-                                       if (sector >= 0 && read_block (ciw, -1, dst, sector, 1, readblocksize)) {
+                                       if (sector >= 0 && isaudiotrack (&ciw->di.toc, sector) && read_block (ciw, -1, dst, sector, 1, readblocksize)) {
                                                uae_u8 subbuf[SUB_CHANNEL_SIZE];
                                                sub_deinterleave (dst + 2352, subbuf);
                                                if (seenindex) {
@@ -573,8 +578,9 @@ static void *cdda_play (void *v)
 
                if ((cdda_pos < ciw->cdda_end || ciw->cdda_end == 0xffffffff) && !ciw->cdda_paused && ciw->cdda_play) {
 
-                       if (idleframes <= 0 && !isaudiotrack (&ciw->di.toc, cdda_pos)) {
+                       if (idleframes <= 0 && cdda_pos >= ciw->cdda_start && !isaudiotrack (&ciw->di.toc, cdda_pos)) {
                                setstate (ciw, AUDIO_STATUS_PLAY_ERROR);
+                               write_log (L"IOCTL: attempted to play data track %d\n", cdda_pos);
                                goto end; // data track?
                        }
 
@@ -599,6 +605,10 @@ static void *cdda_play (void *v)
                        }
 
                        for (i = 0; i < num_sectors; i++) {
+                               if (muteframes > 0) {
+                                       memset (cda->buffers[bufnum] + 2352 * i, 0, 2352);
+                                       muteframes--;
+                               }
                                if (idleframes > 0) {
                                        idleframes--;
                                        memset (cda->buffers[bufnum] + 2352 * i, 0, 2352);
@@ -623,7 +633,7 @@ static void *cdda_play (void *v)
 
                        bufon[bufnum] = 1;
                        cda->setvolume (currprefs.sound_volume, ciw->cdda_volume[0], ciw->cdda_volume[1]);
-                       if (!cda->play(bufnum)) {
+                       if (!cda->play (bufnum)) {
                                setstate (ciw, AUDIO_STATUS_PLAY_ERROR);
                                goto end; // data track?
                        }
@@ -650,7 +660,7 @@ static void *cdda_play (void *v)
                        }
                }
 
-               while (ciw->cdda_paused && ciw->cdda_play > 0)
+               while (ciw->cdda_paused && ciw->cdda_play == oldplay)
                        Sleep (10);
 
                bufnum = 1 - bufnum;

diff --git a/od-win32/blkdev_win32_spti.cpp b/od-win32/blkdev_win32_spti.cpp
index 8991b7bf92feefabc9ca8d23bebab35bb8318492..6b8e60f2954ad3300b8ff74238cccbd42ec1c612 100644 (file)
--- a/od-win32/blkdev_win32_spti.cpp
+++ b/od-win32/blkdev_win32_spti.cpp
@@ -198,6 +198,9 @@ static int execscsicmd_direct (int unitnum, struct amigascsi *as)
        swb.spt.Length = sizeof (SCSI_PASS_THROUGH);
        swb.spt.SenseInfoOffset = offsetof(SCSI_PASS_THROUGH_DIRECT_WITH_BUFFER, SenseBuf);
 
+       if (as->len > DEVICE_SCSI_BUFSIZE)
+               as->len = DEVICE_SCSI_BUFSIZE;
+
        uae_sem_wait (&scgp_sem);
 
        /* the Amiga does not tell us how long the timeout shall be, so make it _very_ long (specified in seconds) */
@@ -209,16 +212,20 @@ static int execscsicmd_direct (int unitnum, struct amigascsi *as)
        if (as->sense_len > 32)
                as->sense_len = 32;
        swb.spt.SenseInfoLength  = (as->flags & 4) ? 4 : /* SCSIF_OLDAUTOSENSE */
-               (as->flags & 2) ? as->sense_len : /* SCSIF_AUTOSENSE */
-               32;
+               (as->flags & 2) ? as->sense_len : /* SCSIF_AUTOSENSE */ 32;
        if (dev_info[unitnum].isatapi)
                scsi_atapi_fixup_pre (swb.spt.Cdb, &as->cmd_len, &scsi_datap, &as->len, &parm);
+
+       memcpy (di->scsibuf, scsi_datap, as->len);
+
        swb.spt.CdbLength = (UCHAR)as->cmd_len;
        swb.spt.DataTransferLength = as->len;
-       swb.spt.DataBuffer = scsi_datap;
+       swb.spt.DataBuffer = di->scsibuf;
 
        status = doscsi (di, unitnum, &swb, &err);
 
+       memcpy (scsi_datap, di->scsibuf, as->len);
+
        as->cmdactual = status == 0 ? 0 : scsi_cmd_len_orig; /* fake scsi_CmdActual */
        as->status = swb.spt.ScsiStatus; /* scsi_Status */
        if (swb.spt.ScsiStatus) {
@@ -274,7 +281,7 @@ static uae_u8 *execscsicmd_in (int unitnum, uae_u8 *data, int len, int *outlen)
        if (v == 0)
                return 0;
        if (outlen)
-               *outlen = v;
+               *outlen = v < *outlen ? v : *outlen;
        return di->scsibuf;
 }
 

diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index 58a9e337d74579c1a25c33bdda1865c40171dd02..49450f4db20c5c588550bb3f4a21e50c1c584108 100644 (file)
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -41,7 +41,7 @@ int rp_inputmode = 0;
 int log_rp = 1;
 static int rp_revision, rp_version, rp_build;
 static int max_horiz_dbl = RES_HIRES;
-static int max_vert_dbl = 1;
+static int max_vert_dbl = VRES_DOUBLE;
 
 static int default_width, default_height;
 static int hwndset;
@@ -287,7 +287,7 @@ static void fixup_size (struct uae_prefs *prefs)
        if (done)
                return;
        done = 1;
-
+       write_log(L"fixup_size(%d,%d)\n", prefs->gfx_xcenter_size, prefs->gfx_ycenter_size);
        if (prefs->gfx_xcenter_size > 0) {
                int hres = prefs->gfx_resolution;
                if (prefs->gfx_filter) {
@@ -295,8 +295,8 @@ static void fixup_size (struct uae_prefs *prefs)
                                hres += (1000 / prefs->gfx_filter_horiz_zoom_mult) - 1;
                        hres += uaefilters[prefs->gfx_filter].intmul - 1;
                }
-               if (hres > RES_MAX)
-                       hres = RES_MAX;
+               if (hres > max_horiz_dbl)
+                       hres = max_horiz_dbl;
                prefs->gfx_size_win.width = prefs->gfx_xcenter_size >> (RES_MAX - hres);
                prefs->gfx_filter_autoscale = 0;
        }
@@ -307,29 +307,50 @@ static void fixup_size (struct uae_prefs *prefs)
                                vres += (1000 / prefs->gfx_filter_vert_zoom_mult) - 1;
                        vres += uaefilters[prefs->gfx_filter].intmul - 1;
                }
-               if (vres > RES_MAX)
-                       vres = RES_MAX;
-               prefs->gfx_size_win.height = (prefs->gfx_ycenter_size * 2) >> (RES_MAX - vres);
+               if (vres > max_vert_dbl)
+                       vres = max_vert_dbl;
+               prefs->gfx_size_win.height = (prefs->gfx_ycenter_size * 2) >> (VRES_QUAD - vres);
                prefs->gfx_filter_autoscale = 0;
        }
+       write_log(L"-> %dx%d\n", prefs->gfx_size_win.width, prefs->gfx_size_win.height);
+}
+
+static int getmult(int mult)
+{
+       if (mult <= 1)
+               return 0;
+       if (mult == 2)
+               return 1;
+       if (mult == 4)
+               return 2;
+       return 0;
+}
+
+static int shift (int val, int shift)
+{
+       if (shift > 0)
+               val >>= shift;
+       else if (shift < 0)
+               val <<= -shift;
+       return val;
 }
 
+
 #define LORES_WIDTH 360
 #define LORES_HEIGHT 284
 static void get_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
 {
-       int hres;
        int m;
        int full = 0;
-       int vres = 0;
+       int hres, vres;
        int totalhdbl = -1, totalvdbl = -1;
+       int hmult, vmult;
 
        hres = p->gfx_resolution;
-       if (p->gfx_filter && p->gfx_filter_horiz_zoom_mult)
-               hres += (1000 / p->gfx_filter_horiz_zoom_mult) - 1;
-       if (hres > RES_MAX)
-               hres = RES_MAX;
-       vres = hres;
+       vres = p->gfx_vresolution;
+       hmult = 1000 / p->gfx_filter_horiz_zoom_mult;
+       vmult = 1000 / p->gfx_filter_vert_zoom_mult;
+
        m = RP_SCREENMODE_1X;
 
        if (WIN32GFX_IsPicassoScreen ()) {
@@ -344,35 +365,44 @@ static void get_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
 
                full = p->gfx_afullscreen;
 
-               if (hres == RES_HIRES)
-                       m = RP_SCREENMODE_2X;
-               if (hres == RES_SUPERHIRES)
-                       m = RP_SCREENMODE_4X;
-
                totalhdbl = hres;
                if (hres > max_horiz_dbl)
                        hres = max_horiz_dbl;
+               hres += getmult (hmult);
+
                totalvdbl = vres;
                if (vres > max_vert_dbl)
                        vres = max_vert_dbl;
+               vres += getmult (vmult);
+
+               if (hres > RES_SUPERHIRES)
+                       hres = RES_SUPERHIRES;
+               if (vres > VRES_QUAD)
+                       vres = VRES_QUAD;
+
+               if (hres == RES_HIRES)
+                       m = RP_SCREENMODE_2X;
+               else if (hres >= RES_SUPERHIRES)
+                       m = RP_SCREENMODE_4X;
 
                if (log_rp)
-                       write_log (L"GET_RPSM: hres=%d (%d) vres=%d (%d) full=%d xcpos=%d ycpos=%d w=%d h=%d\n",
+                       write_log (L"GET_RPSM: hres=%d (%d) vres=%d (%d) full=%d xcpos=%d ycpos=%d w=%d h=%d vm=%d hm=%d\n",
                                totalhdbl, hres, totalvdbl, vres, full,
                                p->gfx_xcenter_pos,  p->gfx_ycenter_pos,
-                               p->gfx_size_win.width, p->gfx_size_win.height);
+                               p->gfx_size_win.width, p->gfx_size_win.height,
+                               hmult, vmult);
+
                sm->lClipLeft = p->gfx_xcenter_pos < 0 ? -1 : p->gfx_xcenter_pos;
                sm->lClipTop = p->gfx_ycenter_pos < 0 ? -1 : p->gfx_ycenter_pos;
+
                if (full) {
                        sm->lClipWidth = LORES_WIDTH << RES_MAX;
-                       sm->lClipHeight = LORES_HEIGHT << 1;
+                       sm->lClipHeight = LORES_HEIGHT << VRES_MAX;
                } else {
-                       sm->lClipWidth = p->gfx_size_win.width << (RES_MAX - totalhdbl);
-                       if (totalvdbl == 2)
-                               sm->lClipHeight = p->gfx_size_win.height >> 1;
-                       else
-                               sm->lClipHeight = p->gfx_size_win.height << (1 - totalvdbl);
+                       sm->lClipWidth = shift (p->gfx_size_win.width, -(RES_MAX - hres));
+                       sm->lClipHeight = shift (p->gfx_size_win.height, -(VRES_MAX - vres));
                }
+
                if (full && p->gfx_filter && p->gfx_filter_horiz_zoom_mult == 0)
                        m = RP_SCREENMODE_XX;
                if (p->gfx_filter_scanlines || p->gfx_scanlines)
@@ -392,23 +422,14 @@ static void get_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
                        totalhdbl, hres, totalvdbl, vres, p->gfx_display, full);
 }
 
-
-static int shift (int val, int shift)
-{
-       if (shift > 0)
-               val >>= shift;
-       else if (shift < 0)
-               val <<= -shift;
-       return val;
-}
-
 static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
 {
        int smm = RP_SCREENMODE_MODE (sm->dwScreenMode);
        int display = RP_SCREENMODE_DISPLAY (sm->dwScreenMode);
        int fs = 0;
-       int hdbl = 1, vdbl = 1;
+       int hdbl = RES_HIRES, vdbl = VRES_DOUBLE;
        int hres, vres;
+       int hmult = 1, vmult = 1;
        struct MultiDisplay *disp;
 
        minimized = 0;
@@ -428,31 +449,32 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
 
        if (!WIN32GFX_IsPicassoScreen ()) {
 
-               hdbl = smm;
-               if (smm == RP_SCREENMODE_3X)
+               hdbl = RES_LORES;
+               vdbl = VRES_NONDOUBLE;
+               if (smm == RP_SCREENMODE_2X || smm == RP_SCREENMODE_3X) {
                        hdbl = RES_HIRES;
-               if (smm == RP_SCREENMODE_4X)
+                       vdbl = VRES_DOUBLE;
+               } else if (smm == RP_SCREENMODE_4X) {
                        hdbl = RES_SUPERHIRES;
+                       vdbl = VRES_DOUBLE;
+               }
                if (smm > RP_SCREENMODE_4X || smm == RP_SCREENMODE_XX) {
                        hdbl = max_horiz_dbl;
                        vdbl = max_vert_dbl;
                }
 
-               if (hdbl == RES_LORES) {
-                       vdbl = 0;
-               } else {
-                       vdbl = 1;
-                       if (hdbl == RES_SUPERHIRES)
-                               vdbl = 2;
-               }
-
                hres = hdbl;
-               if (hres > max_horiz_dbl)
+               if (hres > max_horiz_dbl) {
+                       hmult = 1 << (hres - max_horiz_dbl);
                        hres = max_horiz_dbl;
+               }
                p->gfx_resolution = hres;
+
                vres = vdbl;
-               if (vres > max_vert_dbl)
+               if (vres > max_vert_dbl) {
+                       vmult = 1 << (vres - max_vert_dbl);
                        vres = max_vert_dbl;
+               }
                p->gfx_vresolution = vres;
 
                if (sm->lClipWidth <= 0)
@@ -463,10 +485,7 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
                if (sm->lClipHeight <= 0) {
                        p->gfx_size_win.height = shift (LORES_HEIGHT, -vdbl);
                } else {
-                       if (vdbl == 2)
-                               p->gfx_size_win.height = sm->lClipHeight * 2;
-                       else
-                               p->gfx_size_win.height = shift (sm->lClipHeight, 1 - vdbl);
+                       p->gfx_size_win.height = sm->lClipHeight >> (VRES_MAX - vdbl);
                }
 
                if (fs == 1) {
@@ -477,13 +496,6 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
                        p->gfx_size_fs.height = disp->rect.bottom - disp->rect.top;
                }
 
-               //p->gfx_filter = rp_filter_default;
-               p->gfx_filter_horiz_zoom_mult = 1000;
-               p->gfx_filter_vert_zoom_mult = 1000;
-               if (log_rp)
-                       write_log (L"WW=%d WH=%d FW=%d FH=%d\n",
-                               p->gfx_size_win.width, p->gfx_size_win.height,
-                               p->gfx_size_fs.width, p->gfx_size_fs.height);
                if (fs) {
                        if (smm == RP_SCREENMODE_XX) {
                                p->gfx_filter = rp_filter;
@@ -503,8 +515,7 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
                                }
                                if (mult > 1 || fs == 2) {
                                        p->gfx_filter = rp_filter;
-                                       p->gfx_filter_horiz_zoom_mult = 1000 / mult;
-                                       p->gfx_filter_vert_zoom_mult = 1000 / mult;
+                                       hmult = vmult = mult;
                                }
                        }
                }
@@ -523,14 +534,20 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
 #endif
        p->gfx_xcenter_pos = sm->lClipLeft;
        p->gfx_ycenter_pos = sm->lClipTop;
-       p->gfx_xcenter_size = sm->lClipWidth;
-       p->gfx_ycenter_size = sm->lClipHeight;
+       if (sm->lClipWidth > 0)
+               p->gfx_xcenter_size = sm->lClipWidth;
+       if (sm->lClipHeight > 0)
+               p->gfx_ycenter_size = sm->lClipHeight;
 
        if (p->gfx_xcenter_pos >= 0 || p->gfx_ycenter_pos >= 0)
                p->gfx_filter_autoscale = AUTOSCALE_MANUAL;
        else
                p->gfx_filter_autoscale = AUTOSCALE_STATIC_NOMINAL;
 
+       //p->gfx_filter = rp_filter_default;
+       p->gfx_filter_horiz_zoom_mult = 1000 / hmult;
+       p->gfx_filter_vert_zoom_mult = 1000 / vmult;
+
        p->gfx_filter_scanlines = 0;
        p->gfx_scanlines = 0;
        if (sm->dwScreenMode & RP_SCREENMODE_SCANLINES) {
@@ -540,6 +557,13 @@ static void set_screenmode (struct RPScreenMode *sm, struct uae_prefs *p)
                p->gfx_filter_scanlineratio = (1 << 4) | 1;
        }
 
+       if (log_rp)
+               write_log (L"WW=%d WH=%d FW=%d FH=%d HM=%d VM=%d\n",
+                       p->gfx_size_win.width, p->gfx_size_win.height,
+                       p->gfx_size_fs.width, p->gfx_size_fs.height,
+                       p->gfx_filter_horiz_zoom_mult, p->gfx_filter_vert_zoom_mult);
+
+
        updatewinfsmode (p);
        hwndset = 0;
        config_changed = 1;
@@ -823,7 +847,6 @@ void rp_fixup_options (struct uae_prefs *p)
        rp_filter_default = rp_filter = currprefs.gfx_filter;
        if (rp_filter == 0)
                rp_filter = UAE_FILTER_NULL;
-       //p->gfx_api = 0;
 
        fixup_size (p);
        get_screenmode (&sm, p);

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 08ce54b7cf04516ba603e92c40e16052cfe973bd..499724610e627f8cec3f3fd939b540a8c782a384 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -18,8 +18,8 @@
 #define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
 
-#define WINUAEBETA L"7"
-#define WINUAEDATE MAKEBD(2010, 12, 6)
+#define WINUAEBETA L"8"
+#define WINUAEDATE MAKEBD(2010, 12, 18)
 #define WINUAEEXTRA L""
 #define WINUAEREV L""
 

diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
index e90718b4d0b114f9356012d086b29eb45cff1c20..f72417ae3c2667c5b1fe98426d45563a52386d23 100644 (file)
--- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
@@ -289,7 +289,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
       <AdditionalManifestDependencies>%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\Release/winuae.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
@@ -433,7 +433,7 @@
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
       <AdditionalManifestDependencies>%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;wininet.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>.\FullRelease/winuae.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 639f8826699fb459ce53adb6d0842a4218636509..89123ddcdce672f47f2a8da98a8bb8e9460edf23 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,15 @@
 
+Beta 8:
+
+- mixed mode CD first audio track didn't always play (uaescsi.device only)
+- some CD/DVD drives refuse to read MODE 2 Form 1 data tracks if "only read Mode 2 Form 1" sector type set. "Any type" works..
+- SCSI emulation CDA paused state should automatically unpause when play request arrives
+- most SCSI commands in uaescsi.device SPTI mode were broken since SCSI emulation was implemented..
+  (SCSI/CD audio changes should fix for example T-Zero and The Shadow of the Third Moon CDA problems)
+- comma in cdimage command line was incorrectly handled
+- audio pitch errors if audio period rate was near minimum audio DMA time (2.3.0)
+- added basic doslist debugger command ("To")
+
 Beta 7:
 
 - RTG board start address was not 16M aligned if Z3 fast board smaller than 16M was enabled (no functional difference)

diff --git a/scsiemul.cpp b/scsiemul.cpp
index 082d0df996b471fd2e174ae8aaace7a5999d1404..ea1232d2ade200f953dbb04b76d8652e3dc77155 100644 (file)
--- a/scsiemul.cpp
+++ b/scsiemul.cpp
@@ -521,7 +521,7 @@ static int dev_do_io (struct devstruct *dev, uaecptr request)
                return 0;
        command = get_word (request + 28);
 
-//     write_log (L"%d: CMD=%04X DATA=%08X LEN=%08X OFFSET=%08X ACTUAL=%08X\n",
+//     write_log (L"%d: DATA=%08X LEN=%08X OFFSET=%08X ACTUAL=%08X\n",
 //             command, io_data, io_length, io_offset, io_actual);
 
        switch (command)