Previous 15994 Revisions Next

r1267 Tuesday 13th November, 2007 at 15:10:17 UTC by Curt Coder
[QL] Added preliminary ZX8302<>IPC communications. Fixed joystick input ports. Added 50Hz interrupt. Added save state support. Added Minerva 1.89 bios.
[src/mess/drivers]ql.c
[src/mess/video]zx8301.c

src/mess/video/zx8301.c
r1266r1267
33typedef struct
44{
55   int dispoff;
6   int mode;
6   int mode8;
77   int base;
88   int flash;
99} ZX8301_VIDEO_CONFIG;
r1266r1267
3434WRITE8_HANDLER( zx8301_control_w )
3535{
3636   zx8301.dispoff = BIT(data, 1);
37   zx8301.mode = BIT(data, 3);
37   zx8301.mode8 = BIT(data, 3);
3838   zx8301.base = BIT(data, 7);
3939}
4040 
r1266r1267
4343   UINT32 addr = zx8301.base << 15;
4444   int y, word, pixel;
4545 
46   if (zx8301.mode)
46   if (zx8301.mode8)
4747   {
48      // mode 512 GGGGGGGG RRRRRRRR
48      // mode 8/256 GFGFGFGF RBRBRBRB
4949 
5050      for (y = 0; y < 256; y++)
5151      {
r1266r1267
5656            UINT8 byte_high = videoram[addr++];
5757            UINT8 byte_low = videoram[addr++];
5858 
59            for (pixel = 0; pixel < 8; pixel++)
59            for (pixel = 0; pixel < 4; pixel++)
6060            {
6161               int red = BIT(byte_low, 7);
6262               int green = BIT(byte_high, 7);
63               int color = (green << 1) | red;
63               int blue = BIT(byte_low, 6);
64               int flash = BIT(byte_high, 6);
6465 
65               *BITMAP_ADDR16(bitmap, y, x++) = Machine->pens[ZX8301_COLOR_MODE4[color]];
66               int color = (blue << 2) | (green << 1) | red;
6667 
67               byte_high <<= 1;
68               byte_low <<= 1;
68               if (flash && zx8301.flash)
69               {
70                  color = 0;
71               }
72 
73               *BITMAP_ADDR16(bitmap, y, x++) = Machine->pens[color];
74               *BITMAP_ADDR16(bitmap, y, x++) = Machine->pens[color];
75 
76               byte_high <<= 2;
77               byte_low <<= 2;
6978            }
7079         }
7180      }
7281   }
7382   else
7483   {
75      // mode 256 GFGFGFGF RBRBRBRB
84      // mode 4/512 GGGGGGGG RRRRRRRR
7685 
7786      for (y = 0; y < 256; y++)
7887      {
r1266r1267
8392            UINT8 byte_high = videoram[addr++];
8493            UINT8 byte_low = videoram[addr++];
8594 
86            for (pixel = 0; pixel < 4; pixel++)
95            for (pixel = 0; pixel < 8; pixel++)
8796            {
8897               int red = BIT(byte_low, 7);
8998               int green = BIT(byte_high, 7);
90               int blue = BIT(byte_low, 6);
91               int flash = BIT(byte_high, 6);
99               int color = (green << 1) | red;
92100 
93               int color = (blue << 2) | (green << 1) | red;
101               *BITMAP_ADDR16(bitmap, y, x++) = Machine->pens[ZX8301_COLOR_MODE4[color]];
94102 
95               if (flash && zx8301.flash)
96               {
97                  color = 0;
98               }
99 
100               *BITMAP_ADDR16(bitmap, y, x++) = Machine->pens[color];
101               *BITMAP_ADDR16(bitmap, y, x++) = Machine->pens[color];
102 
103               byte_high <<= 2;
104               byte_low <<= 2;
103               byte_high <<= 1;
104               byte_low <<= 1;
105105            }
106106         }
107107      }
r1266r1267
114114   mame_timer_adjust(zx8301_flash_timer, MAME_TIME_IN_HZ(2), 0, MAME_TIME_IN_HZ(2));
115115 
116116   state_save_register_global(zx8301.dispoff);
117   state_save_register_global(zx8301.mode);
117   state_save_register_global(zx8301.mode8);
118118   state_save_register_global(zx8301.base);
119119   state_save_register_global(zx8301.flash);
120120}
src/mess/drivers/ql.c
r1266r1267
1616
1717   TODO:
1818
19   - everything
19   - get COMCTL from i8048 WR output
20   - IPC <-> ZX8302 communication
21   - correct frequency for RTC timer
22   - keyboard/joystick connections
23   - speaker sound
24   - accurate screen timings
25   - microdrive
26   - serial I/O
2027
2128*/
2229
r1266r1267
2734
2835/* Peripheral Chip (ZX8302) */
2936
30static int ZXmode, ZXbps;
31static int zx8302_comdata, zx8302_baudx4;
37#define ZX8302_IPC_START   0
38#define ZX8302_IPC_STOP      5
3239
33static mame_timer *zx8302_baud_timer;
40static struct ZX8302
41{
42   int comdata;
43   int comctl;
44   int baudx4;
45   UINT8 tcr;
46   UINT8 tdr;
47   UINT8 intr;
48   UINT16 ctr;
49   UINT8 idr;
50   int ipc_bits;
51} zx8302;
3452
35static TIMER_CALLBACK( zx8302_baud_tick )
53static mame_timer *zx8302_txd_timer, *zx8302_ipc_timer, *zx8302_rtc_timer;
54
55static TIMER_CALLBACK( zx8302_txd_tick )
3656{
37   zx8302_baudx4 = zx8302_baudx4 ? 0 : 1;
3857}
3958
40static WRITE8_HANDLER( zx8302_control_w )
59static TIMER_CALLBACK( zx8302_ipc_tick )
4160{
42   int baudx4 = 0;
61   zx8302.baudx4 = zx8302.baudx4 ? 0 : 1;
4362
44   ZXmode = data & 0x18;
45/*
46   switch(ZXmode)
63   if (zx8302.baudx4)
4764   {
48   case 0x00: logerror("ZXSER1\n"); break;
49   case 0x08: logerror("ZXSER2\n"); break;
50   case 0x10: logerror("ZXMDV\n"); break;
51   case 0x18: logerror("ZXNET\n"); break;
65      if (zx8302.comctl)
66      {
67         // send 4 bits of data to the IPC
68
69         switch (zx8302.ipc_bits)
70         {
71         case ZX8302_IPC_START:
72            zx8302.comdata = 0;
73            zx8302.ipc_bits++;
74            break;
75
76         default:
77            zx8302.comdata = BIT(zx8302.idr, 0);
78            zx8302.idr >>= 1;
79            zx8302.ipc_bits++;
80            break;
81
82         case ZX8302_IPC_STOP:
83            zx8302.comdata = 1;
84            break;
85         }
86      }
87      else
88      {
89         // receive data from the IPC
90
91         zx8302.idr <<= 1;
92         zx8302.idr |= zx8302.comdata;
93      }
5294   }
53*/
54   switch(data & 0x07)
95}
96
97static TIMER_CALLBACK( zx8302_rtc_tick )
98{
99   zx8302.ctr++;
100}
101
102static READ8_HANDLER( zx8302_rtc_r )
103{
104   if (offset)
55105   {
56   case 0: ZXbps = 19200; break;
57   case 1: ZXbps = 9600; break;
58   case 2: ZXbps = 4800; break;
59   case 3: ZXbps = 2400; break;
60   case 4: ZXbps = 1200; break;
61   case 5: ZXbps = 600; break;
62   case 6: ZXbps = 300; break;
63   case 7: ZXbps = 75; break;
106      return zx8302.ctr & 0xff;
64107   }
108   else
109   {
110      return zx8302.ctr >> 8;
111   }
112}
65113
66   baudx4 = ZXbps * 4;
114static WRITE8_HANDLER( zx8302_rtc_w )
115{
116   if (offset)
117   {
118      zx8302.ctr = (zx8302.ctr & 0xff00) | data;
119   }
120   else
121   {
122      zx8302.ctr = (data << 8) | (zx8302.ctr & 0xff);
123   }
124}
67125
68   mame_timer_adjust(zx8302_baud_timer, time_zero, 0, MAME_TIME_IN_HZ(baudx4));
126static WRITE8_HANDLER( zx8302_control_w )
127{
128   int baud = 19200 >> (data & 0x07);
129   int baudx4 = baud * 4;
130
131   zx8302.tcr = data;
132
133   mame_timer_adjust(zx8302_txd_timer, time_zero, 0, MAME_TIME_IN_HZ(baud));
134   mame_timer_adjust(zx8302_ipc_timer, time_zero, 0, MAME_TIME_IN_HZ(baudx4));
69135}
70136
137static READ8_HANDLER( zx8302_ipc_r )
138{
139   /*
140     
141      bit      description
142     
143      0      Network port
144      1      Microdrive buffer full
145      2     
146      3     
147      4      DTR
148      5      CTS
149      6      COMCTL ???
150      7      COMDATA ???
151
152   */
153
154   return (zx8302.comdata << 7) | (zx8302.comctl << 6);
155}
156
71157static WRITE8_HANDLER( zx8302_ipc_w )
72158{
73159   /*
r1266r1267
100186   { write 00001101 to 18003; wait for '0' in bit6 18020; read bit7 of 18020 }
101187
102188   */
189
190   zx8302.idr = data;
191   zx8302.ipc_bits = ZX8302_IPC_START;
103192}
104193
105static WRITE8_HANDLER( mdv_ctrl_w )
194static WRITE8_HANDLER( zx8302_mdv_control_w )
106195{
107196   /*
108197   MDV control
r1266r1267
131220   */
132221}
133222
134static WRITE8_HANDLER( mdv_data_w )
223static READ8_HANDLER( zx8302_irq_r )
135224{
225   /*
226     
227      bit      description
228     
229      0      Gap interrupt
230      1      Interface interrupt
231      2      Transmit interrupt
232      3      Frame interrupt
233      4      External interrupt
234      5     
235      6     
236      7     
237
238   */
239
240   return 0;
136241}
137242
138static READ8_HANDLER( zx8302_status_r )
243static WRITE8_HANDLER( zx8302_irq_w )
139244{
140   return 0x0;
245   zx8302.intr = data;
141246}
142247
143static WRITE8_HANDLER( zx8302_clock_w )
248static READ8_HANDLER( zx8302_mdv_track1_r )
144249{
250   return 0;
145251}
146252
253static READ8_HANDLER( zx8302_mdv_track2_r )
254{
255   return 0;
256}
257
258static WRITE8_HANDLER( zx8302_txdata_w )
259{
260   zx8302.tdr = data;
261}
262
147263/* Intelligent Peripheral Controller (IPC) */
148264
149265static UINT8 ipc_keylatch;
r1266r1267
176292     
177293      0      Serial data input
178294      1      Speaker output
179      2      Interrupt IPL0-2 output
180      3      Interrupt IPL1 output
295      2      Interrupt IPL0-2 output (not used)
296      3      Interrupt IPL1 output (not used)
181297      4      SER2 CTS
182298      5      SER1 DTR
183299      6      N/C
184      7      ZX8302 link output
300      7      COMDATA input/output
185301
186302   */
187303
r1266r1267
203319      break;
204320   }
205321
206   zx8302_comdata = BIT(data, 7);
322   zx8302.comdata = BIT(data, 7);
207323}
208324
209325static READ8_HANDLER( ipc_port2_r )
r1266r1267
214330     
215331      0      Serial data input
216332      1      Speaker output
217      2      Interrupt IPL2 output
218      3      Interrupt IPL1 output
333      2      Interrupt IPL0-2 output (not used)
334      3      Interrupt IPL1 output (not used)
219335      4      SER2 CTS
220336      5      SER1 DTR
221337      6      N/C
222      7      ZX8302 link output
338      7      COMDATA input/output
223339
224340   */
225341
226   return zx8302_comdata << 7;
342   return zx8302.comdata << 7;
227343}
228344
229345static READ8_HANDLER( ipc_t1_r )
230346{
231   return zx8302_baudx4;
347   return zx8302.baudx4;
232348}
233349
234350static READ8_HANDLER( ipc_bus_r )
r1266r1267
248364
249365   */
250366
251   if (ipc_keylatch & 0x01) return readinputportbytag("ROW0");
252   if (ipc_keylatch & 0x02) return readinputportbytag("ROW1");
367   if (ipc_keylatch & 0x01) return readinputportbytag("ROW0") | readinputportbytag("JOY0");
368   if (ipc_keylatch & 0x02) return readinputportbytag("ROW1") | readinputportbytag("JOY1");
253369   if (ipc_keylatch & 0x04) return readinputportbytag("ROW2");
254370   if (ipc_keylatch & 0x08) return readinputportbytag("ROW3");
255371   if (ipc_keylatch & 0x10) return readinputportbytag("ROW4");
256372   if (ipc_keylatch & 0x20) return readinputportbytag("ROW5");
257373   if (ipc_keylatch & 0x40) return readinputportbytag("ROW6");
258   if (ipc_keylatch & 0x80) return readinputportbytag("ROW7");
374   if (ipc_keylatch & 0x80) return readinputportbytag("ROW7") | readinputportbytag("SPECIAL");
259375
260376   return 0;
261377}
r1266r1267
265381static ADDRESS_MAP_START( ql_map, ADDRESS_SPACE_PROGRAM, 8 )
266382   AM_RANGE(0x000000, 0x00bfff) AM_ROM   // System ROM
267383   AM_RANGE(0x00c000, 0x00ffff) AM_ROM // Cartridge ROM
268   AM_RANGE(0x018000, 0x018001) AM_WRITE(zx8302_clock_w)
384   AM_RANGE(0x018000, 0x018001) AM_READWRITE(zx8302_rtc_r, zx8302_rtc_w)
269385   AM_RANGE(0x018002, 0x018002) AM_WRITE(zx8302_control_w)
270386   AM_RANGE(0x018003, 0x018003) AM_WRITE(zx8302_ipc_w)
271   AM_RANGE(0x018020, 0x018020) AM_READWRITE(zx8302_status_r, mdv_ctrl_w)
272   AM_RANGE(0x018022, 0x018022) AM_WRITE(mdv_data_w)
387   AM_RANGE(0x018020, 0x018020) AM_READWRITE(zx8302_ipc_r, zx8302_mdv_control_w)
388   AM_RANGE(0x018020, 0x018020) AM_READWRITE(zx8302_irq_r, zx8302_irq_w)
389   AM_RANGE(0x018022, 0x018022) AM_READWRITE(zx8302_mdv_track1_r, zx8302_txdata_w)
390   AM_RANGE(0x018023, 0x018023) AM_READ(zx8302_mdv_track2_r)
273391   AM_RANGE(0x018063, 0x018063) AM_WRITE(zx8301_control_w)
274392   AM_RANGE(0x020000, 0x02ffff) AM_RAM AM_BASE(&videoram)
275393   AM_RANGE(0x030000, 0x03ffff) AM_RAM // onboard RAM
276394   AM_RANGE(0x040000, 0x0bffff) AM_RAM // 512KB add-on RAM
277395   AM_RANGE(0x0c0000, 0x0dffff) AM_NOP // 8x16KB device slots
278   AM_RANGE(0x0e0000, 0x0fffff) AM_ROMBANK(2) // add-on ROM
396   AM_RANGE(0x0e0000, 0x0fffff) AM_ROM // add-on ROM
279397ADDRESS_MAP_END
280398
281399static ADDRESS_MAP_START( ipc_map, ADDRESS_SPACE_PROGRAM, 8 )
r1266r1267
283401ADDRESS_MAP_END
284402
285403static ADDRESS_MAP_START( ipc_io_map, ADDRESS_SPACE_IO, 8 )
286   AM_RANGE(0x27, 0x28) AM_NOP // ???
404   AM_RANGE(0x27, 0x28) AM_READNOP // IPC reads these to set P0 (bus) to Hi-Z mode
287405   AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(ipc_port1_w)
288406   AM_RANGE(I8039_p2, I8039_p2) AM_READWRITE(ipc_port2_r, ipc_port2_w)
289407   AM_RANGE(I8039_t1, I8039_t1) AM_READ(ipc_t1_r)
r1266r1267
379497   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(LALT)) PORT_CHAR(UCHAR_MAMEKEY(RALT)) PORT_NAME("ALT")
380498
381499   PORT_START_TAG("JOY0")
382   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_PLAYER(1) PORT_8WAY
383   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_PLAYER(1) PORT_8WAY
384   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )  PORT_PLAYER(1) PORT_8WAY
385   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_8WAY
386   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )      PORT_PLAYER(1)
500   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )   PORT_PLAYER(1) PORT_8WAY
501   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )   PORT_PLAYER(1) PORT_8WAY
502   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
503   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )   PORT_PLAYER(1) PORT_8WAY
504   PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )PORT_PLAYER(1) PORT_8WAY
505   PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON1 )      PORT_PLAYER(1)
506   PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
507   PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
387508
388509   PORT_START_TAG("JOY1")
389   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    PORT_PLAYER(2) PORT_8WAY
390   PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  PORT_PLAYER(2) PORT_8WAY
391   PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )  PORT_PLAYER(2) PORT_8WAY
392   PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_8WAY
393   PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )      PORT_PLAYER(2)
510   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
511   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )   PORT_PLAYER(2) PORT_8WAY
512   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )   PORT_PLAYER(2) PORT_8WAY
513   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
514   PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )PORT_PLAYER(2) PORT_8WAY
515   PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
516   PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )      PORT_PLAYER(2)
517   PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )   PORT_PLAYER(2) PORT_8WAY
394518INPUT_PORTS_END
395519
396520/* Machine Drivers */
397521
522static INTERRUPT_GEN( ql_int )
523{
524   cpunum_set_input_line(0, MC68000_IRQ_2, ASSERT_LINE);
525}
526
398527static MACHINE_START( ql )
399528{
400   zx8302_baud_timer = mame_timer_alloc(zx8302_baud_tick);
529   state_save_register_global(zx8302.comdata);
530   state_save_register_global(zx8302.comctl);
531   state_save_register_global(zx8302.baudx4);
532   state_save_register_global(zx8302.tcr);
533   state_save_register_global(zx8302.tdr);
534   state_save_register_global(zx8302.intr);
535   state_save_register_global(zx8302.ctr);
536   state_save_register_global(zx8302.idr);
537   state_save_register_global(zx8302.ipc_bits);
538
539   state_save_register_global(ipc_keylatch);
540
541   memset(&zx8302, 0, sizeof(zx8302));
542
543   zx8302_txd_timer = mame_timer_alloc(zx8302_txd_tick);
544   zx8302_ipc_timer = mame_timer_alloc(zx8302_ipc_tick);
545   zx8302_rtc_timer = mame_timer_alloc(zx8302_rtc_tick);
546
547   mame_timer_adjust(zx8302_rtc_timer, time_zero, 0, MAME_TIME_IN_HZ(X2));
401548}
402549
403550static MACHINE_DRIVER_START( ql )
404551   // basic machine hardware
405   MDRV_CPU_ADD(M68008, X1/2) // 7.5 MHz
552   MDRV_CPU_ADD(M68008, X1/2)
406553   MDRV_CPU_PROGRAM_MAP(ql_map, 0)
554   MDRV_CPU_VBLANK_INT(ql_int, 1)
407555
408   MDRV_CPU_ADD(I8048, X4) // 11 MHz (i8049)
556   MDRV_CPU_ADD(I8048, X4) // i8049
409557   MDRV_CPU_PROGRAM_MAP(ipc_map, 0)
410558   MDRV_CPU_IO_MAP(ipc_io_map, 0)
411559
r1266r1267
469617   ROM_SYSTEM_BIOS( 6, "tyche", "v2.05 (Tyche)" )
470618    ROMX_LOAD( "tyche.rom", 0x000000, 0x010000, BAD_DUMP CRC(8724b495) SHA1(5f33a1bc3f23fd09c31844b65bc3aca7616f180a), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(7) )
471619
620   ROM_SYSTEM_BIOS( 7, "min189", "Minerva v1.89" )
621    ROMX_LOAD( "minerva.rom", 0x000000, 0x00c000, CRC(930befe3) SHA1(84a99c4df13b97f90baf1ec8cb6c2e52e3e1bb4d), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(8) )
622
472623   ROM_REGION( 0x800, REGION_CPU2, 0 )
473624   ROM_LOAD( "v07.ic24",     0x0000, 0x0800, CRC(051111f9) SHA1(83ed562464df89b9fdd9740db51d45884a512696) ) // V0.7
474625   ROM_LOAD( "ipc8049.ic24", 0x0000, 0x0800, CRC(6a0d1f20) SHA1(fcb1c97ee7c66e5b6d8fbb57c06fd2f6509f2e1b) )
r1266r1267
654805COMP( 1985, ql_mgg, ql,     0,      ql,         ql,     0,      ql,     "Sinclair Research Ltd",    "QL (Germany)", GAME_NOT_WORKING )
655806COMP( 1985, ql_mgi, ql,     0,      ql,         ql,     0,      ql,     "Sinclair Research Ltd",    "QL (Italy)",   GAME_NOT_WORKING )
656807COMP( 1985, ql_mgs, ql,     0,      ql,         ql,     0,      ql,     "Sinclair Research Ltd",    "QL (Sweden)",  GAME_NOT_WORKING )
657COMP( 1985, ql_efp, ql,     0,      ql,         ql,     0,      ql,     "Sinclair Research Ltd",    "QL (Mexico)",  GAME_NOT_WORKING )
808COMP( 1985, ql_efp, ql,     0,      ql,         ql,     0,      ql,     "Sinclair Research Ltd",    "QL (Greece)",  GAME_NOT_WORKING )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team