Previous 15994 Revisions Next

r3663 Thursday 27th November, 2008 at 17:47:26 UTC by Wilbert Pol
Reenabled pc.a and at.a.
[src/mess]mess.mak
[src/mess/drivers]pc.c
[src/mess/machine]amstr_pc.c europc.c ibmpc.c pc.c tandy1t.c
[src/mess/video]pc_aga.c pc_t1t.c

src/mess/video/pc_t1t.c
r3662r3663
743743   switch( offset )
744744   {
745745      case 0: case 2: case 4: case 6:
746         devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, T1000_MC6845_NAME);
746         devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, T1000_MC6845_NAME);
747747         mc6845_address_w( devconf, offset, data );
748748         break;
749749      case 1: case 3: case 5: case 7:
750         devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, T1000_MC6845_NAME);
750         devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, T1000_MC6845_NAME);
751751         mc6845_register_w( devconf, offset, data );
752752         break;
753753      case 8:
r3662r3663
770770         pc_t1t_vga_data_w(data);
771771         break;
772772      case 15:
773         pc_t1t_bank_w(machine, data);
773         pc_t1t_bank_w(space->machine, data);
774774         break;
775775    }
776776}
r3662r3663
783783   switch( offset )
784784   {
785785      case 0: case 4:
786         devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, T1000_MC6845_NAME);
786         devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, T1000_MC6845_NAME);
787787         mc6845_address_w( devconf, offset, data );
788788         break;
789789      case 1: case 5:
790         devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, T1000_MC6845_NAME);
790         devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, T1000_MC6845_NAME);
791791         mc6845_register_w( devconf, offset, data );
792792         break;
793793      case 10:
r3662r3663
807807      case 12:
808808         break;
809809      case 15:
810         pc_pcjr_bank_w(machine, data);
810         pc_pcjr_bank_w(space->machine, data);
811811         break;
812812
813813      default:
r3662r3663
828828         break;
829829
830830      case 1: case 3: case 5: case 7:
831         devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, T1000_MC6845_NAME);
831         devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, T1000_MC6845_NAME);
832832         data = mc6845_register_r( devconf, offset );
833833         break;
834834
src/mess/video/pc_aga.c
r3662r3663
1616#include "video/cgapal.h"
1717
1818
19#define CGA_MONITOR      (input_port_read(machine, "VIDEO") & 0x1C)
19#define CGA_MONITOR      (input_port_read(space->machine, "VIDEO") & 0x1C)
2020#define CGA_MONITOR_RGB         0x00   /* Colour RGB */
2121#define CGA_MONITOR_MONO      0x04   /* Greyscale RGB */
2222#define CGA_MONITOR_COMPOSITE   0x08   /* Colour composite */
r3662r3663
480480   UINT8 data = 0xFF;
481481
482482   if ( aga.mode == AGA_MONO ) {
483      device_config   *devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, MDA_MC6845_NAME);
483      device_config   *devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, MDA_MC6845_NAME);
484484      switch( offset )
485485      {
486486      case 0: case 2: case 4: case 6:
r3662r3663
490490         data = mc6845_register_r( devconf, offset );
491491         break;
492492      case 10:
493         data = (input_port_read(machine, "IN0") & 0x80 ) | 0x08 | aga.mda_status;
493         data = (input_port_read(space->machine, "IN0") & 0x80 ) | 0x08 | aga.mda_status;
494494         aga.mda_status ^= 0x01;
495495         break;
496496      /* 12, 13, 14  are the LPT1 ports */
r3662r3663
502502static WRITE8_HANDLER ( pc_aga_mda_w )
503503{
504504   if ( aga.mode == AGA_MONO ) {
505      device_config   *devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, AGA_MC6845_NAME);
505      device_config   *devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, AGA_MC6845_NAME);
506506      switch( offset )
507507      {
508508         case 0: case 2: case 4: case 6:
r3662r3663
535535   UINT8 data = 0xFF;
536536
537537   if ( aga.mode == AGA_COLOR ) {
538      device_config   *devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, AGA_MC6845_NAME);
538      device_config   *devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, AGA_MC6845_NAME);
539539      switch( offset ) {
540540      case 0: case 2: case 4: case 6:
541541         /* return last written mc6845 address value here? */
r3662r3663
581581static WRITE8_HANDLER ( pc_aga_cga_w )
582582{
583583   if ( aga.mode == AGA_COLOR ) {
584      device_config   *devconf = (device_config *) device_list_find_by_tag(machine->config->devicelist, MC6845, AGA_MC6845_NAME);
584      device_config   *devconf = (device_config *) device_list_find_by_tag(space->machine->config->devicelist, MC6845, AGA_MC6845_NAME);
585585
586586      switch(offset) {
587587      case 0: case 2: case 4: case 6:
r3662r3663
651651}
652652
653653
654static READ16_HANDLER ( pc16le_aga_mda_r ) { return read16le_with_read8_handler(pc_aga_mda_r, machine, offset, mem_mask); }
655static WRITE16_HANDLER ( pc16le_aga_mda_w ) { write16le_with_write8_handler(pc_aga_mda_w, machine, offset, data, mem_mask); }
656static READ16_HANDLER ( pc16le_aga_cga_r ) { return read16le_with_read8_handler(pc_aga_cga_r, machine, offset, mem_mask); }
657static WRITE16_HANDLER ( pc16le_aga_cga_w ) { write16le_with_write8_handler(pc_aga_cga_w, machine, offset, data, mem_mask); }
654static READ16_HANDLER ( pc16le_aga_mda_r ) { return read16le_with_read8_handler(pc_aga_mda_r, space, offset, mem_mask); }
655static WRITE16_HANDLER ( pc16le_aga_mda_w ) { write16le_with_write8_handler(pc_aga_mda_w, space, offset, data, mem_mask); }
656static READ16_HANDLER ( pc16le_aga_cga_r ) { return read16le_with_read8_handler(pc_aga_cga_r, space, offset, mem_mask); }
657static WRITE16_HANDLER ( pc16le_aga_cga_w ) { write16le_with_write8_handler(pc_aga_cga_w, space, offset, data, mem_mask); }
658658
659659
660660
r3662r3663
681681
682682VIDEO_START( pc_aga )
683683{
684   int buswidth = cputype_databus_width(machine->config->cpu[0].type, ADDRESS_SPACE_PROGRAM);
684   const address_space *space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_IO );
685   int buswidth = cpu_get_databus_width(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
685686
686687   switch(buswidth)
687688   {
688689      case 8:
689         memory_install_read8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_r );
690         memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_w );
691         memory_install_read8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc_aga_cga_r );
692         memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc_aga_cga_w );
690         memory_install_read8_handler(space, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_r );
691         memory_install_write8_handler(space, 0x3b0, 0x3bf, 0, 0, pc_aga_mda_w );
692         memory_install_read8_handler(space, 0x3d0, 0x3df, 0, 0, pc_aga_cga_r );
693         memory_install_write8_handler(space, 0x3d0, 0x3df, 0, 0, pc_aga_cga_w );
693694         break;
694695
695696      case 16:
696         memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc16le_aga_mda_r );
697         memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, pc16le_aga_mda_w );
698         memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc16le_aga_cga_r );
699         memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc16le_aga_cga_w );
697         memory_install_read16_handler(space, 0x3b0, 0x3bf, 0, 0, pc16le_aga_mda_r );
698         memory_install_write16_handler(space, 0x3b0, 0x3bf, 0, 0, pc16le_aga_mda_w );
699         memory_install_read16_handler(space, 0x3d0, 0x3df, 0, 0, pc16le_aga_cga_r );
700         memory_install_write16_handler(space, 0x3d0, 0x3df, 0, 0, pc16le_aga_cga_w );
700701         break;
701702
702703      default:
r3662r3663
714715
715716VIDEO_START( pc200 )
716717{
718   const address_space *space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_IO );
717719   int buswidth;
718720
719721   VIDEO_START_CALL(pc_aga);
720722
721   buswidth = cputype_databus_width(machine->config->cpu[0].type, ADDRESS_SPACE_PROGRAM);
723   buswidth = cpu_get_databus_width(machine->cpu[0], ADDRESS_SPACE_PROGRAM);
722724   switch(buswidth)
723725   {
724726      case 8:
725         memory_install_read8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_r );
726         memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga_w );
727         memory_install_read8_handler(space, 0x3d0, 0x3df, 0, 0, pc200_cga_r );
728         memory_install_write8_handler(space, 0x3d0, 0x3df, 0, 0, pc200_cga_w );
727729         break;
728730
729731      case 16:
730         memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga16le_r );
731         memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc200_cga16le_w );
732         memory_install_read16_handler(space, 0x3d0, 0x3df, 0, 0, pc200_cga16le_r );
733         memory_install_write16_handler(space, 0x3d0, 0x3df, 0, 0, pc200_cga16le_w );
732734         break;
733735
734736      default:
r3662r3663
751753   switch (aga.mode) {
752754   case AGA_COLOR:
753755      if (offset>=0x8000)
754         pc_video_videoram_w(machine, offset-0x8000, data);
756         pc_video_videoram_w(space, offset-0x8000, data);
755757      break;
756758   case AGA_MONO:
757      pc_video_videoram_w(machine, offset,data);
759      pc_video_videoram_w(space, offset,data);
758760      break;
759761   case AGA_OFF: break;
760762   }
r3662r3663
792794   {
793795      default:
794796         if (offset>=0x8000)
795            pc_video_videoram_w(machine, offset-0x8000, data);
797            pc_video_videoram_w(space, offset-0x8000, data);
796798         break;
797799      case AGA_MONO:
798         pc_video_videoram_w(machine, offset,data);
800         pc_video_videoram_w(space, offset,data);
799801         break;
800802   }
801803}
802804
803READ16_HANDLER( pc200_videoram16le_r )   { return read16le_with_read8_handler(pc200_videoram_r, machine, offset, mem_mask); }
804WRITE16_HANDLER( pc200_videoram16le_w )   { write16le_with_write8_handler(pc200_videoram_w, machine, offset, data, mem_mask); }
805READ16_HANDLER( pc200_videoram16le_r )   { return read16le_with_read8_handler(pc200_videoram_r, space, offset, mem_mask); }
806WRITE16_HANDLER( pc200_videoram16le_w )   { write16le_with_write8_handler(pc200_videoram_w, space, offset, data, mem_mask); }
805807
806808
807809static struct {
r3662r3663
815817   switch(offset) {
816818   case 4:
817819      pc200.portd |= 0x20;
818//      pc_cga8_w(machine, offset,data);
820//      pc_cga8_w(space, offset,data);
819821      break;
820822   case 8:
821823      pc200.port8 = data;
822824      pc200.portd |= 0x80;
823//      pc_cga8_w(machine, offset,data);
825//      pc_cga8_w(space, offset,data);
824826      break;
825827   case 0xe:
826828      pc200.portd = 0x1f;
r3662r3663
835837      if ((pc200.porte & 7) != (data & 7))
836838      {
837839         if (data & 4)
838            pc_aga_set_mode(machine, AGA_OFF);
840            pc_aga_set_mode(space->machine, AGA_OFF);
839841         else if (data & 2)
840            pc_aga_set_mode(machine, AGA_MONO);
842            pc_aga_set_mode(space->machine, AGA_MONO);
841843         else
842            pc_aga_set_mode(machine, AGA_COLOR);
844            pc_aga_set_mode(space->machine, AGA_COLOR);
843845      }
844846      pc200.porte = data;
845847      break;
846848
847849   default:
848//      pc_cga8_w(machine, offset,data);
850//      pc_cga8_w(space, offset,data);
849851      break;
850852   }
851853}
r3662r3663
868870   case 0xe:
869871      // 0x20 low cga
870872      // 0x10 low special
871      result = input_port_read(machine, "DSW0") & 0x38;
873      result = input_port_read(space->machine, "DSW0") & 0x38;
872874      break;
873875
874876   default:
875//      result = pc_cga8_r(machine, offset);
877//      result = pc_cga8_r(space, offset);
876878      break;
877879   }
878880   return result;
879881}
880882
881READ16_HANDLER( pc200_cga16le_r ) { return read16le_with_read8_handler(pc200_cga_r, machine, offset, mem_mask); }
882WRITE16_HANDLER( pc200_cga16le_w ) { write16le_with_write8_handler(pc200_cga_w, machine, offset, data, mem_mask); }
883READ16_HANDLER( pc200_cga16le_r ) { return read16le_with_read8_handler(pc200_cga_r, space, offset, mem_mask); }
884WRITE16_HANDLER( pc200_cga16le_w ) { write16le_with_write8_handler(pc200_cga_w, space, offset, data, mem_mask); }
src/mess/machine/europc.c
r3662r3663
111111      }
112112//      mode= data&0x10?AGA_COLOR:AGA_MONO;
113113//      mode= data&0x10?AGA_COLOR:AGA_OFF;
114      pc_aga_set_mode(machine,europc_jim.mode);
114      pc_aga_set_mode(space->machine,europc_jim.mode);
115115      if (data&0x80) europc_jim.state=0;
116116      break;
117117   case 4:
118118      switch(data&0xc0) {
119      case 0x00: cpunum_set_clockscale(machine, 0, 1.0/2);break;
120      case 0x40: cpunum_set_clockscale(machine, 0, 3.0/4);break;
121      default: cpunum_set_clockscale(machine, 0, 1);break;
119      case 0x00: cpu_set_clockscale(space->machine->cpu[0], 1.0/2);break;
120      case 0x40: cpu_set_clockscale(space->machine->cpu[0], 3.0/4);break;
121      default: cpu_set_clockscale(space->machine->cpu[0], 1);break;
122122      }
123123      break;
124124   case 0xa:
125      europc_rtc_w(machine, 0, data);
125      europc_rtc_w(space, 0, data);
126126      return;
127127   }
128128   logerror("jim write %.2x %.2x\n",offset,data);
r3662r3663
135135   switch(offset) {
136136   case 4: case 5: case 6: case 7: data=europc_jim.data[offset];break;
137137   case 0: case 1: case 2: case 3: data=0;break;
138   case 0xa: return europc_rtc_r(machine, 0);
138   case 0xa: return europc_rtc_r(space, 0);
139139   }
140140   return data;
141141}
r3662r3663
170170      europc_pio.port61=data;
171171//      if (data==0x30) pc1640.port62=(pc1640.port65&0x10)>>4;
172172//      else if (data==0x34) pc1640.port62=pc1640.port65&0xf;
173      pit8253_gate_w( (device_config*)device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ), 2, data & 1);
173      pit8253_gate_w( (device_config*)device_list_find_by_tag( space->machine->config->devicelist, PIT8253, "pit8253" ), 2, data & 1);
174174      pc_speaker_set_spkrdata( data & 0x02 );
175175      pc_keyb_set_clock(data&0x40);
176176      break;
r3662r3663
192192      data=europc_pio.port61;
193193      break;
194194   case 2:
195      if (pit8253_get_output(device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ),2)) data|=0x20;
195      if (pit8253_get_output(device_list_find_by_tag( space->machine->config->devicelist, PIT8253, "pit8253" ),2)) data|=0x20;
196196      break;
197197   }
198198   return data;
src/mess/machine/tandy1t.c
r3662r3663
148148
149149WRITE8_HANDLER ( pc_t1t_p37x_w )
150150{
151//   DBG_LOG(2,"T1T_p37x_w",("%.5x #%d $%02x\n", activecpu_get_pc(),offset, data));
151//   DBG_LOG(2,"T1T_p37x_w",("%.5x #%d $%02x\n", cpu_get_pc( space->cpu),offset, data));
152152   if (offset!=4)
153      logerror("T1T_p37x_w %.5x #%d $%02x\n", activecpu_get_pc(),offset, data);
153      logerror("T1T_p37x_w %.5x #%d $%02x\n", cpu_get_pc( space->cpu),offset, data);
154154   tandy.data[offset]=data;
155155   switch( offset )
156156   {
r3662r3663
163163 READ8_HANDLER ( pc_t1t_p37x_r )
164164{
165165   int data = tandy.data[offset];
166//   DBG_LOG(1,"T1T_p37x_r",("%.5x #%d $%02x\n", activecpu_get_pc(), offset, data));
166//   DBG_LOG(1,"T1T_p37x_r",("%.5x #%d $%02x\n", cpu_get_pc( space->cpu), offset, data));
167167    return data;
168168}
169169
r3662r3663
184184   switch (offset) {
185185   case 1:
186186      tandy_ppi.portb = data;
187      pit8253_gate_w( (device_config*)device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ), 2, data & 1);
187      pit8253_gate_w( (device_config*)device_list_find_by_tag( space->machine->config->devicelist, PIT8253, "pit8253" ), 2, data & 1);
188188      pc_speaker_set_spkrdata( data & 0x02 );
189189      pc_keyb_set_clock(data&0x40);
190190      if ( data & 0x80 ) {
r3662r3663
193193      break;
194194   case 2:
195195      tandy_ppi.portc = data;
196      if (data&8) cpunum_set_clockscale(machine, 0, 1);
197      else cpunum_set_clockscale(machine, 0, 4.77/8);
196      if (data&8) cpu_set_clockscale(space->machine->cpu[0], 1);
197      else cpu_set_clockscale(space->machine->cpu[0], 4.77/8);
198198      break;
199199   }
200200}
src/mess/machine/amstr_pc.c
r3662r3663
154154      pc1640.port61=data;
155155      if (data==0x30) pc1640.port62=(pc1640.port65&0x10)>>4;
156156      else if (data==0x34) pc1640.port62=pc1640.port65&0xf;
157      pit8253_gate_w( (device_config*)device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ), 2, data & 1);
157      pit8253_gate_w( (device_config*)device_list_find_by_tag( space->machine->config->devicelist, PIT8253, "pit8253" ), 2, data & 1);
158158      pc_speaker_set_spkrdata( data & 0x02 );
159159      pc_keyb_set_clock(data&0x40);
160160      break;
r3662r3663
192192
193193   case 2:
194194      data = pc1640.port62;
195      if (pit8253_get_output(device_list_find_by_tag( machine->config->devicelist, PIT8253, "pit8253" ), 2))
195      if (pit8253_get_output(device_list_find_by_tag( space->machine->config->devicelist, PIT8253, "pit8253" ), 2))
196196         data |= 0x20;
197197      break;
198198   }
r3662r3663
201201
202202 READ8_HANDLER( pc200_port378_r )
203203{
204   int data=pc_parallelport1_r(machine, offset);
204   int data=pc_parallelport1_r(space, offset);
205205   if (offset == 1)
206      data = (data & ~7) | (input_port_read(machine, "DSW0") & 7);
206      data = (data & ~7) | (input_port_read(space->machine, "DSW0") & 7);
207207   if (offset == 2)
208      data = (data & ~0xe0) | (input_port_read(machine, "DSW0") & 0xc0);
208      data = (data & ~0xe0) | (input_port_read(space->machine, "DSW0") & 0xc0);
209209   return data;
210210}
211211
212212
213213 READ8_HANDLER( pc1640_port378_r )
214214{
215   int data=pc_parallelport1_r(machine, offset);
215   int data=pc_parallelport1_r(space, offset);
216216   if (offset == 1)
217      data=(data & ~7) | (input_port_read(machine, "DSW0") & 7);
217      data=(data & ~7) | (input_port_read(space->machine, "DSW0") & 7);
218218   if (offset == 2)
219219   {
220220      switch (pc1640.dipstate)
221221      {
222222      case 0:
223         data = (data&~0xe0) | (input_port_read(machine, "DSW0") & 0xe0);
223         data = (data&~0xe0) | (input_port_read(space->machine, "DSW0") & 0xe0);
224224         break;
225225      case 1:
226         data = (data&~0xe0) | ((input_port_read(machine, "DSW0") & 0xe000)>>8);
226         data = (data&~0xe0) | ((input_port_read(space->machine, "DSW0") & 0xe000)>>8);
227227         break;
228228      case 2:
229         data = (data&~0xe0) | ((input_port_read(machine, "DSW0") & 0xe00)>>4);
229         data = (data&~0xe0) | ((input_port_read(space->machine, "DSW0") & 0xe00)>>4);
230230         break;
231231
232232      }
r3662r3663
237237 READ8_HANDLER( pc1640_port3d0_r )
238238{
239239   if (offset==0xa) pc1640.dipstate=0;
240   return vga_port_03d0_r(machine, offset);
240   return vga_port_03d0_r(space, offset);
241241}
242242
243243 READ8_HANDLER( pc1640_port4278_r )
r3662r3663
256256
257257static READ8_HANDLER( pc1640_mouse_x_r )
258258{
259   return pc1640.mouse.x - input_port_read(machine, "pc_mouse_x");
259   return pc1640.mouse.x - input_port_read(space->machine, "pc_mouse_x");
260260}
261261
262262static READ8_HANDLER( pc1640_mouse_y_r )
263263{
264   return pc1640.mouse.y - input_port_read(machine, "pc_mouse_y");
264   return pc1640.mouse.y - input_port_read(space->machine, "pc_mouse_y");
265265}
266266
267267static WRITE8_HANDLER( pc1640_mouse_x_w )
268268{
269   pc1640.mouse.x = data + input_port_read(machine, "pc_mouse_x");
269   pc1640.mouse.x = data + input_port_read(space->machine, "pc_mouse_x");
270270}
271271
272272static WRITE8_HANDLER( pc1640_mouse_y_w )
273273{
274   pc1640.mouse.y = data + input_port_read(machine, "pc_mouse_y");
274   pc1640.mouse.y = data + input_port_read(space->machine, "pc_mouse_y");
275275}
276276
277READ16_HANDLER( pc1640_16le_mouse_x_r )    { return read16le_with_read8_handler(pc1640_mouse_x_r, machine, offset, mem_mask); }
278READ16_HANDLER( pc1640_16le_mouse_y_r )  { return read16le_with_read8_handler(pc1640_mouse_y_r, machine, offset, mem_mask); }
279WRITE16_HANDLER( pc1640_16le_mouse_x_w ) { write16le_with_write8_handler(pc1640_mouse_x_w, machine, offset, data, mem_mask); }
280WRITE16_HANDLER( pc1640_16le_mouse_y_w ) { write16le_with_write8_handler(pc1640_mouse_y_w, machine, offset, data, mem_mask); }
277READ16_HANDLER( pc1640_16le_mouse_x_r )    { return read16le_with_read8_handler(pc1640_mouse_x_r, space, offset, mem_mask); }
278READ16_HANDLER( pc1640_16le_mouse_y_r )  { return read16le_with_read8_handler(pc1640_mouse_y_r, space, offset, mem_mask); }
279WRITE16_HANDLER( pc1640_16le_mouse_x_w ) { write16le_with_write8_handler(pc1640_mouse_x_w, space, offset, data, mem_mask); }
280WRITE16_HANDLER( pc1640_16le_mouse_y_w ) { write16le_with_write8_handler(pc1640_mouse_y_w, space, offset, data, mem_mask); }
281281
282282INPUT_PORTS_START( amstrad_keyboard )
283283
r3662r3663
408408INPUT_PORTS_END
409409
410410
411READ16_HANDLER( pc1640_16le_port60_r ) { return read16le_with_read8_handler(pc1640_port60_r, machine, offset, mem_mask); }
412WRITE16_HANDLER( pc1640_16le_port60_w ) { write16le_with_write8_handler(pc1640_port60_w, machine, offset, data, mem_mask); }
411READ16_HANDLER( pc1640_16le_port60_r ) { return read16le_with_read8_handler(pc1640_port60_r, space, offset, mem_mask); }
412WRITE16_HANDLER( pc1640_16le_port60_w ) { write16le_with_write8_handler(pc1640_port60_w, space, offset, data, mem_mask); }
413413
414READ16_HANDLER( pc200_16le_port378_r ) { return read16le_with_read8_handler(pc200_port378_r, machine, offset, mem_mask); }
415READ16_HANDLER( pc1640_16le_port378_r ) { return read16le_with_read8_handler(pc1640_port378_r, machine, offset, mem_mask); }
416READ16_HANDLER( pc1640_16le_port3d0_r ) { return read16le_with_read8_handler(pc1640_port3d0_r, machine, offset, mem_mask); }
417READ16_HANDLER( pc1640_16le_port4278_r ) { return read16le_with_read8_handler(pc1640_port4278_r, machine, offset, mem_mask); }
418READ16_HANDLER( pc1640_16le_port278_r ) { return read16le_with_read8_handler(pc1640_port278_r, machine, offset, mem_mask); }
414READ16_HANDLER( pc200_16le_port378_r ) { return read16le_with_read8_handler(pc200_port378_r, space, offset, mem_mask); }
415READ16_HANDLER( pc1640_16le_port378_r ) { return read16le_with_read8_handler(pc1640_port378_r, space, offset, mem_mask); }
416READ16_HANDLER( pc1640_16le_port3d0_r ) { return read16le_with_read8_handler(pc1640_port3d0_r, space, offset, mem_mask); }
417READ16_HANDLER( pc1640_16le_port4278_r ) { return read16le_with_read8_handler(pc1640_port4278_r, space, offset, mem_mask); }
418READ16_HANDLER( pc1640_16le_port278_r ) { return read16le_with_read8_handler(pc1640_port278_r, space, offset, mem_mask); }
src/mess/machine/ibmpc.c
r3662r3663
129129   }
130130}
131131
132READ16_HANDLER( pc16le_rtc_r ) { return read16le_with_read8_handler(pc_rtc_r, machine, offset, mem_mask); }
133WRITE16_HANDLER( pc16le_rtc_w ) { write16le_with_write8_handler(pc_rtc_w, machine, offset, data, mem_mask); }
132READ16_HANDLER( pc16le_rtc_r ) { return read16le_with_read8_handler(pc_rtc_r, space, offset, mem_mask); }
133WRITE16_HANDLER( pc16le_rtc_w ) { write16le_with_write8_handler(pc_rtc_w, space, offset, data, mem_mask); }
134134
135135/*************************************************************************
136136 *
src/mess/machine/pc.c
r3662r3663
101101   offs_t page_offset = (((offs_t) dma_offset[0][channel]) << 16)
102102      & 0x0F0000;
103103
104   cpuintrf_push_context(0);
105   result = memory_read_byte(space, page_offset + offset);
106   cpuintrf_pop_context();
104   cpu_push_context( device->machine->cpu[0] );
105   result = memory_read_byte( cpu_get_address_space( device->machine->cpu[0], ADDRESS_SPACE_PROGRAM ), page_offset + offset);
106   cpu_pop_context();
107107
108108   return result;
109109}
r3662r3663
114114   offs_t page_offset = (((offs_t) dma_offset[0][channel]) << 16)
115115      & 0x0F0000;
116116
117   cpuintrf_push_context(0);
118   memory_write_byte(space, page_offset + offset, data);
119   cpuintrf_pop_context();
117   cpu_push_context( device->machine->cpu[0] );
118   memory_write_byte( cpu_get_address_space( device->machine->cpu[0], ADDRESS_SPACE_PROGRAM ), page_offset + offset, data);
119   cpu_pop_context();
120120}
121121
122122
r3662r3663
214214
215215static TIMER_CALLBACK( pcjr_delayed_pic8259_irq )
216216{
217    cpunum_set_input_line(pc_devices.pic8259_master->machine, 0, 0, param ? HOLD_LINE : CLEAR_LINE);
217    cpu_set_input_line(machine->cpu[0], 0, param ? ASSERT_LINE : CLEAR_LINE);
218218}
219219
220220
221221static PIC8259_SET_INT_LINE( pcjr_pic8259_master_set_int_line )
222222{
223   if ( cpunum_get_reg( 0, REG_PC ) == 0xF0454 )
223   if ( cpu_get_reg( device->machine->cpu[0], REG_PC ) == 0xF0454 )
224224   {
225225      timer_adjust_oneshot( pc_int_delay_timer, ATTOTIME_IN_CYCLES(1,0), interrupt );
226226   }
r3662r3663
560560         pcjr_keyb.latch = 1;
561561         if ( nmi_enabled & 0x80 )
562562         {
563            cpunum_set_input_line( Machine, 0, INPUT_LINE_NMI, PULSE_LINE );
563            cpu_set_input_line( Machine->cpu[0], INPUT_LINE_NMI, PULSE_LINE );
564564         }
565565      }
566566   }
r3662r3663
645645   UINT8               data_signal;
646646   UINT8               shift_register;
647647   UINT8               shift_enable;
648   write8_machine_func      clock_callback;
649   write8_machine_func      data_callback;
648   write8_space_func      clock_callback;
649   write8_space_func      data_callback;
650650} pc_ppi={ 0 };
651651
652652
r3662r3663
792792
793793   pc_ppi.clock_signal = ( pc_ppi.keyb_clock ) ? 1 : 0;
794794
795   pc_ppi.clock_callback( device->machine, 0, pc_ppi.clock_signal );
795   pc_ppi.clock_callback( cpu_get_address_space( device->machine->cpu[0], ADDRESS_SPACE_PROGRAM ), 0, pc_ppi.clock_signal );
796796
797797   /* If PB7 is set clear the shift register and reset the IRQ line */
798798   if ( pc_ppi.keyboard_clear )
r3662r3663
831831                  pic8259_set_irq_line(pc_devices.pic8259_master, 1, 1);
832832                  pc_ppi.shift_enable = 0;
833833                  pc_ppi.clock_signal = 0;
834                  pc_ppi.clock_callback( machine, 0, 0 );
834                  pc_ppi.clock_callback( space, 0, 0 );
835835               }
836836            }
837837         }
838838      }
839839   }
840840
841   pc_ppi.clock_callback( machine, 0, pc_ppi.clock_signal );
841   pc_ppi.clock_callback( space, 0, pc_ppi.clock_signal );
842842}
843843
844844
r3662r3663
846846{
847847   pc_ppi.data_signal = data;
848848
849   pc_ppi.data_callback( machine, 0, pc_ppi.data_signal );
849   pc_ppi.data_callback( space, 0, pc_ppi.data_signal );
850850}
851851
852852
853static void ibm5150_set_keyboard_interface( running_machine *machine, write8_machine_func clock_cb, write8_machine_func data_cb )
853static void ibm5150_set_keyboard_interface( running_machine *machine, write8_space_func clock_cb, write8_space_func data_cb )
854854{
855855   pc_ppi.clock_callback = clock_cb;
856856   pc_ppi.data_callback = data_cb;
r3662r3663
10901090
10911091   /* MESS managed RAM */
10921092   if ( mess_ram )
1093      memory_set_bankptr( 10, mess_ram );
1093      memory_set_bankptr( machine, 10, mess_ram );
10941094
10951095   /* FDC/HDC hardware */
10961096   pc_hdc_setup(set_hdc_int_func);
r3662r3663
11741174
11751175DRIVER_INIT( pc200 )
11761176{
1177   const address_space *space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM );
1178   const address_space *io_space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_IO );
11771179   UINT8 *gfx = &memory_region(machine, "gfx1")[0x8000];
11781180   int i;
11791181
r3662r3663
11811183    for (i = 0; i < 256; i++)
11821184      gfx[i] = i;
11831185
1184   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_r );
1185   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_w );
1186   memory_install_read16_handler( space, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_r );
1187   memory_install_write16_handler( space, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_w );
11861188   videoram_size=0x10000;
11871189   videoram=memory_region(machine, "main")+0xb0000;
1188   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc200_16le_port378_r );
1190   memory_install_read16_handler( io_space, 0x278, 0x27b, 0, 0, pc200_16le_port378_r );
11891191
11901192   mess_init_pc_common(machine, PCCOMMON_KEYBOARD_PC, pc_set_keyb_int, pc_set_irq_line);
11911193}
11921194
11931195DRIVER_INIT( pc1512 )
11941196{
1197   const address_space *space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM );
1198   const address_space *io_space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_IO );
11951199   UINT8 *gfx = &memory_region(machine, "gfx1")[0x8000];
11961200   int i;
11971201
r3662r3663
11991203    for (i = 0; i < 256; i++)
12001204      gfx[i] = i;
12011205
1202   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbbfff, 0, 0x0C000, SMH_BANK1 );
1203   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbbfff, 0, 0x0C000, pc1512_videoram16le_w );
1206   memory_install_read16_handler( space, 0xb8000, 0xbbfff, 0, 0x0C000, SMH_BANK1 );
1207   memory_install_write16_handler( space, 0xb8000, 0xbbfff, 0, 0x0C000, pc1512_videoram16le_w );
12041208
1205   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1512_16le_r );
1206   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1512_16le_w );
1209   memory_install_read16_handler( io_space, 0x3d0, 0x3df, 0, 0, pc1512_16le_r );
1210   memory_install_write16_handler( io_space, 0x3d0, 0x3df, 0, 0, pc1512_16le_w );
12071211
1208   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc16le_parallelport2_r );
1212   memory_install_read16_handler( io_space, 0x278, 0x27b, 0, 0, pc16le_parallelport2_r );
12091213
12101214
12111215   mess_init_pc_common(machine, PCCOMMON_KEYBOARD_PC, pc_set_keyb_int, pc_set_irq_line);
r3662r3663
12201224
12211225
12221226
1223static void pc_map_vga_memory(offs_t begin, offs_t end, read8_machine_func rh, write8_machine_func wh)
1227static void pc_map_vga_memory(offs_t begin, offs_t end, read8_space_func rh, write8_space_func wh)
12241228{
1229   const address_space *space = cpu_get_address_space( Machine->cpu[0], ADDRESS_SPACE_PROGRAM );
12251230   int buswidth;
1226   buswidth = cputype_databus_width(Machine->config->cpu[0].type, ADDRESS_SPACE_PROGRAM);
1231   buswidth = cpu_get_databus_width(Machine->cpu[0], ADDRESS_SPACE_PROGRAM);
12271232   switch(buswidth)
12281233   {
12291234      case 8:
1230         memory_install_read8_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, 0xA0000, 0xBFFFF, 0, 0, SMH_NOP);
1231         memory_install_write8_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, 0xA0000, 0xBFFFF, 0, 0, SMH_NOP);
1235         memory_install_read8_handler(space, 0xA0000, 0xBFFFF, 0, 0, SMH_NOP);
1236         memory_install_write8_handler(space, 0xA0000, 0xBFFFF, 0, 0, SMH_NOP);
12321237
1233         memory_install_read8_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, rh);
1234         memory_install_write8_handler(Machine, 0, ADDRESS_SPACE_PROGRAM, begin, end, 0, 0, wh);
1238         memory_install_read8_handler(space, begin, end, 0, 0, rh);
1239         memory_install_write8_handler(space, begin, end, 0, 0, wh);
12351240         break;
12361241
12371242      default:
r3662r3663
12571262
12581263DRIVER_INIT( pc1640 )
12591264{
1265   const address_space *space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_PROGRAM );
1266   const address_space *io_space = cpu_get_address_space( machine->cpu[0], ADDRESS_SPACE_IO );
1267
12601268   pc_vga_init(machine, &vga_interface, NULL);
1261   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xa0000, 0xaffff, 0, 0, SMH_BANK1 );
1262   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb7fff, 0, 0, SMH_BANK2 );
1263   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbffff, 0, 0, SMH_BANK3 );
1269   memory_install_read16_handler(space, 0xa0000, 0xaffff, 0, 0, SMH_BANK1 );
1270   memory_install_read16_handler(space, 0xb0000, 0xb7fff, 0, 0, SMH_BANK2 );
1271   memory_install_read16_handler(space, 0xb8000, 0xbffff, 0, 0, SMH_BANK3 );
12641272
1265   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xa0000, 0xaffff, 0, 0, SMH_BANK1 );
1266   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb0000, 0xb7fff, 0, 0, SMH_BANK2 );
1267   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xb8000, 0xbffff, 0, 0, SMH_BANK3 );
1273   memory_install_write16_handler(space, 0xa0000, 0xaffff, 0, 0, SMH_BANK1 );
1274   memory_install_write16_handler(space, 0xb0000, 0xb7fff, 0, 0, SMH_BANK2 );
1275   memory_install_write16_handler(space, 0xb8000, 0xbffff, 0, 0, SMH_BANK3 );
12681276
1269   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, vga_port16le_03b0_r );
1270   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3c0, 0x3cf, 0, 0, paradise_ega16le_03c0_r );
1271   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, pc1640_16le_port3d0_r );
1277   memory_install_read16_handler(io_space, 0x3b0, 0x3bf, 0, 0, vga_port16le_03b0_r );
1278   memory_install_read16_handler(io_space, 0x3c0, 0x3cf, 0, 0, paradise_ega16le_03c0_r );
1279   memory_install_read16_handler(io_space, 0x3d0, 0x3df, 0, 0, pc1640_16le_port3d0_r );
12721280
1273   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b0, 0x3bf, 0, 0, vga_port16le_03b0_w );
1274   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3c0, 0x3cf, 0, 0, vga_port16le_03c0_w );
1275   memory_install_write16_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d0, 0x3df, 0, 0, vga_port16le_03d0_w );
1281   memory_install_write16_handler(io_space, 0x3b0, 0x3bf, 0, 0, vga_port16le_03b0_w );
1282   memory_install_write16_handler(io_space, 0x3c0, 0x3cf, 0, 0, vga_port16le_03c0_w );
1283   memory_install_write16_handler(io_space, 0x3d0, 0x3df, 0, 0, vga_port16le_03d0_w );
12761284
1277   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x278, 0x27b, 0, 0, pc1640_16le_port278_r );
1278   memory_install_read16_handler(machine, 0, ADDRESS_SPACE_IO, 0x4278, 0x427b, 0, 0, pc1640_16le_port4278_r );
1285   memory_install_read16_handler(io_space, 0x278, 0x27b, 0, 0, pc1640_16le_port278_r );
1286   memory_install_read16_handler(io_space, 0x4278, 0x427b, 0, 0, pc1640_16le_port4278_r );
12791287
12801288   mess_init_pc_common(machine, PCCOMMON_KEYBOARD_PC, pc_set_keyb_int, pc_set_irq_line);
12811289
r3662r3663
13031311
13041312MACHINE_RESET( pc )
13051313{
1306   cpunum_set_irq_callback(0, pc_irq_callback);
1314   cpu_set_irq_callback(machine->cpu[0], pc_irq_callback);
13071315
13081316   pc_devices.pic8259_master = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_master" );
13091317   pc_devices.pic8259_slave = device_list_find_by_tag( machine->config->devicelist, PIC8259, "pic8259_slave" );
src/mess/mess.mak
r3662r3663
376376   $(MESSOBJ)/apf.a \
377377   $(MESSOBJ)/apple.a \
378378   $(MESSOBJ)/arcadia.a \
379   $(MESSOBJ)/at.a \
379380   $(MESSOBJ)/aquarius.a \
380381   $(MESSOBJ)/ascii.a \
381382   $(MESSOBJ)/avigo.a \
r3662r3663
413414   $(MESSOBJ)/orion.a \
414415   $(MESSOBJ)/osborne.a \
415416   $(MESSOBJ)/p2000.a \
417   $(MESSOBJ)/pc.a \
416418   $(MESSOBJ)/pcshare.a \
417419   $(MESSOBJ)/pel.a \
418420   $(MESSOBJ)/pk8020.a \
r3662r3663
442444   $(MESSOBJ)/vtech.a \
443445   $(MESSOBJ)/shared.a \
444446
445#   $(MESSOBJ)/at.a \
446447#   $(MESSOBJ)/atari.a \
447448#   $(MESSOBJ)/bally.a \
448449#   $(MESSOBJ)/bandai.a \
r3662r3663
470471#   $(MESSOBJ)/nec.a \
471472#   $(MESSOBJ)/necpc.a \
472473#   $(MESSOBJ)/pasogo.a \
473#   $(MESSOBJ)/pc.a \
474474#   $(MESSOBJ)/pdp1.a \
475475#   $(MESSOBJ)/rockwell.a \
476476#   $(MESSOBJ)/samcoupe.a \
src/mess/drivers/pc.c
r3662r3663
171171static READ8_HANDLER( pc_ym3812_0_r )
172172{
173173   if ((offset % 1) == 0)
174      return ym3812_status_port_0_r(machine, 0);
174      return ym3812_status_port_0_r(space, 0);
175175   else
176176      return 0x00;
177177}
r3662r3663
179179static WRITE8_HANDLER( pc_ym3812_0_w )
180180{
181181   if ((offset % 1) == 0)
182      ym3812_control_port_0_w(machine, 0, data);
182      ym3812_control_port_0_w(space, 0, data);
183183   else
184      ym3812_write_port_0_w(machine, 0, data);
184      ym3812_write_port_0_w(space, 0, data);
185185}
186186
187187#ifdef UNUSED_FUNCTION

Previous 15994 Revisions Next


© 1998-2018 The MESS Team