Previous 15994 Revisions Next

r1280 Thursday 15th November, 2007 at 15:51:01 UTC by Curt Coder
[QL] Fixed interrupts and ROM loading.
[src/mess/drivers]ql.c

src/mess/drivers/ql.c
r1279r1280
1616
1717   TODO:
1818
19   - get COMCTL from i8048 WR output
20   - IPC <-> ZX8302 communication
2119   - correct frequency for RTC timer
2220   - keyboard/joystick connections
2321   - speaker sound
2422   - accurate screen timings
2523   - microdrive
26   - serial I/O
2724
2825*/
2926
r1279r1280
4340#define ZX8302_BAUD_300      0x06
4441#define ZX8302_BAUD_75      0x07
4542#define ZX8302_BAUD_MASK   0x07
43
4644#define ZX8302_MODE_SER1   0x00
4745#define ZX8302_MODE_SER2   0x08
4846#define ZX8302_MODE_MDV      0x10
r1279r1280
5553#define ZX8302_INT_FRAME      0x08
5654#define ZX8302_INT_EXTERNAL      0x10
5755
56#define ZX8302_STATUS_BUFFER_FULL   0x02
57
5858#define ZX8302_IPC_START   0
5959#define ZX8302_IPC_STOP      5
6060
r1279r1280
7272   UINT8 irq;
7373   UINT32 ctr;
7474   UINT8 idr;
75   UINT8 status;
7576   int ipc_bits, tx_bits;
7677   int ser1_rxd, ser1_cts;
7778   int ser2_txd, ser2_dtr;
7879   int netout, netin;
79   int mdrdwl, mdselckn, mdseldn, erase, raw1, raw2;
80   int mdrdw, mdselck, mdseld, erase, raw1, raw2;
8081} zx8302;
8182
8283static mame_timer *zx8302_txd_timer, *zx8302_ipc_timer, *zx8302_rtc_timer;
r1279r1280
8485static void zx8302_interrupt(UINT8 line)
8586{
8687   zx8302.irq |= line;
87   //cpunum_set_input_line(0, MC68000_IRQ_2, HOLD_LINE);
88   cpunum_set_input_line(0, MC68000_IRQ_2, HOLD_LINE);
8889}
8990
9091static void zx8302_txd(int level)
r1279r1280
135136   case ZX8302_TXD_STOP2:
136137      zx8302_txd(1);
137138      zx8302.tx_bits = ZX8302_TXD_START;
139      zx8302.status &= ~ZX8302_STATUS_BUFFER_FULL;
138140      zx8302_interrupt(ZX8302_INT_TRANSMIT); // TODO: when is the transmit interrupt triggered?
139141      break;
140142   }
r1279r1280
238240      bit      description
239241     
240242      0      Network port
241      1      Microdrive buffer full
243      1      Transmit buffer full
242244      2     
243245      3     
244246      4      SER1 DTR
r1279r1280
248250
249251   */
250252
251   return (zx8302.comdata << 7) | (zx8302.comctl << 6) | (zx8302.ser1_cts << 5)| (zx8302.ser2_dtr << 4);
253   return (zx8302.comdata << 7) | (zx8302.comctl << 6) | (zx8302.ser1_cts << 5)| (zx8302.ser2_dtr << 4) | (zx8302.status & 0x0f);
252254}
253255
254256static WRITE8_HANDLER( zx8302_ipc_command_w )
r1279r1280
320322   logerror("ZX8302 Data Write : %x\n", data);
321323
322324   zx8302.tdr = data;
325   zx8302.status |= ZX8302_STATUS_BUFFER_FULL;
323326}
324327
325328static INTERRUPT_GEN( zx8302_int )
r1279r1280
387390   case 0:
388391      cpunum_set_input_line(0, MC68000_IRQ_2, CLEAR_LINE);
389392      cpunum_set_input_line(0, MC68000_IRQ_5, CLEAR_LINE);
390      cpunum_set_input_line(0, MC68000_IRQ_7, ASSERT_LINE);
393      cpunum_set_input_line(0, MC68000_IRQ_7, HOLD_LINE);
391394      break;
392   case 1:
395   case 1: // CTRL-ALT-7
393396      cpunum_set_input_line(0, MC68000_IRQ_2, CLEAR_LINE);
394      cpunum_set_input_line(0, MC68000_IRQ_5, ASSERT_LINE);
397      cpunum_set_input_line(0, MC68000_IRQ_5, HOLD_LINE);
395398      cpunum_set_input_line(0, MC68000_IRQ_7, CLEAR_LINE);
396399      break;
397400   case 2:
398      cpunum_set_input_line(0, MC68000_IRQ_2, ASSERT_LINE);
401      cpunum_set_input_line(0, MC68000_IRQ_2, HOLD_LINE);
399402      cpunum_set_input_line(0, MC68000_IRQ_5, CLEAR_LINE);
400403      cpunum_set_input_line(0, MC68000_IRQ_7, CLEAR_LINE);
401404      break;
r1279r1280
484487   AM_RANGE(0x018063, 0x018063) AM_WRITE(zx8301_control_w)
485488   AM_RANGE(0x020000, 0x02ffff) AM_RAM AM_BASE(&videoram)
486489   AM_RANGE(0x030000, 0x03ffff) AM_RAM // onboard RAM
487   AM_RANGE(0x040000, 0x0bffff) AM_RAM // 512KB add-on RAM
490/*   AM_RANGE(0x040000, 0x0bffff) AM_RAM // 512KB add-on RAM
488491   AM_RANGE(0x0c0000, 0x0dffff) AM_NOP // 8x16KB device slots
489   AM_RANGE(0x0e0000, 0x0fffff) AM_ROM // add-on ROM
492   AM_RANGE(0x0e0000, 0x0fffff) AM_ROM // add-on ROM*/
490493ADDRESS_MAP_END
491494
492495static ADDRESS_MAP_START( ipc_map, ADDRESS_SPACE_PROGRAM, 8 )
r1279r1280
633636   state_save_register_global(zx8302.ser2_dtr);
634637   state_save_register_global(zx8302.netout);
635638   state_save_register_global(zx8302.netin);
636   state_save_register_global(zx8302.mdrdwl);
637   state_save_register_global(zx8302.mdselckn);
638   state_save_register_global(zx8302.mdseldn);
639   state_save_register_global(zx8302.mdrdw);
640   state_save_register_global(zx8302.mdselck);
641   state_save_register_global(zx8302.mdseld);
639642   state_save_register_global(zx8302.erase);
640643   state_save_register_global(zx8302.raw1);
641644   state_save_register_global(zx8302.raw2);
r1279r1280
704707ROM_START( ql )
705708    ROM_REGION( 0x400000, REGION_CPU1, 0 )
706709   ROM_SYSTEM_BIOS( 0, "js", "v1.10 (JS)" )
707   ROMX_LOAD( "ql.js 0000.ic33", 0x000000, 0x008000, CRC(1bbad3b8) SHA1(59fd4372771a630967ee102760f4652904d7d5fa), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1) )
708    ROMX_LOAD( "ql.js 8000.ic34", 0x008000, 0x004000, CRC(c970800e) SHA1(b8c9203026a7de6a44bd0942ec9343e8b222cb41), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1) )
710   ROMX_LOAD( "ql.js 0000.ic33", 0x000000, 0x008000, CRC(1bbad3b8) SHA1(59fd4372771a630967ee102760f4652904d7d5fa), ROM_BIOS(1) )
711    ROMX_LOAD( "ql.js 8000.ic34", 0x008000, 0x004000, CRC(c970800e) SHA1(b8c9203026a7de6a44bd0942ec9343e8b222cb41), ROM_BIOS(1) )
709712
710713   ROM_SYSTEM_BIOS( 1, "tb", "v1.0? (TB)" )
711   ROMX_LOAD( "tb.ic33", 0x000000, 0x008000, BAD_DUMP CRC(1c86d688) SHA1(7df8028e6671afc4ebd5f65bf6c2d6019181f239), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2) )
712    ROMX_LOAD( "tb.ic34", 0x008000, 0x004000, BAD_DUMP CRC(de7f9669) SHA1(9d6bc0b794541a4cec2203256ae92c7e68d1011d), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(2) )
714   ROMX_LOAD( "tb.ic33", 0x000000, 0x008000, BAD_DUMP CRC(1c86d688) SHA1(7df8028e6671afc4ebd5f65bf6c2d6019181f239), ROM_BIOS(2) )
715    ROMX_LOAD( "tb.ic34", 0x008000, 0x004000, BAD_DUMP CRC(de7f9669) SHA1(9d6bc0b794541a4cec2203256ae92c7e68d1011d), ROM_BIOS(2) )
713716
714717   ROM_SYSTEM_BIOS( 2, "jm", "v1.03 (JM)" )
715   ROMX_LOAD( "ql.jm 0000.ic33", 0x000000, 0x008000, CRC(1f8e840a) SHA1(7929e716dfe88318bbe99e34f47d039957fe3cc0), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(3) )
716    ROMX_LOAD( "ql.jm 8000.ic34", 0x008000, 0x004000, CRC(9168a2e9) SHA1(1e7c47a59fc40bd96dfefc2f4d86827c15f0199e), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(3) )
718   ROMX_LOAD( "ql.jm 0000.ic33", 0x000000, 0x008000, CRC(1f8e840a) SHA1(7929e716dfe88318bbe99e34f47d039957fe3cc0), ROM_BIOS(3) )
719    ROMX_LOAD( "ql.jm 8000.ic34", 0x008000, 0x004000, CRC(9168a2e9) SHA1(1e7c47a59fc40bd96dfefc2f4d86827c15f0199e), ROM_BIOS(3) )
717720
718721   ROM_SYSTEM_BIOS( 3, "ah", "v1.02 (AH)" )
719   ROMX_LOAD( "ah.ic33.1", 0x000000, 0x004000, BAD_DUMP CRC(a9b4d2df) SHA1(142d6f01a9621aff5e0ad678bd3cbf5cde0db801), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(4) )
720    ROMX_LOAD( "ah.ic33.2", 0x004000, 0x004000, BAD_DUMP CRC(36488e4e) SHA1(ff6f597b30ea03ce480a3d6728fd1d858da34d6a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(4) )
721   ROMX_LOAD( "ah.ic34",   0x008000, 0x004000, BAD_DUMP CRC(61259d4c) SHA1(bdd10d111e7ba488551a27c8d3b2743917ff1307), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(4) )
722   ROMX_LOAD( "ah.ic33.1", 0x000000, 0x004000, BAD_DUMP CRC(a9b4d2df) SHA1(142d6f01a9621aff5e0ad678bd3cbf5cde0db801), ROM_BIOS(4) )
723    ROMX_LOAD( "ah.ic33.2", 0x004000, 0x004000, BAD_DUMP CRC(36488e4e) SHA1(ff6f597b30ea03ce480a3d6728fd1d858da34d6a), ROM_BIOS(4) )
724   ROMX_LOAD( "ah.ic34",   0x008000, 0x004000, BAD_DUMP CRC(61259d4c) SHA1(bdd10d111e7ba488551a27c8d3b2743917ff1307), ROM_BIOS(4) )
722725
723726   ROM_SYSTEM_BIOS( 4, "pm", "v1.01 (PM)" )
724   ROMX_LOAD( "pm.ic33", 0x000000, 0x008000, NO_DUMP, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(5) )
725    ROMX_LOAD( "pm.ic34", 0x008000, 0x004000, NO_DUMP, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(5) )
727   ROMX_LOAD( "pm.ic33", 0x000000, 0x008000, NO_DUMP, ROM_BIOS(5) )
728    ROMX_LOAD( "pm.ic34", 0x008000, 0x004000, NO_DUMP, ROM_BIOS(5) )
726729
727730   ROM_SYSTEM_BIOS( 5, "fb", "v1.00 (FB)" )
728    ROMX_LOAD( "fb.ic33", 0x000000, 0x008000, NO_DUMP, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(6) )
729    ROMX_LOAD( "fb.ic34", 0x008000, 0x004000, NO_DUMP, ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(6) )
731    ROMX_LOAD( "fb.ic33", 0x000000, 0x008000, NO_DUMP, ROM_BIOS(6) )
732    ROMX_LOAD( "fb.ic34", 0x008000, 0x004000, NO_DUMP, ROM_BIOS(6) )
730733
731734   ROM_SYSTEM_BIOS( 6, "tyche", "v2.05 (Tyche)" )
732    ROMX_LOAD( "tyche.rom", 0x000000, 0x010000, BAD_DUMP CRC(8724b495) SHA1(5f33a1bc3f23fd09c31844b65bc3aca7616f180a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(7) )
735    ROMX_LOAD( "tyche.rom", 0x000000, 0x010000, BAD_DUMP CRC(8724b495) SHA1(5f33a1bc3f23fd09c31844b65bc3aca7616f180a), ROM_BIOS(7) )
733736
734737   ROM_SYSTEM_BIOS( 7, "min189", "Minerva v1.89" )
735    ROMX_LOAD( "minerva.rom", 0x000000, 0x00c000, CRC(930befe3) SHA1(84a99c4df13b97f90baf1ec8cb6c2e52e3e1bb4d), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(8) )
738    ROMX_LOAD( "minerva.rom", 0x000000, 0x00c000, CRC(930befe3) SHA1(84a99c4df13b97f90baf1ec8cb6c2e52e3e1bb4d), ROM_BIOS(8) )
736739
737740   ROM_REGION( 0x800, REGION_CPU2, 0 )
738741   ROM_LOAD( "v07.ic24",     0x0000, 0x0800, CRC(051111f9) SHA1(83ed562464df89b9fdd9740db51d45884a512696) ) // V0.7
r1279r1280
741744
742745ROM_START( ql_jsu )
743746    ROM_REGION( 0x400000, REGION_CPU1, 0 )
744    ROM_LOAD16_WORD_SWAP( "jsu.ic33", 0x000000, 0x008000, BAD_DUMP CRC(e397f49f) SHA1(c06f92eabaf3e6dd298c51cb7f7535d8ef0ef9c5) )
745    ROM_LOAD16_WORD_SWAP( "jsu.ic34", 0x008000, 0x004000, BAD_DUMP CRC(3debbacc) SHA1(9fbc3e42ec463fa42f9c535d63780ff53a9313ec) )
747    ROM_LOAD( "jsu.ic33", 0x000000, 0x008000, BAD_DUMP CRC(e397f49f) SHA1(c06f92eabaf3e6dd298c51cb7f7535d8ef0ef9c5) )
748    ROM_LOAD( "jsu.ic34", 0x008000, 0x004000, BAD_DUMP CRC(3debbacc) SHA1(9fbc3e42ec463fa42f9c535d63780ff53a9313ec) )
746749
747750   ROM_REGION( 0x800, REGION_CPU2, 0 )
748751   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1279r1280
750753
751754ROM_START( ql_mge )
752755    ROM_REGION( 0x400000, REGION_CPU1, 0 )
753    ROM_LOAD16_WORD_SWAP( "mge.ic33", 0x000000, 0x008000, BAD_DUMP CRC(d5293bde) SHA1(bf5af7e53a472d4e9871f182210787d601db0634) )
754    ROM_LOAD16_WORD_SWAP( "mge.ic34", 0x008000, 0x004000, BAD_DUMP CRC(a694f8d7) SHA1(bd2868656008de85d7c191598588017ae8aa3339) )
756    ROM_LOAD( "mge.ic33", 0x000000, 0x008000, BAD_DUMP CRC(d5293bde) SHA1(bf5af7e53a472d4e9871f182210787d601db0634) )
757    ROM_LOAD( "mge.ic34", 0x008000, 0x004000, BAD_DUMP CRC(a694f8d7) SHA1(bd2868656008de85d7c191598588017ae8aa3339) )
755758
756759   ROM_REGION( 0x800, REGION_CPU2, 0 )
757760   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1279r1280
759762
760763ROM_START( ql_mgf )
761764    ROM_REGION( 0x400000, REGION_CPU1, 0 )
762    ROM_LOAD16_WORD_SWAP( "mgf.ic33", 0x000000, 0x008000, NO_DUMP )
763    ROM_LOAD16_WORD_SWAP( "mgf.ic34", 0x008000, 0x004000, NO_DUMP )
765    ROM_LOAD( "mgf.ic33", 0x000000, 0x008000, NO_DUMP )
766    ROM_LOAD( "mgf.ic34", 0x008000, 0x004000, NO_DUMP )
764767
765768   ROM_REGION( 0x800, REGION_CPU2, 0 )
766769   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1279r1280
768771
769772ROM_START( ql_mgg )
770773    ROM_REGION( 0x400000, REGION_CPU1, 0 )
771    ROM_LOAD16_WORD_SWAP( "mgg.ic33", 0x000000, 0x008000, BAD_DUMP CRC(b4e468fd) SHA1(cd02a3cd79af90d48b65077d0571efc2f12f146e) )
772    ROM_LOAD16_WORD_SWAP( "mgg.ic34", 0x008000, 0x004000, BAD_DUMP CRC(54959d40) SHA1(ffc0be9649f26019d7be82925c18dc699259877f) )
774    ROM_LOAD( "mgg.ic33", 0x000000, 0x008000, BAD_DUMP CRC(b4e468fd) SHA1(cd02a3cd79af90d48b65077d0571efc2f12f146e) )
775    ROM_LOAD( "mgg.ic34", 0x008000, 0x004000, BAD_DUMP CRC(54959d40) SHA1(ffc0be9649f26019d7be82925c18dc699259877f) )
773776
774777   ROM_REGION( 0x800, REGION_CPU2, 0 )
775778   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1279r1280
777780
778781ROM_START( ql_mgi )
779782    ROM_REGION( 0x400000, REGION_CPU1, 0 )
780    ROM_LOAD16_WORD_SWAP( "mgi.ic33", 0x000000, 0x008000, BAD_DUMP CRC(d5293bde) SHA1(bf5af7e53a472d4e9871f182210787d601db0634) )
781    ROM_LOAD16_WORD_SWAP( "mgi.ic34", 0x008000, 0x004000, BAD_DUMP CRC(a2fdfb83) SHA1(162b1052737500f3c13497cdf0f813ba006bdae9) )
783    ROM_LOAD( "mgi.ic33", 0x000000, 0x008000, BAD_DUMP CRC(d5293bde) SHA1(bf5af7e53a472d4e9871f182210787d601db0634) )
784    ROM_LOAD( "mgi.ic34", 0x008000, 0x004000, BAD_DUMP CRC(a2fdfb83) SHA1(162b1052737500f3c13497cdf0f813ba006bdae9) )
782785
783786   ROM_REGION( 0x800, REGION_CPU2, 0 )
784787   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1279r1280
786789
787790ROM_START( ql_mgs )
788791    ROM_REGION( 0x400000, REGION_CPU1, 0 )
789    ROM_LOAD16_WORD_SWAP( "mgs.ic33", 0x000000, 0x008000, NO_DUMP )
790    ROM_LOAD16_WORD_SWAP( "mgs.ic34", 0x008000, 0x004000, NO_DUMP )
792    ROM_LOAD( "mgs.ic33", 0x000000, 0x008000, NO_DUMP )
793    ROM_LOAD( "mgs.ic34", 0x008000, 0x004000, NO_DUMP )
791794
792795   ROM_REGION( 0x800, REGION_CPU2, 0 )
793796   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1279r1280
795798
796799ROM_START( ql_efp )
797800    ROM_REGION( 0x400000, REGION_CPU1, 0 )
798    ROM_LOAD16_WORD_SWAP( "efp.ic33", 0x000000, 0x008000, BAD_DUMP CRC(eb181641) SHA1(43c1e0215cf540cbbda240b1048910ff55681059) )
799    ROM_LOAD16_WORD_SWAP( "efp.ic34", 0x008000, 0x004000, BAD_DUMP CRC(4c3b34b7) SHA1(f9dc571d2d4f68520b306ecc7516acaeea69ec0d) )
801    ROM_LOAD( "efp.ic33", 0x000000, 0x008000, BAD_DUMP CRC(eb181641) SHA1(43c1e0215cf540cbbda240b1048910ff55681059) )
802    ROM_LOAD( "efp.ic34", 0x008000, 0x004000, BAD_DUMP CRC(4c3b34b7) SHA1(f9dc571d2d4f68520b306ecc7516acaeea69ec0d) )
800803
801804   ROM_REGION( 0x800, REGION_CPU2, 0 )
802805   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team