Previous 15994 Revisions Next

r6141 Tuesday 20th October, 2009 at 03:31:51 UTC by Harmony
[CDI] Improved Sound Map support: [Harmony]
- Enabled sound effects by default
- Known issue(s):
- Sometimes game logic will flip out and attempt to DMA from a nonexistent RAM address, causing a crash - see Whack-A-Bubble in-game and Hotel Mario upon completing a level.
- Fixed issue(s):
- Zelda's voice no longer cuts out during the Wand of Gamelon tutorial
[src/mess/drivers]cdi.c

src/mess/drivers/cdi.c
r6140r6141
4545
4646#define ENABLE_UART_PRINTING (0)
4747
48#define VERBOSE_LEVEL   (6)
48#define VERBOSE_LEVEL   (5)
4949
5050#define ENABLE_VERBOSE_LOG (0)
5151
r6140r6141
966966
967967static int cdic_xa_last[4] = { 0, 0, 0, 0 };
968968
969INLINE int CDIC_IS_VALID_SAMPLE_BUF(UINT16 addr)
970{
971   UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
972   if(cdram8[2] != 0xff)
973   {
974      return 1;
975   }
976   return 0;
977}
978
979INLINE double CDIC_SAMPLE_BUF_FREQ(UINT16 addr)
980{
981   UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
982   switch(cdram8[2] & 0x3f)
983   {
984      case 0:
985      case 1:
986      case 16:
987      case 17:
988         return 37800.0f;
989
990      case 4:
991      case 5:
992         return 18900.0f;
993
994      default:
995         return 18900.0f;
996   }
997}
998
999INLINE int CDIC_SAMPLE_BUF_SIZE(UINT16 addr)
1000{
1001   UINT8 *cdram8 = ((UINT8*)cdram) + addr + 8;
1002   switch(cdram8[2] & 0x3f)
1003   {
1004      case 0:
1005      case 4:
1006         return 4;
1007
1008      case 1:
1009      case 5:
1010      case 16:
1011         return 2;
1012
1013      case 17:
1014         return 1;
1015
1016      default:
1017         return 2;
1018   }
1019}
1020
9691021INLINE INT16 clamp(INT16 in)
9701022{
9711023   return in;
r6140r6141
10641116         l3=cdic_xa_last[3];
10651117   int b=0;
10661118   int s=0;
1119   int decoded = 0;
10671120
10681121   for (b=0; b<18; b++)
10691122   {
r6140r6141
10961149            *dp++=d1;
10971150            l3=l2;
10981151            l2=d1;
1152            decoded += 2;
10991153         }
11001154      }
11011155
r6140r6141
11061160   cdic_xa_last[1]=l1;
11071161   cdic_xa_last[2]=l2;
11081162   cdic_xa_last[3]=l3;
1163
1164   //printf( "Decoded %d samples\n", decoded );
11091165}
11101166
11111167static void cdic_decode_xa_stereo8(const unsigned char *xa, signed short *dp)
r6140r6141
11721228   INT16 samples[18*28*16+16];
11731229   //FILE* temp_adpcm = fopen("temp_adpcm.bin","ab");
11741230
1231   //printf( "%02x\n", hdr[2] & 0x3f );
1232
11751233   if(hdr[2] == 0xff && triggered == 1)
11761234   {
1177      // Stop playing
1178      timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
1235      // Don't play
1236      //timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
1237      //fclose(temp_adpcm);
11791238      return;
11801239   }
11811240
1241   verboselog(machine, 0, "cdic_decode_audio_sector, got header type %02x\n", hdr[2] );
1242
11821243   //fseek(temp_adpcm, 0, SEEK_END);
1183   //printf( "%02x\n", hdr[2] & 0x3f );
11841244   switch(hdr[2] & 0x3f)   // ignore emphasis and reserved bits
11851245   {
11861246      case 0:
r6140r6141
12501310               break;
12511311            case 8:
12521312               cdic_decode_xa_mono8(hdr + 4, samples);
1253               //fwrite(samples, 1, 18*28*4, temp_adpcm);
12541313               for(index = 18*28*8 - 1; index >= 0; index--)
12551314               {
12561315                  samples[index*2 + 1] = samples[index];
r6140r6141
12681327               cdic_decode_xa_stereo(hdr + 4, samples);
12691328               samples[18*28*8 + 0] = samples[18*28*8 + 2] = samples[18*28*8 + 4] = samples[18*28*8 + 6] = samples[18*28*8 + 8] = samples[18*28*8 + 10] = samples[18*28*8 + 12] = samples[18*28*8 + 14] = samples[18*28*8 - 2];
12701329               samples[18*28*8 + 1] = samples[18*28*8 + 3] = samples[18*28*8 + 5] = samples[18*28*8 + 7] = samples[18*28*8 + 9] = samples[18*28*8 + 11] = samples[18*28*8 + 13] = samples[18*28*8 + 15] = samples[18*28*8 - 1];
1330               //fwrite(samples, 1, 18*28*4*cdic_regs.audio_sample_size, temp_adpcm);
12711331               break;
12721332            case 8:
12731333               cdic_decode_xa_stereo8(hdr + 4, samples);
r6140r6141
12861346// After an appropriate delay for decoding to take place...
12871347static TIMER_CALLBACK( audio_sample_trigger )
12881348{
1289   attotime period;
1349   if(cdic_regs.z_buffer & 0x2000)
1350   {
1351      // Indicate that data has been decoded
1352      verboselog(machine, 0, "Flagging that audio data has been decoded\n" );
1353      cdic_regs.audio_buffer |= 0x8000;
1354   }
12901355
1291   // Decode the data at Z+4, the same offset as a normal CD sector.
1292   cdic_decode_audio_sector(machine, ((UINT8*)cdram) + cdic_regs.z_buffer + 4, 1);
1356   // Set the CDIC interrupt line
1357   verboselog(machine, 0, "Setting CDIC interrupt line for soundmap decode\n" );
1358   cpu_set_input_line_vector(cputag_get_cpu(machine, "maincpu"), M68K_IRQ_4, 128);
1359   cputag_set_input_line(machine, "maincpu", M68K_IRQ_4, ASSERT_LINE);
12931360
1294   // Swap buffer positions to indicate our new buffer position at the next read
1295   cdic_regs.z_buffer = (cdic_regs.z_buffer == 0x2800) ? 0x3200 : 0x2800;
1361   if(CDIC_IS_VALID_SAMPLE_BUF(cdic_regs.z_buffer & 0x3ffe))
1362   {
1363      attotime period;
12961364
1297   //// Delay for Frequency * (18*28*2*size in bytes)
1298   period = attotime_mul(ATTOTIME_IN_HZ(cdic_regs.audio_sample_freq), 18*28*2*cdic_regs.audio_sample_size);
1365      verboselog(machine, 0, "Hit audio_sample_trigger, with cdic_regs.z_buffer == %04x, calling cdic_decode_audio_sector\n", cdic_regs.z_buffer );
12991366
1300   // Indicate that data has been decoded
1301   cdic_regs.audio_buffer |= 0x8000;
1367      // Decode the data at Z+4, the same offset as a normal CD sector.
1368      cdic_decode_audio_sector(machine, ((UINT8*)cdram) + (cdic_regs.z_buffer & 0x3ffe) + 4, 1);
13021369
1303   // Set the CDIC interrupt line
1304   //printf( "Setting CDIC interrupt line\n" );
1305   verboselog(machine, 0, "Setting CDIC interrupt line\n" );
1306   cpu_set_input_line_vector(cputag_get_cpu(machine, "maincpu"), M68K_IRQ_4, 128);
1307   cputag_set_input_line(machine, "maincpu", M68K_IRQ_4, ASSERT_LINE);
1370      // Swap buffer positions to indicate our new buffer position at the next read
1371      cdic_regs.z_buffer &= 0xfffe;
1372      cdic_regs.z_buffer += 0xa00;
1373      if(cdic_regs.z_buffer == 0x3c00)
1374      {
1375         cdic_regs.z_buffer = 0x2800;
1376      }
13081377
1309   // Request more data as necessary
1310   timer_adjust_oneshot(cdic_regs.audio_sample_timer, period, 0);
1311   //dmadac_enable(&dmadac[0], 2, 0);
1378      verboselog(machine, 0, "Updated cdic_regs.z_buffer, new value is %04x\n", cdic_regs.z_buffer );
1379
1380      //// Delay for Frequency * (18*28*2*size in bytes) before requesting more data
1381      verboselog(machine, 0, "Data is valid, setting up a new callback\n" );
1382      period = attotime_mul(ATTOTIME_IN_HZ(CDIC_SAMPLE_BUF_FREQ(cdic_regs.z_buffer & 0x3ffe)), 18*28*2*CDIC_SAMPLE_BUF_SIZE(cdic_regs.z_buffer & 0x3ffe));
1383      timer_adjust_oneshot(cdic_regs.audio_sample_timer, period, 0);
1384      //dmadac_enable(&dmadac[0], 2, 0);
1385   }
1386   else
1387   {
1388      cdic_regs.z_buffer &= 0xfffe;
1389      verboselog(machine, 0, "Data is not valid, stopping playback\n" );
1390      timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
1391   }
13121392}
13131393
13141394static TIMER_CALLBACK( cdic_trigger_readback_int )
r6140r6141
13921472         }
13931473
13941474         //printf( "%02x\n", buffer[CDIC_SECTOR_SUBMODE2] );
1395         if(((buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_FORM | CDIC_SUBMODE_DATA | CDIC_SUBMODE_AUDIO | CDIC_SUBMODE_VIDEO)) == (CDIC_SUBMODE_FORM | CDIC_SUBMODE_AUDIO)) &&
1396            (cdic_regs.channel & cdic_regs.audio_channel & (1 << buffer[CDIC_SECTOR_CHAN2])))
1475         if(((buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_FORM | CDIC_SUBMODE_DATA | CDIC_SUBMODE_AUDIO | CDIC_SUBMODE_VIDEO)) == (CDIC_SUBMODE_FORM | CDIC_SUBMODE_AUDIO)))
13971476         {
1477            cdic_regs.data_buffer &= 0x7fff;
1478            if(cdic_regs.channel & (1 << buffer[CDIC_SECTOR_CHAN2]))
1479            {
13981480            //if(!(buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_TRIG))
13991481            //{
14001482                verboselog(machine, 0, "Audio sector\n" );
14011483            //}
14021484            //else
14031485            //{
1404               cdic_regs.data_buffer |= 0x0004;
1486               //cdic_regs.data_buffer |= 0x0004;
14051487               cdic_regs.data_buffer ^= 0x0001;
14061488               for(index = 6; index < 2352/2; index++)
14071489               {
14081490                  cdram[(cdic_regs.data_buffer & 5) * (0xa00/2) + (index - 6)] = (buffer[index*2] << 8) | buffer[index*2 + 1];
14091491               }
14101492
1411               cdic_decode_audio_sector(machine, ((UINT8*)cdram) + ((cdic_regs.data_buffer & 5) * 0xa00 + 4), 0);
1412               // Ignore the audio sector for now.
1493               if(cdic_regs.audio_channel & (1 << buffer[CDIC_SECTOR_CHAN2]))
1494               {
1495                  cdic_decode_audio_sector(machine, ((UINT8*)cdram) + ((cdic_regs.data_buffer & 5) * 0xa00 + 4), 0);
1496               }
1497               //else
1498               {
1499                  //cdic_regs.data_buffer &= ~0x0004;
1500               }
1501
1502               //cdic_regs.audio_buffer |= 0x8000;
1503
14131504               cdic_regs.x_buffer |= 0x8000;
14141505
14151506               cdic_regs.data_buffer |= 0x4000;
1416               cdic_regs.data_buffer &= 0x7fff;
14171507
14181508               //printf( "Setting CDIC interrupt line\n" );
1419               verboselog(machine, 0, "Setting CDIC interrupt line\n" );
1509               verboselog(machine, 0, "Setting CDIC interrupt line for audio sector\n" );
14201510               cpu_set_input_line_vector(cputag_get_cpu(machine, "maincpu"), M68K_IRQ_4, 128);
14211511               cputag_set_input_line(machine, "maincpu", M68K_IRQ_4, ASSERT_LINE);
14221512            //}
1513            }
14231514         }
14241515         else if((buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_DATA | CDIC_SUBMODE_AUDIO | CDIC_SUBMODE_VIDEO)) == 0x00)
14251516         {
1517            cdic_regs.data_buffer &= 0x7fff;
14261518            cdic_regs.data_buffer &= ~0x0004;
14271519            cdic_regs.data_buffer ^= 0x0001;
14281520            for(index = 6; index < 2352/2; index++)
r6140r6141
14301522               cdram[(cdic_regs.data_buffer & 5) * (0xa00/2) + (index - 6)] = (buffer[index*2] << 8) | buffer[index*2 + 1];
14311523            }
14321524
1433            if((buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_TRIG) == CDIC_SUBMODE_TRIG || (buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_EOR | CDIC_SUBMODE_FORM)) == (CDIC_SUBMODE_EOR | CDIC_SUBMODE_FORM))
1434            {
1435               cdic_regs.x_buffer |= 0x8000;
1525            cdic_regs.x_buffer |= 0x8000;
14361526
1437               cdic_regs.data_buffer |= 0x4000;
1438               cdic_regs.data_buffer &= 0x7fff;
1527            cdic_regs.data_buffer |= 0x4000;
14391528
1529            if((buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_TRIG) == CDIC_SUBMODE_TRIG ||
1530               (buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_EOR) == CDIC_SUBMODE_EOR ||
1531               (buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_EOF) == CDIC_SUBMODE_EOF)
1532            {
14401533               //printf( "Setting CDIC interrupt line\n" );
1441               verboselog(machine, 0, "Setting CDIC interrupt line\n" );
1534               verboselog(machine, 0, "Setting CDIC interrupt line for message sector\n" );
14421535               cpu_set_input_line_vector(cputag_get_cpu(machine, "maincpu"), M68K_IRQ_4, 128);
14431536               cputag_set_input_line(machine, "maincpu", M68K_IRQ_4, ASSERT_LINE);
14441537            }
r6140r6141
14471540               verboselog(machine, 0, "Message sector, ignored\n" );
14481541            }
14491542         }
1450         else /*if(buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_DATA | CDIC_SUBMODE_VIDEO))*/
1543         else if((buffer[CDIC_SECTOR_FILE2] << 8) == cdic_regs.file) /*if(buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_DATA | CDIC_SUBMODE_VIDEO))*/
14511544         {
1545            cdic_regs.data_buffer &= 0x7fff;
1546
14521547            cdic_regs.x_buffer |= 0x8000;
14531548
14541549            cdic_regs.data_buffer |= 0x4000;
1455            cdic_regs.data_buffer &= 0x7fff;
14561550
14571551            cdic_regs.data_buffer &= ~0x0004;
14581552            cdic_regs.data_buffer ^= 0x0001;
r6140r6141
14621556            }
14631557
14641558            //printf( "Setting CDIC interrupt line\n" );
1465            verboselog(machine, 0, "Setting CDIC interrupt line\n" );
1559            verboselog(machine, 0, "Setting CDIC interrupt line for data sector\n" );
14661560            cpu_set_input_line_vector(cputag_get_cpu(machine, "maincpu"), M68K_IRQ_4, 128);
14671561            cputag_set_input_line(machine, "maincpu", M68K_IRQ_4, ASSERT_LINE);
14681562         }
r6140r6141
14731567         }
14741568         else
14751569         {
1476            cdic_regs.command = 0;
1570            //cdic_regs.command = 0;
14771571         }
14781572
14791573         break;
r6140r6141
14871581   }
14881582}
14891583
1490INLINE int CDIC_IS_VALID_SAMPLE_BUF(UINT16 addr)
1491{
1492   UINT8 *cdram8 = ((UINT8*)cdram) + addr + 4;
1493   if(cdram8[2] != 0xff)
1494   {
1495      return 1;
1496   }
1497   return 0;
1498}
1499
1500INLINE double CDIC_SAMPLE_BUF_FREQ(UINT16 addr)
1501{
1502   UINT8 *cdram8 = ((UINT8*)cdram) + addr + 4;
1503   switch(cdram8[2] & 0x3f)
1504   {
1505      case 0:
1506      case 1:
1507      case 16:
1508      case 17:
1509         return 37800.0f;
1510
1511      case 4:
1512      case 5:
1513         return 18900.0f;
1514
1515      default:
1516         return 18900.0f;
1517   }
1518}
1519
1520INLINE int CDIC_SAMPLE_BUF_SIZE(UINT16 addr)
1521{
1522   UINT8 *cdram8 = ((UINT8*)cdram) + addr + 4;
1523   switch(cdram8[2] & 0x3f)
1524   {
1525      case 0:
1526      case 4:
1527         return 4;
1528
1529      case 1:
1530      case 5:
1531      case 16:
1532         return 2;
1533
1534      case 17:
1535         return 1;
1536
1537      default:
1538         return 2;
1539   }
1540}
1541
15421584static READ16_HANDLER( cdic_r )
15431585{
15441586   offset += 0x3c00/2;
r6140r6141
15471589      case 0x3c00/2: // Command register
15481590         verboselog(space->machine, 0, "cdic_r: Command Register = %04x & %04x\n", cdic_regs.command, mem_mask);
15491591         return cdic_regs.command;
1592      case 0x3c02/2: // Time register (MSW)
1593         verboselog(space->machine, 0, "cdic_r: Time Register (MSW) = %04x & %04x\n", cdic_regs.time >> 16, mem_mask);
1594         return cdic_regs.time >> 16;
1595      case 0x3c04/2: // Time register (LSW)
1596         verboselog(space->machine, 0, "cdic_r: Time Register (LSW) = %04x & %04x\n", (UINT16)(cdic_regs.time & 0x0000ffff), mem_mask);
1597         return cdic_regs.time & 0x0000ffff;
1598      case 0x3c06/2: // File register
1599         verboselog(space->machine, 0, "cdic_r: File Register = %04x & %04x\n", cdic_regs.file, mem_mask);
1600         return cdic_regs.file;
15501601      case 0x3c08/2: // Channel register (MSW)
15511602         verboselog(space->machine, 0, "cdic_r: Channel Register (MSW) = %04x & %04x\n", cdic_regs.channel >> 16, mem_mask);
15521603         return cdic_regs.channel >> 16;
r6140r6141
15651616            verboselog(space->machine, 0, "Clearing CDIC interrupt line\n" );
15661617            //printf("Clearing CDIC interrupt line\n" );
15671618         }
1619         verboselog(space->machine, 0, "cdic_r: Audio Buffer Register = %04x & %04x\n", temp, mem_mask);
15681620         cdic_regs.audio_buffer &= 0x7fff;
1569         verboselog(space->machine, 0, "cdic_r: Audio Buffer Register = %04x & %04x\n", temp, mem_mask);
15701621         return temp;
15711622      }
15721623      case 0x3ff6/2:
r6140r6141
15771628         return temp;
15781629      }
15791630      case 0x3ffa/2:
1631      {
1632         if(!(cdic_regs.z_buffer & 0x2000))
1633         {
1634            cdic_regs.z_buffer ^= 0x0001;
1635         }
15801636         verboselog(space->machine, 0, "cdic_r: Z-Buffer Register = %04x & %04x\n", cdic_regs.z_buffer, mem_mask);
15811637         return cdic_regs.z_buffer;
1638      }
15821639      case 0x3ffe/2:
15831640      {
15841641         UINT16 temp = cdic_regs.data_buffer;
r6140r6141
16671724         break;
16681725      }
16691726      case 0x3ffa/2:
1727      {
16701728         verboselog(space->machine, 0, "cdic_w: Z-Buffer Register = %04x & %04x\n", data, mem_mask);
16711729         COMBINE_DATA(&cdic_regs.z_buffer);
1672         /*
16731730         if(cdic_regs.z_buffer & 0x2000)
16741731         {
1675            if(CDIC_IS_VALID_SAMPLE_BUF(cdic_regs.z_buffer))
1732            if(CDIC_IS_VALID_SAMPLE_BUF(cdic_regs.z_buffer & 0x3ffe))
16761733            {
1677               attotime period = attotime_mul(ATTOTIME_IN_HZ(CDIC_SAMPLE_BUF_FREQ(cdic_regs.z_buffer)), 18*28*4*CDIC_SAMPLE_BUF_SIZE(cdic_regs.z_buffer));
1734               attotime period = attotime_mul(ATTOTIME_IN_HZ(CDIC_SAMPLE_BUF_FREQ(cdic_regs.z_buffer & 0x3ffe)), 18*28*2);
16781735               timer_adjust_oneshot(cdic_regs.audio_sample_timer, period, 0);
1736               //timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_zero, 0);
16791737            }
16801738         }
16811739         else
16821740         {
16831741            timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
1742            //if((cdic_regs.z_buffer & 0x3ffe) == 0x800)
1743            //{
1744            //   cdic_regs.z_buffer |= 0x0001;
1745            //}
16841746         }
1685         */
16861747         break;
1748      }
16871749      case 0x3ffc/2:
16881750         verboselog(space->machine, 0, "cdic_w: Interrupt Vector Register = %04x & %04x\n", data, mem_mask);
16891751         COMBINE_DATA(&cdic_regs.interrupt_vector);
r6140r6141
17021764               case 0x2e: // Abort
17031765                  //timer_adjust_oneshot(cdic_regs.interrupt_timer, ATTOTIME_IN_HZ(75), 0); // 75Hz = 1x CD-ROM speed
17041766                  timer_adjust_oneshot(cdic_regs.interrupt_timer, attotime_never, 0);
1767                  //timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
17051768                  cdic_regs.data_buffer &= 0x3fff;
17061769                  dmadac_enable(&dmadac[0], 2, 0);
17071770                  break;
r6140r6141
17091772               case 0x2a: // Read Mode 2
17101773                  timer_adjust_oneshot(cdic_regs.interrupt_timer, ATTOTIME_IN_HZ(75), 0); // 75Hz = 1x CD-ROM speed
17111774                  cdic_regs.data_buffer &= 0xfffe;
1775                  cdic_regs.z_buffer &= 0xfffe;
17121776                  break;
1777               case 0x2c: // Seek
1778                  cdic_regs.data_buffer &= 0x7fff;
1779                  //cdic_regs.x_buffer |= 0x8000;
1780                  break;
17131781               default:
17141782                  verboselog(space->machine, 0, "Unknown CDIC command: %02x\n", cdic_regs.command );
17151783                  break;
r6140r6141
19972065                  dmadac_enable(&dmadac[0], 2, 0);
19982066                  slave_regs.in_index = 0;
19992067                  slave_regs.in_count = 0;
2000                  timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
2068                  //timer_adjust_oneshot(cdic_regs.audio_sample_timer, attotime_never, 0);
20012069                  break;
20022070               case 0x83: // Unmute audio
20032071                  verboselog(space->machine, 0, "slave_w: Channel %d: Unmute Audio (0x83)\n", offset );
r6140r6141
28862954{
28872955   int x = 0;
28882956
2889   static int latched_rf0 = 0;
2890   static int latched_rf1 = 0;
2957   static int latched_rf0 = 1;
2958   static int latched_rf1 = 1;
28912959   static int latched_wfa = 0;
28922960   static int latched_wfb = 0;
28932961   latched_wfa = mcd212.channel[0].weight_factor_a[0];
r6140r6141
34463514               plane_enable_a = mcd212.region_flag_1[x];
34473515               break;
34483516            case 5:
3449               plane_enable_a = (plane_a_r_cur != transparent_color_a_r || plane_a_g_cur != transparent_color_a_g || plane_a_b_cur != transparent_color_a_b || mcd212.region_flag_0[x] == 1);
3517               plane_enable_a = (plane_a_r_cur != transparent_color_a_r || plane_a_g_cur != transparent_color_a_g || plane_a_b_cur != transparent_color_a_b || mcd212.region_flag_0[x] == 0);
34503518               break;
34513519            case 6:
34523520               plane_enable_a = (plane_a_r_cur != transparent_color_a_r || plane_a_g_cur != transparent_color_a_g || plane_a_b_cur != transparent_color_a_b || mcd212.region_flag_1[x] == 1);
r6140r6141
36843752*      Memory maps       *
36853753*************************/
36863754
3687/*
36883755static WRITE16_HANDLER(cdic_ram_w)
36893756{
36903757   verboselog(space->machine, 0, "cdic_ram_w: %08x = %04x & %04x\n", 0x00300000 + offset*2, data, mem_mask);
r6140r6141
36963763   verboselog(space->machine, 0, "cdic_ram_r: %08x = %04x & %04x\n", 0x00300000 + offset*2, cdram[offset], mem_mask);
36973764   return cdram[offset];
36983765}
3699*/
37003766
37013767static ADDRESS_MAP_START( cdimono1_mem, ADDRESS_SPACE_PROGRAM, 16 )
37023768   AM_RANGE(0x00000000, 0x0007ffff) AM_RAM AM_BASE(&planea)
r6140r6141
37043770#if ENABLE_UART_PRINTING
37053771   AM_RANGE(0x00301400, 0x00301403) AM_READ(uart_loopback_enable)
37063772#endif
3707   //AM_RANGE(0x00300000, 0x00303bff) AM_READWRITE(cdic_ram_r, cdic_ram_w) AM_BASE(&cdram)
3708   AM_RANGE(0x00300000, 0x00303bff) AM_RAM AM_BASE(&cdram)
3773   AM_RANGE(0x00300000, 0x00303bff) AM_READWRITE(cdic_ram_r, cdic_ram_w) AM_BASE(&cdram)
3774   //AM_RANGE(0x00300000, 0x00303bff) AM_RAM AM_BASE(&cdram)
37093775   AM_RANGE(0x00303c00, 0x00303fff) AM_READWRITE(cdic_r, cdic_w)
37103776   AM_RANGE(0x00310000, 0x00317fff) AM_READWRITE(slave_r, slave_w)
37113777   //AM_RANGE(0x00318000, 0x0031ffff) AM_NOP
r6140r6141
37733839
37743840   cdic_regs.z_buffer = 0;
37753841   cdic_regs.channel = 0xffffffff;
3842   cdic_regs.audio_channel = 0xffff;
37763843
37773844   dmadac[0] = devtag_get_device(machine, "dac1");
37783845   dmadac[1] = devtag_get_device(machine, "dac2");

Previous 15994 Revisions Next


© 1998-2018 The MESS Team