Previous 15994 Revisions Next

r2572 Wednesday 7th May, 2008 at 15:05:37 UTC by Miodrag Milanović
[SPECTRUM][SCORPION][PENTAGON] Now works much better
[src/mess/drivers]pentagon.c scorpion.c spectrum.c
[src/mess/machine]beta.c spectrum.c

src/mess/machine/spectrum.c
r2571r2572
5454}
5555SPECTRUM_SNAPSHOT_TYPE;
5656
57static OPBASE_HANDLER(spectrum_opbaseoverride)
58{
59   /* Hack for correct handling 0xffff interrupt vector */
60   if (address == 0x0001)
61      if (cpunum_get_reg(0, REG_PREVIOUSPC)==0xffff)
62      {
63         cpunum_set_reg(0, Z80_PC, 0xfff4);
64         return 0xfff4;
65      }
66   return address;
67}
68
5769MACHINE_RESET( spectrum )
5870{
59   //memory_set_opbase_handler(0, spectrum_opbaseoverride);
71   memory_set_opbase_handler(0, spectrum_opbaseoverride);
6072}
6173
6274SNAPSHOT_LOAD(spectrum)
src/mess/machine/beta.c
r2571r2572
103103READ8_HANDLER(betadisk_state_r)
104104{
105105   if (betadisk_active==1) {
106      return betadisk_status | 0x3f;
106      return betadisk_status;
107107   } else {
108108      return 0xff;
109109   }
r2571r2572
114114   if (betadisk_active==1) {
115115        wd17xx_set_drive ( data & 3); 
116116        wd17xx_set_side ((data & 0x10) ? 0 : 1 );
117        wd17xx_set_density(data & 0x20 ? DEN_MFM_LO : DEN_FM_LO );
117        wd17xx_set_density(data & 0x20 ? DEN_MFM_HI : DEN_FM_LO );
118118        if ((data & 0x04) == 0) // reset
119119        {
120120           wd17xx_reset();   
121        }             
121        }         
122        betadisk_status = (data & 0x3f) | betadisk_status;
122123     }
123124}   
124125
src/mess/drivers/pentagon.c
r2571r2572
1616   wd17xx_init(machine, WD_TYPE_179X, betadisk_wd179x_callback, NULL);
1717}
1818
19
2019static int ROMSelection;
2120
2221static OPBASE_HANDLER( pentagon_opbase )
2322{   
24   if ( address >= 0x4000 ) {
25      if (ROMSelection == 3) {         
26         ROMSelection = 1;
23   if (betadisk_is_active()) {
24      if (activecpu_get_pc() >= 0x4000) {
25         ROMSelection = ((spectrum_128_port_7ffd_data>>4) & 0x01) ? 1 : 0;
2726         betadisk_disable();
28         memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x014000); // Set BASIC ROM
29      }
30   }
31   else if ((address & 0xff00) == 0x3d00)
27         memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x010000 + 0x4000*ROMSelection); // Set BASIC ROM
28      }   
29   } else if (((activecpu_get_pc() & 0xff00) == 0x3d00) && (ROMSelection==1))
3230   {
33      if (ROMSelection == 1)
34      {
35         ROMSelection = 3;
36         betadisk_enable();
37         memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x01c000); // Set TRDOS ROM         
38      }
31      ROMSelection = 3;
32      betadisk_enable();
33      memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x01c000); // Set TRDOS ROM         
3934   }
4035   return address;
4136}
4237
4338static void pentagon_update_memory(running_machine *machine)
4439{
45   unsigned char *ChosenROM;
46   
47   read8_machine_func rh;
48   write8_machine_func wh;
40   spectrum_128_screen_location = mess_ram + ((spectrum_128_port_7ffd_data & 8) ? (7<<14) : (5<<14));
4941
50   if (spectrum_128_port_7ffd_data & 8)
51   {
52      //logerror("SCREEN 1: BLOCK 7\n");
53      spectrum_128_screen_location = mess_ram + (7<<14);
42   memory_set_bankptr(4, mess_ram + ((spectrum_128_port_7ffd_data & 0x07) * 0x4000));
43
44   if( betadisk_is_active() && !( spectrum_128_port_7ffd_data & 0x10 ) ) {   
45      /* GLUK */
46      ROMSelection = 2;
5447   }
5548   else
5649   {
57      //logerror("SCREEN 0: BLOCK 5\n");
58      spectrum_128_screen_location = mess_ram + (5<<14);
50      /* ROM switching */
51      ROMSelection = ((spectrum_128_port_7ffd_data>>4) & 0x01) ;
5952   }
60
61   /* select ram at 0x0c000-0x0ffff */
62   {
63      int ram_page;
64      unsigned char *ram_data;
65
66      ram_page = (spectrum_128_port_7ffd_data & 0x07);
67      ram_data = mess_ram + (ram_page<<14);
68
69      memory_set_bankptr(4, ram_data);
70
71      //logerror("RAM at 0xc000: %02x\n",ram_page);
72   }
73
74      /* rom at 0x0000 */
75      //logerror("ROM at 0x0000\n");
76
77      /* connect page 0 of rom to 0x0000 */
78      rh = SMH_BANK1;
79      wh = SMH_NOP;
80
81       if( betadisk_is_active() && !( spectrum_128_port_7ffd_data & 0x10 ) ) {   
82         ROMSelection = 2;
83      }
84      else
85      {
86         /* ROM switching */
87         ROMSelection = ((spectrum_128_port_7ffd_data>>4) & 0x01) ;
88      }
89      /* rom 0 is 128K rom, rom 1 is 48 BASIC */
90      ChosenROM = memory_region(REGION_CPU1) + 0x010000 + (ROMSelection<<14);
91
92      memory_set_bankptr(1, ChosenROM);
93
94      //logerror("rom switch: %02x\n", ROMSelection);
95   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, rh);
96   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, wh);
53   /* rom 0 is 128K rom, rom 1 is 48 BASIC */
54   memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x010000 + (ROMSelection<<14));
9755}
9856
9957static WRITE8_HANDLER(pentagon_port_7ffd_w)
10058{
101   //logerror("pentagon 7ffd w: %02x\n", data);
102
103   /* disable paging? */
59   /* disable paging */
10460   if (spectrum_128_port_7ffd_data & 0x20)
10561      return;
10662
r2571r2572
12682
12783static MACHINE_RESET( pentagon )
12884{
85   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_BANK1);
86   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_UNMAP);
87
12988   betadisk_enable();
13089   betadisk_clear_status();
13190
r2571r2572
142101   spectrum_128_port_7ffd_data = 0;
143102
144103   pentagon_update_memory(machine);   
145   
146   MACHINE_RESET_CALL(spectrum);
147   
104     
148105   wd17xx_reset();   
149106}
150107
src/mess/drivers/scorpion.c
r2571r2572
194194
195195static int ROMSelection;
196196
197static OPBASE_HANDLER( scorpion_opbase )
198{   
199   if ( address >= 0x4000 ) {
200      if (ROMSelection == 3) {         
201         ROMSelection = 1;
202         betadisk_disable();
203         memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x014000); // Set BASIC ROM
204      }
205   }
206   else if ((address & 0xff00) == 0x3d00)
207   {
208      if (ROMSelection == 1)
209      {
210         ROMSelection = 3;
211         betadisk_enable();
212         memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x01c000); // Set TRDOS ROM         
213      }
214   }
215   return address;
216}
217
218197static void scorpion_update_memory(running_machine *machine)
219198{
220   unsigned char *ChosenROM;
221   
222   read8_machine_func rh;
223   write8_machine_func wh;
199   spectrum_128_screen_location = mess_ram + ((spectrum_128_port_7ffd_data & 8) ? (7<<14) : (5<<14));
224200
225   if (spectrum_128_port_7ffd_data & 8)
226   {
227      //logerror("SCREEN 1: BLOCK 7\n");
228      spectrum_128_screen_location = mess_ram + (7<<14);
229   }
230   else
231   {
232      //logerror("SCREEN 0: BLOCK 5\n");
233      spectrum_128_screen_location = mess_ram + (5<<14);
234   }
201   memory_set_bankptr(4, mess_ram + (((spectrum_128_port_7ffd_data & 0x07) | ((scorpion_256_port_1ffd_data & 0x10)>>1)) * 0x4000));
235202
236   /* select ram at 0x0c000-0x0ffff */
203   if ((scorpion_256_port_1ffd_data & 0x01)==0x01)
237204   {
238      int ram_page;
239      unsigned char *ram_data;
240
241      ram_page = (spectrum_128_port_7ffd_data & 0x07) | ((scorpion_256_port_1ffd_data & 0x10)>>1);
242      ram_data = mess_ram + (ram_page<<14);
243
244      memory_set_bankptr(4, ram_data);
245
246      //logerror("RAM at 0xc000: %02x\n",ram_page);
205      memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_BANK1);
206      memory_set_bankptr(1, mess_ram+(8<<14));     
247207   }
248
249   if (scorpion_256_port_1ffd_data & 0x01)
250   {
251      /* ram at 0x0000 */
252      //logerror("RAM at 0x0000\n");
253
254      /* connect page 0 of ram to 0x0000 */
255      rh = SMH_BANK1;
256      wh = SMH_BANK1;
257      memory_set_bankptr(1, mess_ram+(8<<14));
258   }
259208   else
260209   {
261      /* rom at 0x0000 */
262      //logerror("ROM at 0x0000\n");
263
264      /* connect page 0 of rom to 0x0000 */
265      rh = SMH_BANK1;
266      wh = SMH_NOP;
267
268      if (scorpion_256_port_1ffd_data & 0x02)
210      if ((scorpion_256_port_1ffd_data & 0x02)==0x02)
269211      {
270         ROMSelection = 2;
271      }
272      else
273      {
212         ROMSelection = 2;         
213      } else {
274214         /* ROM switching */
275         ROMSelection = ((spectrum_128_port_7ffd_data>>4) & 0x01) ;
276      }
277      /* rom 0 is 128K rom, rom 1 is 48 BASIC */
278      ChosenROM = memory_region(REGION_CPU1) + 0x010000 + (ROMSelection<<14);
279
280      memory_set_bankptr(1, ChosenROM);
281
282      //logerror("rom switch: %02x\n", ROMSelection);
215         ROMSelection = ((spectrum_128_port_7ffd_data>>4) & 0x01) ? 1 : 0;
216      }         
217      memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_UNMAP);
218      memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x010000 + (ROMSelection<<14));     
283219   }
284   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, rh);
285   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, wh);
220   
221   
286222}
287223
224static OPBASE_HANDLER( scorpion_opbase )
225{   
226   if (betadisk_is_active()) {
227      if (activecpu_get_pc() >= 0x4000) {
228         ROMSelection = ((spectrum_128_port_7ffd_data>>4) & 0x01) ? 1 : 0;
229         betadisk_disable();
230         memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x010000 + 0x4000*ROMSelection); // Set BASIC ROM
231      }   
232   } else if (((activecpu_get_pc() & 0xff00) == 0x3d00) && (ROMSelection==1))
233   {
234      ROMSelection = 3;
235      betadisk_enable();
236      memory_set_bankptr(1, memory_region(REGION_CPU1) + 0x01c000); // Set TRDOS ROM         
237   }
238   return address;
239}
288240
289
290241static TIMER_CALLBACK(nmi_check_callback)
291242{
292243   if ((input_port_read(machine, "NMI") & 1)==1) {
r2571r2572
298249
299250static WRITE8_HANDLER(scorpion_port_7ffd_w)
300251{
301   //logerror("scorpion 7ffd w: %02x\n", data);
302
303   /* disable paging? */
252   /* disable paging */
304253   if (spectrum_128_port_7ffd_data & 0x20)
305254      return;
306255
r2571r2572
313262
314263static WRITE8_HANDLER(scorpion_port_1ffd_w)
315264{
316   //logerror("scorpion 1ffd w: %02x\n", data);
317
318265   scorpion_256_port_1ffd_data = data;
319266
320   /* disable paging? */
267   /* disable paging */
321268   if ((spectrum_128_port_7ffd_data & 0x20)==0)
322269   {
323270      scorpion_update_memory(machine);
r2571r2572
342289
343290
344291static MACHINE_RESET( scorpion )
345{
292{   
293   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0000, 0x3fff, 0, 0, SMH_BANK1);
294   
346295   betadisk_disable();
347296   betadisk_clear_status();
348297
r2571r2572
360309   scorpion_256_port_1ffd_data = 0;
361310
362311   scorpion_update_memory(machine);   
363   
364   MACHINE_RESET_CALL(spectrum);
365   
312     
366313   wd17xx_reset();   
367314   
368315   timer_pulse(ATTOTIME_IN_HZ(50), NULL, 0, nmi_check_callback);
src/mess/drivers/spectrum.c
r2571r2572
505505   ROMX_LOAD("80-lec.rom", 0x0000, 0x4000, CRC(5b5c92b1) SHA1(bb7a77d66e95d2e28ebb610e543c065e0d428619), ROM_BIOS(6))
506506   ROM_SYSTEM_BIOS(6, "specpls4", "ZX Spectrum +4")
507507   ROMX_LOAD("plus4.rom",0x0000,0x4000, CRC(7e0f47cb) SHA1(c103e89ef58e6ade0c01cea0247b332623bd9a30), ROM_BIOS(7))
508   ROM_SYSTEM_BIOS(7, "qu4i1993", "Quorum 64")
509   ROMX_LOAD("qu4i1993.rom",0x0000,0x4000, CRC(48085B0E), ROM_BIOS(8))
510   ROM_SYSTEM_BIOS(8, "magic6_5", "Magic-06")
511   ROMX_LOAD("magic6_5.rom",0x0000,0x4000, CRC(CB63AE06), ROM_BIOS(9))   
508512   ROM_CART_LOAD(0, "rom", 0x0000, 0x4000, ROM_NOCLEAR | ROM_NOMIRROR | ROM_OPTIONAL)
509513ROM_END
510514

Previous 15994 Revisions Next


© 1998-2018 The MESS Team