Previous 15994 Revisions Next

r3667 Thursday 27th November, 2008 at 18:10:13 UTC by Miodrag Milanović
tangerin.a enabled
[src/mess]mess.mak messdriv.c
[src/mess/machine]microtan.c oric.c
[src/mess/video]oric.c

src/mess/video/oric.c
r3666r3667
1414#include "includes/oric.h"
1515
1616static void oric_vh_update_flash(void);
17static void oric_vh_update_attribute(int c);
17static void oric_vh_update_attribute(running_machine *machine,int c);
1818static void oric_refresh_charset(void);
1919
2020/* current state of the display */
r3666r3667
6969   vh_state.flash_state = 0;
7070   timer_pulse(ATTOTIME_IN_HZ(50), NULL, 0, oric_vh_timer_callback);
7171   /* mode */
72   oric_vh_update_attribute((1<<3)|(1<<4));
72   oric_vh_update_attribute(machine,(1<<3)|(1<<4));
7373}
7474
7575
r3666r3667
117117}
118118
119119/* update video hardware state depending on the new attribute */
120static void oric_vh_update_attribute(int c)
120static void oric_vh_update_attribute(running_machine *machine,int c)
121121{
122122   /* attribute */
123123   int attribute = c & 0x03f;
124   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
124125
125126   switch ((attribute>>3) & 0x03)
126127   {
r3666r3667
167168            if (oric_ram)
168169               vh_state.char_base = oric_ram + (unsigned long)0x09800;
169170            else
170               vh_state.char_base = memory_get_read_ptr(0, ADDRESS_SPACE_PROGRAM, 0x09800);
171               vh_state.char_base = memory_get_read_ptr(space, 0x09800);
171172
172173            /* changing the mode also changes the position of the standard charset
173174            and alternative charset */
r3666r3667
180181            if (oric_ram)
181182               vh_state.char_base = oric_ram + (unsigned long)0x0b400;
182183            else
183               vh_state.char_base = memory_get_read_ptr(0, ADDRESS_SPACE_PROGRAM, 0x0b400);
184               vh_state.char_base = memory_get_read_ptr(space, 0x0b400);
184185
185186            /* changing the mode also changes the position of the standard charset
186187            and alternative charset */
r3666r3667
261262      int x = 0;
262263
263264      /* foreground colour white */
264      oric_vh_update_attribute(7);
265      oric_vh_update_attribute(screen->machine,7);
265266      /* background colour black */
266      oric_vh_update_attribute((1<<3));
267      oric_vh_update_attribute(screen->machine,(1<<3));
267268
268      oric_vh_update_attribute((1<<4));
269      oric_vh_update_attribute(screen->machine,(1<<4));
269270
270271      for (byte_offset=0; byte_offset<40; byte_offset++)
271272      {
r3666r3667
298299         }
299300
300301         /* fetch data */
301         c = RAM ? RAM[read_addr] : memory_read_byte(space, read_addr);
302         c = RAM ? RAM[read_addr] : memory_read_byte(cpu_get_address_space(screen->machine->cpu[0], ADDRESS_SPACE_PROGRAM), read_addr);
302303
303304         /* if bits 6 and 5 are zero, the byte contains a serial attribute */
304305         if ((c & ((1<<6) | (1<<5)))==0)
305306         {
306            oric_vh_update_attribute(c);
307            oric_vh_update_attribute(screen->machine,c);
307308
308309            /* display background colour when attribute has been found */
309310            oric_vh_render_6pixels(bitmap,x,y,vh_state.active_foreground_colour, vh_state.active_background_colour, 0,(c & 0x080));
src/mess/messdriv.c
r3666r3667
644644   DRIVER( laser700 )   /* 1984? Laser 700                           */
645645
646646   /* TANGERINE */
647//128u4   DRIVER( microtan )   /* 1979 Microtan 65                           */
647   DRIVER( microtan )   /* 1979 Microtan 65                           */
648648
649//128u4   DRIVER( oric1 )      /* 1983 Oric 1                              */
650//128u4   DRIVER( orica )      /* 1984 Oric Atmos                           */
651//128u4   DRIVER( prav8d )   /* 1985 Pravetz 8D                           */
652//128u4   DRIVER( prav8dd )   /* 1989 Pravetz 8D (Disk ROM)                  */
653//128u4   DRIVER( telstrat )   /* ??? Oric Telestrat/Stratos                  */
649   DRIVER( oric1 )      /* 1983 Oric 1                              */
650   DRIVER( orica )      /* 1984 Oric Atmos                           */
651   DRIVER( prav8d )   /* 1985 Pravetz 8D                           */
652   DRIVER( prav8dd )   /* 1989 Pravetz 8D (Disk ROM)                  */
653   DRIVER( telstrat )   /* ??? Oric Telestrat/Stratos                  */
654654
655655   /* PHILIPS */
656656   DRIVER( p2000t )   /* 1980 P2000T                              */
src/mess/machine/oric.c
r3666r3667
172172      /* if psg is in read register state return reg data */
173173      if (oric_psg_control==0x01)
174174      {
175         return ay8910_read_port_0_r(machine, 0);
175         return ay8910_read_port_0_r(space, 0);
176176      }
177177
178178      /* return high-impedance */
r3666r3667
187187{
188188   int data;
189189
190   oric_keyboard_sense_refresh(machine);
190   oric_keyboard_sense_refresh(space->machine);
191191
192192   data = oric_key_sense_bit;
193193   data |= oric_keyboard_line & 0x07;
r3666r3667
197197
198198
199199/* read/write data depending on state of bdir, bc1 pins and data output to psg */
200static void oric_psg_connection_refresh(running_machine *machine)
200static void oric_psg_connection_refresh(const address_space *space)
201201{
202202   if (oric_psg_control!=0)
203203   {
r3666r3667
209209         /* read register data */
210210         case 1:
211211         {
212            //oric_via_port_a_data = ay8910_read_port_0_r(machine, 0);
212            //oric_via_port_a_data = ay8910_read_port_0_r(space, 0);
213213         }
214214         break;
215215         /* write register data */
216216         case 2:
217217         {
218            ay8910_write_port_0_w(machine, 0, oric_via_port_a_data);
218            ay8910_write_port_0_w(space, 0, oric_via_port_a_data);
219219         }
220220         break;
221221         /* write register index */
222222         case 3:
223223         {
224            ay8910_control_port_0_w(machine, 0, oric_via_port_a_data);
224            ay8910_control_port_0_w(space, 0, oric_via_port_a_data);
225225         }
226226         break;
227227
r3666r3667
237237{
238238   oric_via_port_a_data = data;
239239
240   oric_psg_connection_refresh(machine);
240   oric_psg_connection_refresh(space);
241241
242242
243243   if (oric_psg_control==0)
r3666r3667
319319   }
320320
321321   cassette_change_state(
322      cassette_device_image(machine),
322      cassette_device_image(space->machine),
323323      (data & 0x40) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED,
324324      CASSETTE_MOTOR_DISABLED);
325325
326326   /* cassette data out */
327   cassette_output(cassette_device_image(machine), (data & (1<<7)) ? -1.0 : +1.0);
327   cassette_output(cassette_device_image(space->machine), (data & (1<<7)) ? -1.0 : +1.0);
328328
329329
330330   /* PRINTER STROBE */
r3666r3667
340340   centronics_write_handshake(0, CENTRONICS_SELECT | CENTRONICS_NO_RESET, CENTRONICS_SELECT| CENTRONICS_NO_RESET);
341341   centronics_write_handshake(0, printer_handshake, CENTRONICS_STROBE);
342342
343   oric_psg_connection_refresh(machine);
343   oric_psg_connection_refresh(space);
344344   previous_portb_data = data;
345345
346346}
r3666r3667
389389      oric_psg_control |=1;
390390   }
391391
392   oric_psg_connection_refresh(machine);
392   oric_psg_connection_refresh(space);
393393}
394394
395395static WRITE8_HANDLER ( oric_via_out_cb2_func )
r3666r3667
401401      oric_psg_control |=2;
402402   }
403403
404   oric_psg_connection_refresh(machine);
404   oric_psg_connection_refresh(space);
405405}
406406
407407
r3666r3667
498498   const device_config *fdc = device_list_find_by_tag(machine->config->devicelist,
499499      APPLEFDC,
500500      "fdc");
501   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
501502
502   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x030f, 0, 0, oric_IO_r);
503   memory_install_read8_device_handler(fdc, 0, ADDRESS_SPACE_PROGRAM, 0x0310, 0x031f, 0, 0, applefdc_r);
504   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0320, 0x03ff, 0, 0, SMH_BANK4);
503   memory_install_read8_handler(space, 0x0300, 0x030f, 0, 0, oric_IO_r);
504   memory_install_read8_device_handler(space, fdc, 0x0310, 0x031f, 0, 0, applefdc_r);
505   memory_install_read8_handler(space, 0x0320, 0x03ff, 0, 0, SMH_BANK4);
505506
506   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x030f, 0, 0, oric_IO_w);
507   memory_install_write8_device_handler(fdc, 0, ADDRESS_SPACE_PROGRAM, 0x0310, 0x031f, 0, 0, applefdc_w);
507   memory_install_write8_handler(space, 0x0300, 0x030f, 0, 0, oric_IO_w);
508   memory_install_write8_device_handler(space, fdc, 0x0310, 0x031f, 0, 0, applefdc_w);
508509   memory_set_bankptr(machine, 4,    memory_region(machine, "main") + 0x014000 + 0x020);
509510}
510511
r3666r3667
512513static void oric_enable_memory(running_machine *machine, int low, int high, int rd, int wr)
513514{
514515   int i;
516   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
515517   for (i = low; i <= high; i++)
516518   {
517519      switch(i) {
518520      case 1:
519         memory_install_read8_handler(machine, 0,  ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, rd ? SMH_BANK1 : SMH_NOP);
520         memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, wr ? SMH_BANK5 : SMH_UNMAP);
521         memory_install_read8_handler(space, 0xc000, 0xdfff, 0, 0, rd ? SMH_BANK1 : SMH_NOP);
522         memory_install_write8_handler(space, 0xc000, 0xdfff, 0, 0, wr ? SMH_BANK5 : SMH_UNMAP);
521523         break;
522524      case 2:
523         memory_install_read8_handler(machine, 0,  ADDRESS_SPACE_PROGRAM, 0xe000, 0xf7ff, 0, 0, rd ? SMH_BANK2 : SMH_NOP);
524         memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xe000, 0xf7ff, 0, 0, wr ? SMH_BANK6 : SMH_UNMAP);
525         memory_install_read8_handler(space, 0xe000, 0xf7ff, 0, 0, rd ? SMH_BANK2 : SMH_NOP);
526         memory_install_write8_handler(space, 0xe000, 0xf7ff, 0, 0, wr ? SMH_BANK6 : SMH_UNMAP);
525527         break;
526528      case 3:
527         memory_install_read8_handler(machine, 0,  ADDRESS_SPACE_PROGRAM, 0xf800, 0xffff, 0, 0, rd ? SMH_BANK3 : SMH_NOP);
529         memory_install_read8_handler(space, 0xf800, 0xffff, 0, 0, rd ? SMH_BANK3 : SMH_NOP);
528530         break;
529531      }
530532   }
r3666r3667
551553/*   logerror("apple 2 interface v2 rom page: %01x\n",(offset & 0x02)>>1); */
552554
553555   /* bit 0 is 0 for page 0, 1 for page 1 */
554   memory_set_bankptr(machine, 4, memory_region(machine, "main") + 0x014000 + 0x0100 + (((offset & 0x02)>>1)<<8));
556   memory_set_bankptr(space->machine, 4, memory_region(space->machine, "main") + 0x014000 + 0x0100 + (((offset & 0x02)>>1)<<8));
555557
556   oric_enable_memory(machine, 1, 3, TRUE, TRUE);
558   oric_enable_memory(space->machine, 1, 3, TRUE, TRUE);
557559
558560   /* bit 1 is 0, rom enabled, bit 1 is 1 ram enabled */
559561   if ((offset & 0x01)==0)
r3666r3667
563565      /* logerror("apple 2 interface v2: rom enabled\n"); */
564566
565567      /* enable rom */
566      rom_ptr = memory_region(machine, "main") + 0x010000;
567      memory_set_bankptr(machine, 1, rom_ptr);
568      memory_set_bankptr(machine, 2, rom_ptr+0x02000);
569      memory_set_bankptr(machine, 3, rom_ptr+0x03800);
570      memory_set_bankptr(machine, 5, oric_ram_0x0c000);
571      memory_set_bankptr(machine, 6, oric_ram_0x0c000+0x02000);
572      memory_set_bankptr(machine, 7, oric_ram_0x0c000+0x03800);
568      rom_ptr = memory_region(space->machine, "main") + 0x010000;
569      memory_set_bankptr(space->machine, 1, rom_ptr);
570      memory_set_bankptr(space->machine, 2, rom_ptr+0x02000);
571      memory_set_bankptr(space->machine, 3, rom_ptr+0x03800);
572      memory_set_bankptr(space->machine, 5, oric_ram_0x0c000);
573      memory_set_bankptr(space->machine, 6, oric_ram_0x0c000+0x02000);
574      memory_set_bankptr(space->machine, 7, oric_ram_0x0c000+0x03800);
573575   }
574576   else
575577   {
576578      /*logerror("apple 2 interface v2: ram enabled\n"); */
577579
578580      /* enable ram */
579      memory_set_bankptr(machine, 1, oric_ram_0x0c000);
580      memory_set_bankptr(machine, 2, oric_ram_0x0c000+0x02000);
581      memory_set_bankptr(machine, 3, oric_ram_0x0c000+0x03800);
582      memory_set_bankptr(machine, 5, oric_ram_0x0c000);
583      memory_set_bankptr(machine, 6, oric_ram_0x0c000+0x02000);
584      memory_set_bankptr(machine, 7, oric_ram_0x0c000+0x03800);
581      memory_set_bankptr(space->machine, 1, oric_ram_0x0c000);
582      memory_set_bankptr(space->machine, 2, oric_ram_0x0c000+0x02000);
583      memory_set_bankptr(space->machine, 3, oric_ram_0x0c000+0x03800);
584      memory_set_bankptr(space->machine, 5, oric_ram_0x0c000);
585      memory_set_bankptr(space->machine, 6, oric_ram_0x0c000+0x02000);
586      memory_set_bankptr(space->machine, 7, oric_ram_0x0c000+0x03800);
585587   }
586588}
587589
r3666r3667
592594   const device_config *fdc = device_list_find_by_tag(machine->config->devicelist,
593595      APPLEFDC,
594596      "fdc");
597   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);     
595598
596   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x030f, 0, 0, oric_IO_r);
597   memory_install_read8_device_handler(fdc, 0, ADDRESS_SPACE_PROGRAM, 0x0310, 0x031f, 0, 0, applefdc_r);
598   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0320, 0x03ff, 0, 0, SMH_BANK4);
599   memory_install_read8_handler(space, 0x0300, 0x030f, 0, 0, oric_IO_r);
600   memory_install_read8_device_handler(space, fdc, 0x0310, 0x031f, 0, 0, applefdc_r);
601   memory_install_read8_handler(space, 0x0320, 0x03ff, 0, 0, SMH_BANK4);
599602
600   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x030f, 0, 0, oric_IO_w);
601   memory_install_write8_device_handler(fdc, 0, ADDRESS_SPACE_PROGRAM, 0x0310, 0x031f, 0, 0, applefdc_w);
602   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0380, 0x0383, 0, 0, apple2_v2_interface_w);
603   memory_install_write8_handler(space, 0x0300, 0x030f, 0, 0, oric_IO_w);
604   memory_install_write8_device_handler(space, fdc, 0x0310, 0x031f, 0, 0, applefdc_w);
605   memory_install_write8_handler(space, 0x0380, 0x0383, 0, 0, apple2_v2_interface_w);
603606
604   apple2_v2_interface_w(machine, 0, 0);
607   apple2_v2_interface_w(space, 0, 0);
605608}
606609
607610/********************/
r3666r3667
730733   {
731734      /* jasmin floppy disc interface */
732735      case 0x04:
733         data = wd17xx_status_r(machine, 0);
736         data = wd17xx_status_r(space, 0);
734737         break;
735738      case 0x05:
736         data =wd17xx_track_r(machine, 0);
739         data =wd17xx_track_r(space, 0);
737740         break;
738741      case 0x06:
739         data = wd17xx_sector_r(machine, 0);
742         data = wd17xx_sector_r(space, 0);
740743         break;
741744      case 0x07:
742         data = wd17xx_data_r(machine, 0);
745         data = wd17xx_data_r(space, 0);
743746         break;
744747      default:
745         data = via_0_r(machine, offset & 0x0f);
748         data = via_0_r(space, offset & 0x0f);
746749         logerror("unhandled io read: %04x %02x\n", offset, data);
747750         break;
748751
r3666r3667
757760   {
758761      /* microdisc floppy disc interface */
759762      case 0x04:
760         wd17xx_command_w(machine, 0, data);
763         wd17xx_command_w(space, 0, data);
761764         break;
762765      case 0x05:
763         wd17xx_track_w(machine, 0, data);
766         wd17xx_track_w(space, 0, data);
764767         break;
765768      case 0x06:
766         wd17xx_sector_w(machine, 0, data);
769         wd17xx_sector_w(space, 0, data);
767770         break;
768771      case 0x07:
769         wd17xx_data_w(machine, 0, data);
772         wd17xx_data_w(space, 0, data);
770773         break;
771774      /* bit 0 = side */
772775      case 0x08:
r3666r3667
774777         break;
775778      /* any write will cause wd179x to reset */
776779      case 0x09:
777         wd17xx_reset(machine);
780         wd17xx_reset(space->machine);
778781         break;
779782      case 0x0a:
780         logerror("jasmin overlay ram w: %02x PC: %04x\n",data,activecpu_get_pc());
783         logerror("jasmin overlay ram w: %02x PC: %04x\n",data,cpu_get_pc(space->machine->cpu[0]));
781784         port_3fa_w = data;
782         oric_jasmin_set_mem_0x0c000(machine);
785         oric_jasmin_set_mem_0x0c000(space->machine);
783786         break;
784787      case 0x0b:
785         logerror("jasmin romdis w: %02x PC: %04x\n",data,activecpu_get_pc());
788         logerror("jasmin romdis w: %02x PC: %04x\n",data,cpu_get_pc(space->machine->cpu[0]));
786789         port_3fb_w = data;
787         oric_jasmin_set_mem_0x0c000(machine);
790         oric_jasmin_set_mem_0x0c000(space->machine);
788791         break;
789792      /* bit 0,1 of addr is the drive */
790793      case 0x0c:
r3666r3667
795798         break;
796799
797800      default:
798         via_0_w(machine, offset & 0x0f, data);
801         via_0_w(space, offset & 0x0f, data);
799802         break;
800803   }
801804}
r3666r3667
803806
804807static void oric_install_jasmin_interface(running_machine *machine)
805808{
809   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
806810   /* romdis */
807811   port_3fb_w = 1;
808812   oric_jasmin_set_mem_0x0c000(machine);
809813
810   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x03ef, 0, 0, oric_IO_r);
811   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x03f0, 0x03ff, 0, 0, oric_jasmin_r);
814   memory_install_read8_handler(space, 0x0300, 0x03ef, 0, 0, oric_IO_r);
815   memory_install_read8_handler(space, 0x03f0, 0x03ff, 0, 0, oric_jasmin_r);
812816
813   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x03ef, 0, 0, oric_IO_w);
814   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x03f0, 0x03ff, 0, 0, oric_jasmin_w);
817   memory_install_write8_handler(space, 0x0300, 0x03ef, 0, 0, oric_IO_w);
818   memory_install_write8_handler(space, 0x03f0, 0x03ff, 0, 0, oric_jasmin_w);
815819}
816820
817821/*********************************/
r3666r3667
962966   {
963967      /* microdisc floppy disc interface */
964968      case 0x00:
965         data = wd17xx_status_r(machine, 0);
969         data = wd17xx_status_r(space, 0);
966970         break;
967971      case 0x01:
968         data =wd17xx_track_r(machine, 0);
972         data =wd17xx_track_r(space, 0);
969973         break;
970974      case 0x02:
971         data = wd17xx_sector_r(machine, 0);
975         data = wd17xx_sector_r(space, 0);
972976         break;
973977      case 0x03:
974         data = wd17xx_data_r(machine, 0);
978         data = wd17xx_data_r(space, 0);
975979         break;
976980      case 0x04:
977981         data = port_314_r | 0x07f;
r3666r3667
983987         break;
984988
985989      default:
986         data = via_0_r(machine, offset & 0x0f);
990         data = via_0_r(space, offset & 0x0f);
987991         break;
988992
989993   }
r3666r3667
9971001   {
9981002      /* microdisc floppy disc interface */
9991003      case 0x00:
1000         wd17xx_command_w(machine, 0, data);
1004         wd17xx_command_w(space, 0, data);
10011005         break;
10021006      case 0x01:
1003         wd17xx_track_w(machine, 0, data);
1007         wd17xx_track_w(space, 0, data);
10041008         break;
10051009      case 0x02:
1006         wd17xx_sector_w(machine, 0, data);
1010         wd17xx_sector_w(space, 0, data);
10071011         break;
10081012      case 0x03:
1009         wd17xx_data_w(machine, 0, data);
1013         wd17xx_data_w(space, 0, data);
10101014         break;
10111015      case 0x04:
10121016      {
r3666r3667
10331037
10341038         wd17xx_set_density(density);
10351039
1036         oric_microdisc_set_mem_0x0c000(machine);
1037         oric_microdisc_refresh_wd179x_ints(machine);
1040         oric_microdisc_set_mem_0x0c000(space->machine);
1041         oric_microdisc_refresh_wd179x_ints(space->machine);
10381042      }
10391043      break;
10401044
10411045      default:
1042         via_0_w(machine, offset & 0x0f, data);
1046         via_0_w(space, offset & 0x0f, data);
10431047         break;
10441048   }
10451049}
10461050
10471051static void oric_install_microdisc_interface(running_machine *machine)
10481052{
1049   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x030f, 0, 0, oric_IO_r);
1050   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0310, 0x031f, 0, 0, oric_microdisc_r);
1051   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0320, 0x03ff, 0, 0, oric_IO_r);
1053   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
1054   
1055   memory_install_read8_handler(space, 0x0300, 0x030f, 0, 0, oric_IO_r);
1056   memory_install_read8_handler(space, 0x0310, 0x031f, 0, 0, oric_microdisc_r);
1057   memory_install_read8_handler(space, 0x0320, 0x03ff, 0, 0, oric_IO_r);
10521058
1053   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x030f, 0, 0, oric_IO_w);
1054   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0310, 0x031f, 0, 0, oric_microdisc_w);
1055   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0320, 0x03ff, 0, 0, oric_IO_w);
1059   memory_install_write8_handler(space, 0x0300, 0x030f, 0, 0, oric_IO_w);
1060   memory_install_write8_handler(space, 0x0310, 0x031f, 0, 0, oric_microdisc_w);
1061   memory_install_write8_handler(space, 0x0320, 0x03ff, 0, 0, oric_IO_w);
10561062
10571063   /* disable os rom, enable microdisc rom */
10581064   /* 0x0c000-0x0dfff will be ram, 0x0e000-0x0ffff will be microdisc rom */
r3666r3667
11451151MACHINE_RESET( oric )
11461152{
11471153   int disc_interface_id = input_port_read(machine, "FLOPPY") & 0x07;
1148
1154   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
1155   
11491156   switch (disc_interface_id)
11501157   {
11511158      default:
r3666r3667
11731180         }
11741181         else
11751182         {
1176            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x03ff, 0, 0, oric_IO_r);
1177            memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0300, 0x03ff, 0, 0, oric_IO_w);
1183            memory_install_read8_handler(space, 0x0300, 0x03ff, 0, 0, oric_IO_r);
1184            memory_install_write8_handler(space, 0x0300, 0x03ff, 0, 0, oric_IO_w);
11781185         }
11791186      }
11801187      break;
r3666r3667
12331240   {
12341241      if ((offset & 0x0f)!=0x0d)
12351242      {
1236         logerror("via 0 r: %04x %04x\n",offset, (unsigned) cpunum_get_reg(0, REG_PC));
1243         logerror("via 0 r: %04x %04x\n",offset, (unsigned) cpu_get_reg(space->machine->cpu[0], REG_PC));
12371244      }
12381245   }
12391246   /* it is repeated */
1240   return via_0_r(machine, offset & 0x0f);
1247   return via_0_r(space, offset & 0x0f);
12411248}
12421249
12431250WRITE8_HANDLER ( oric_IO_w )
r3666r3667
12731280#endif
12741281   if (enable_logging)
12751282   {
1276      logerror("via 0 w: %04x %02x %04x\n",offset,data,(unsigned) cpunum_get_reg(0, REG_PC));
1283      logerror("via 0 w: %04x %02x %04x\n",offset,data,(unsigned) cpu_get_reg(space->machine->cpu[0], REG_PC));
12771284   }
12781285
1279   via_0_w(machine, offset & 0x0f,data);
1286   via_0_w(space, offset & 0x0f,data);
12801287}
12811288
12821289
r3666r3667
13531360
13541361static void   telestrat_refresh_mem(running_machine *machine)
13551362{
1356   read8_machine_func rh;
1357   write8_machine_func wh;
1363   read8_space_func rh;
1364   write8_space_func wh;
1365   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
13581366
13591367   struct telestrat_mem_block *mem_block = &telestrat_blocks[telestrat_bank_selection];
13601368
r3666r3667
13851393      }
13861394      break;
13871395   }
1388   memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xffff, 0, 0, rh);
1389   memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xffff, 0, 0, wh);
1396   memory_install_read8_handler(space, 0xc000, 0xffff, 0, 0, rh);
1397   memory_install_write8_handler(space, 0xc000, 0xffff, 0, 0, wh);
13901398}
13911399
13921400static  READ8_HANDLER(telestrat_via2_in_a_func)
r3666r3667
14061414   {
14071415      telestrat_bank_selection = data & 0x07;
14081416
1409      telestrat_refresh_mem(machine);
1417      telestrat_refresh_mem(space->machine);
14101418   }
14111419}
14121420
r3666r3667
14171425   /* left joystick selected? */
14181426   if (telestrat_via2_port_b_data & (1<<6))
14191427   {
1420      data &= input_port_read(machine, "JOY0");
1428      data &= input_port_read(space->machine, "JOY0");
14211429   }
14221430
14231431   /* right joystick selected? */
14241432   if (telestrat_via2_port_b_data & (1<<7))
14251433   {
1426      data &= input_port_read(machine, "JOY1");
1434      data &= input_port_read(space->machine, "JOY1");
14271435   }
14281436
14291437   data |= telestrat_via2_port_b_data & ((1<<7) | (1<<6) | (1<<5));
src/mess/machine/microtan.c
r3666r3667
169169 **************************************************************/
170170static  READ8_HANDLER (via_0_in_a )
171171{
172    int data = input_port_read(machine, "JOY");
172    int data = input_port_read(space->machine, "JOY");
173173    LOG(("microtan_via_0_in_a %02X\n", data));
174174    return data;
175175}
r3666r3667
218218{
219219    LOG(("microtan_via_0_out_b %02X\n", data));
220220    /* bit #7 is the cassette output signal */
221    cassette_output(cassette_device_image(machine), data & 0x80 ? +1.0 : -1.0);
221    cassette_output(cassette_device_image(space->machine), data & 0x80 ? +1.0 : -1.0);
222222}
223223
224224static WRITE8_HANDLER ( via_0_out_ca2 )
r3666r3667
397397        LOG(("microtan_bff0_w: %d <- %02x (keyboard IRQ clear )\n", offset, data));
398398        microtan_keyboard_ascii &= ~0x80;
399399        kbd_irq_line = CLEAR_LINE;
400        microtan_set_irq_line(machine);
400        microtan_set_irq_line(space->machine);
401401        break;
402402    case 1: /* BFF1: write delayed NMI */
403403        LOG(("microtan_bff1_w: %d <- %02x (delayed NMI)\n", offset, data));
r3666r3667
622622
623623
624624    row = 9;
625    new = input_port_read(machine, "ROW8");
625    new = input_port_read(device->machine, "ROW8");
626626    chg = keyrows[--row] ^ new;
627627
628628   while ( !chg && row > 0)
629629   {
630      new = input_port_read(machine, keynames[row - 1]);
630      new = input_port_read(device->machine, keynames[row - 1]);
631631      chg = keyrows[--row] ^ new;
632632   }
633633    if (!chg)
r3666r3667
674674            if( key )   /* normal key */
675675            {
676676                repeater = 30;
677                store_key(machine, key);
677                store_key(device->machine, key);
678678            }
679679            else
680680            if( (row == 0) && (chg == 0x04) ) /* Ctrl-@ (NUL) */
681                store_key(machine, 0);
681                store_key(device->machine, 0);
682682            keyrows[row] |= new;
683683        }
684684        else
r3666r3667
690690    else
691691    if ( key && (keyrows[lastrow] & mask) && repeat == 0 )
692692    {
693        store_key(machine, key);
693        store_key(device->machine, key);
694694    }
695695}
696696
697static void microtan_set_cpu_regs(const UINT8 *snapshot_buff, int base)
697static void microtan_set_cpu_regs(running_machine *machine,const UINT8 *snapshot_buff, int base)
698698{
699699    LOG(("microtan_snapshot_copy: PC:%02X%02X P:%02X A:%02X X:%02X Y:%02X SP:1%02X",
700700        snapshot_buff[base+1], snapshot_buff[base+0], snapshot_buff[base+2], snapshot_buff[base+3],
r3666r3667
710710static void microtan_snapshot_copy(running_machine *machine, UINT8 *snapshot_buff, int snapshot_size)
711711{
712712    UINT8 *RAM = memory_region(machine, "main");
713
713   const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
714   
714715    /* check for .DMP file format */
715716    if (snapshot_size == 8263)
716717    {
r3666r3667
732733            microtan_chunky_buffer[i] = (snapshot_buff[base+i/8] >> (i&7)) & 1;
733734        }
734735        base += 64;
735        microtan_set_cpu_regs(snapshot_buff, base);
736        microtan_set_cpu_regs(machine, snapshot_buff, base);
736737    }
737738    else
738739    {
r3666r3667
765766
766767        /* first set of VIA6522 registers */
767768        for (i = 0; i < 16; i++ )
768            via_0_w(machine, i, snapshot_buff[base++]);
769            via_0_w(space, i, snapshot_buff[base++]);
769770
770771        /* second set of VIA6522 registers */
771772        for (i = 0; i < 16; i++ )
772            via_1_w(machine, i, snapshot_buff[base++]);
773            via_1_w(space, i, snapshot_buff[base++]);
773774
774775        /* microtan IO bff0-bfff */
775776        for (i = 0; i < 16; i++ )
776777        {
777778            RAM[0xbff0+i] = snapshot_buff[base++];
778779            if (i < 4)
779                microtan_bffx_w(machine, i, RAM[0xbff0+i]);
780                microtan_bffx_w(space, i, RAM[0xbff0+i]);
780781        }
781782
782        microtan_sound_w(machine, 0, snapshot_buff[base++]);
783        microtan_sound_w(space, 0, snapshot_buff[base++]);
783784        microtan_chunky_graphics = snapshot_buff[base++];
784785
785786        /* first set of AY8910 registers */
786787        for (i = 0; i < 16; i++ )
787788        {
788            ay8910_control_port_0_w(machine, 0, i);
789            ay8910_write_port_0_w(machine, 0, snapshot_buff[base++]);
789            ay8910_control_port_0_w(space, 0, i);
790            ay8910_write_port_0_w(space, 0, snapshot_buff[base++]);
790791        }
791792
792793        /* second set of AY8910 registers */
793794        for (i = 0; i < 16; i++ )
794795        {
795            ay8910_control_port_0_w(machine, 0, i);
796            ay8910_write_port_0_w(machine, 0, snapshot_buff[base++]);
796            ay8910_control_port_0_w(space, 0, i);
797            ay8910_write_port_0_w(space, 0, snapshot_buff[base++]);
797798        }
798799
799800        for (i = 0; i < 32*16; i++)
r3666r3667
802803        }
803804        base += 64;
804805
805        microtan_set_cpu_regs(snapshot_buff, base);
806        microtan_set_cpu_regs(machine, snapshot_buff, base);
806807    }
807808}
808809
r3666r3667
861862{
862863    UINT8 *dst = memory_region(machine, "gfx2");
863864    int i;
865    const address_space *space = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
864866
865867    for (i = 0; i < 256; i++)
866868    {
r3666r3667
901903    switch (read_dsw(machine) & 3)
902904    {
903905        case 0:  // 1K only :)
904            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0400, 0xbbff, 0, 0, SMH_NOP);
905            memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0400, 0xbbff, 0, 0, SMH_NOP);
906            memory_install_read8_handler(space, 0x0400, 0xbbff, 0, 0, SMH_NOP);
907            memory_install_write8_handler(space, 0x0400, 0xbbff, 0, 0, SMH_NOP);
906908            break;
907909        case 1:  // +7K TANEX
908            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0400, 0x1fff, 0, 0, SMH_RAM);
909            memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0400, 0x1fff, 0, 0, SMH_RAM);
910            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x2000, 0xbbff, 0, 0, SMH_NOP);
911            memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x2000, 0xbbff, 0, 0, SMH_NOP);
910            memory_install_read8_handler(space, 0x0400, 0x1fff, 0, 0, SMH_RAM);
911            memory_install_write8_handler(space, 0x0400, 0x1fff, 0, 0, SMH_RAM);
912            memory_install_read8_handler(space, 0x2000, 0xbbff, 0, 0, SMH_NOP);
913            memory_install_write8_handler(space, 0x2000, 0xbbff, 0, 0, SMH_NOP);
912914            break;
913915        default: // +7K TANEX + 40K TANRAM
914            memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0400, 0xbbff, 0, 0, SMH_RAM);
915            memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x0400, 0xbbff, 0, 0, SMH_RAM);
916            memory_install_read8_handler(space, 0x0400, 0xbbff, 0, 0, SMH_RAM);
917            memory_install_write8_handler(space, 0x0400, 0xbbff, 0, 0, SMH_RAM);
916918            break;
917919    }
918920
src/mess/mess.mak
r3666r3667
434434   $(MESSOBJ)/special.a \
435435   $(MESSOBJ)/ssystem3.a \
436436   $(MESSOBJ)/super80.a \
437   $(MESSOBJ)/tangerin.a \
437438   $(MESSOBJ)/telmac.a \
438439   $(MESSOBJ)/thomson.a \
439440   $(MESSOBJ)/ti85.a \
r3666r3667
480481#   $(MESSOBJ)/svi.a \
481482#   $(MESSOBJ)/svision.a \
482483#   $(MESSOBJ)/synertec.a \
483#   $(MESSOBJ)/tangerin.a \
484484#   $(MESSOBJ)/tatung.a \
485485#   $(MESSOBJ)/teamconc.a \
486486#   $(MESSOBJ)/ti99.a \

Previous 15994 Revisions Next


© 1998-2018 The MESS Team