Previous 15994 Revisions Next

r5995 Wednesday 7th October, 2009 at 13:28:09 UTC by Miodrag Milanović
[PC] Fixed some booting issues with Amstrad PC clones
[src/mess/drivers]pc.c
[src/mess/includes]amstr_pc.h
[src/mess/machine]amstr_pc.c pc.c
[src/mess/video]pc_aga.c

src/mess/video/pc_aga.c
r5994r5995
814814// but now cga and mda are splitted in mess
815815WRITE8_HANDLER( pc200_cga_w )
816816{
817   pc_aga_cga_w(space, offset,data);
817818   switch(offset) {
818819   case 4:
819      pc200.portd |= 0x20;
820//      pc_cga8_w(space, offset,data);
820      pc200.portd |= 0x20;   
821821      break;
822822   case 8:
823823      pc200.port8 = data;
824      pc200.portd |= 0x80;
825//      pc_cga8_w(space, offset,data);
824      pc200.portd |= 0x80;     
826825      break;
827826   case 0xe:
828827      pc200.portd = 0x1f;
r5994r5995
847846      break;
848847
849848   default:
850//      pc_cga8_w(space, offset,data);
851849      break;
852850   }
853851}
854852
855853READ8_HANDLER ( pc200_cga_r )
856854{
857   UINT8 result = 0;
855   UINT8 result = 0xff;
858856
859857   switch(offset) {
860858   case 8:
r5994r5995
874872      break;
875873
876874   default:
877//      result = pc_cga8_r(space, offset);
875      result = pc_aga_cga_r(space, offset);
878876      break;
879877   }
880878   return result;
src/mess/includes/amstr_pc.h
r5994r5995
3131READ8_HANDLER( pc1640_port278_r );
3232
3333READ16_HANDLER( pc200_16le_port378_r );
34READ16_HANDLER( pc200_16le_port278_r );
3435READ16_HANDLER( pc1640_16le_port378_r );
3536READ16_HANDLER( pc1640_16le_port3d0_r );
3637READ16_HANDLER( pc1640_16le_port4278_r );
src/mess/machine/amstr_pc.c
r5994r5995
201201
202202READ8_HANDLER( pc200_port378_r )
203203{
204   const device_config *lpt = devtag_get_device(space->machine, "lpt_1");
205   UINT8 data = pc_lpt_r(lpt, offset);
206
207   if (offset == 1)
208      data = (data & ~7) | (input_port_read(space->machine, "DSW0") & 7);
209   if (offset == 2)
210      data = (data & ~0xe0) | (input_port_read(space->machine, "DSW0") & 0xc0);
211
212   return data;
213}
214
215READ8_HANDLER( pc200_port278_r )
216{
204217   const device_config *lpt = devtag_get_device(space->machine, "lpt_2");
205218   UINT8 data = pc_lpt_r(lpt, offset);
206219
r5994r5995
416429READ16_HANDLER( pc1640_16le_port60_r ) { return read16le_with_read8_handler(pc1640_port60_r, space, offset, mem_mask); }
417430WRITE16_HANDLER( pc1640_16le_port60_w ) { write16le_with_write8_handler(pc1640_port60_w, space, offset, data, mem_mask); }
418431
432READ16_HANDLER( pc200_16le_port278_r ) { return read16le_with_read8_handler(pc200_port278_r, space, offset, mem_mask); }
419433READ16_HANDLER( pc200_16le_port378_r ) { return read16le_with_read8_handler(pc200_port378_r, space, offset, mem_mask); }
420434READ16_HANDLER( pc1640_16le_port378_r ) { return read16le_with_read8_handler(pc1640_port378_r, space, offset, mem_mask); }
421435READ16_HANDLER( pc1640_16le_port3d0_r ) { return read16le_with_read8_handler(pc1640_port3d0_r, space, offset, mem_mask); }
src/mess/machine/pc.c
r5994r5995
12291229DRIVER_INIT( pc200 )
12301230{
12311231   const address_space *space = cpu_get_address_space( machine->firstcpu, ADDRESS_SPACE_PROGRAM );
1232   const address_space *io_space = cpu_get_address_space( machine->firstcpu, ADDRESS_SPACE_IO );
12331232   UINT8 *gfx = &memory_region(machine, "gfx1")[0x8000];
12341233   int i;
12351234
r5994r5995
12401239   memory_install_read16_handler( space, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_r );
12411240   memory_install_write16_handler( space, 0xb0000, 0xbffff, 0, 0, pc200_videoram16le_w );
12421241   videoram_size=0x10000;
1243   videoram=memory_region(machine, "maincpu")+0xb0000;
1244   memory_install_read16_handler( io_space, 0x278, 0x27b, 0, 0, pc200_16le_port378_r );
1245
1242   videoram=memory_region(machine, "maincpu")+0xb0000;   
12461243   mess_init_pc_common(machine, PCCOMMON_KEYBOARD_PC, pc_set_keyb_int, pc_set_irq_line);
12471244}
12481245
src/mess/drivers/pc.c
r5994r5995
438438ADDRESS_MAP_END
439439
440440
441static ADDRESS_MAP_START( pc200_map, ADDRESS_SPACE_PROGRAM, 16 )
442   AM_RANGE(0x00000, 0x9ffff) AM_RAMBANK(10)
443   AM_RANGE(0xa0000, 0xbffff) AM_NOP
444   AM_RANGE(0xc0000, 0xc7fff) AM_ROM
445   AM_RANGE(0xc8000, 0xcffff) AM_ROM
446   AM_RANGE(0xd0000, 0xeffff) AM_NOP
447   AM_RANGE(0xf0000, 0xfffff) AM_ROM
448ADDRESS_MAP_END
441449
442450static ADDRESS_MAP_START(pc200_io, ADDRESS_SPACE_IO, 16)
443451   AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE8("dma8237", dma8237_r, dma8237_w, 0xffff)
444452   AM_RANGE(0x0020, 0x0021) AM_DEVREADWRITE8("pic8259", pic8259_r, pic8259_w, 0xffff)
445   AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8253", pit8253_r, pit8253_w, 0x00ff)
453   AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8253", pit8253_r, pit8253_w, 0xffff)
446454   AM_RANGE(0x0060, 0x0065) AM_READWRITE(pc1640_16le_port60_r,         pc1640_16le_port60_w)
447455   AM_RANGE(0x0078, 0x0079) AM_READWRITE(pc1640_16le_mouse_x_r,         pc1640_16le_mouse_x_w)
448456   AM_RANGE(0x007a, 0x007b) AM_READWRITE(pc1640_16le_mouse_y_r,         pc1640_16le_mouse_y_w)
449457   AM_RANGE(0x0080, 0x0087) AM_READWRITE8(pc_page_r,               pc_page_w, 0xffff)
450458   AM_RANGE(0x0200, 0x0207) AM_READWRITE(pc16le_JOY_r,               pc16le_JOY_w)
451   AM_RANGE(0x0278, 0x027b) AM_DEVREADWRITE8("lpt_2", pc_lpt_r, pc_lpt_w, 0x00ff)
459   AM_RANGE(0x0278, 0x027b) AM_READ(pc200_16le_port278_r) AM_DEVWRITE8("lpt_2", pc_lpt_w, 0x00ff)
452460   AM_RANGE(0x02e8, 0x02ef) AM_DEVREADWRITE8("ins8250_3", ins8250_r, ins8250_w, 0xffff)
453461   AM_RANGE(0x02f8, 0x02ff) AM_DEVREADWRITE8("ins8250_1", ins8250_r, ins8250_w, 0xffff)
454462   AM_RANGE(0x0320, 0x0323) AM_READWRITE(pc16le_HDC1_r,            pc16le_HDC1_w)
r5994r5995
475483static ADDRESS_MAP_START(pc1640_io, ADDRESS_SPACE_IO, 16)
476484   AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE8("dma8237", dma8237_r, dma8237_w, 0xffff)
477485   AM_RANGE(0x0020, 0x0021) AM_DEVREADWRITE8("pic8259", pic8259_r, pic8259_w, 0xffff)
478   AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8253", pit8253_r, pit8253_w, 0x00ff)
486   AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8253", pit8253_r, pit8253_w, 0xffff)
479487   AM_RANGE(0x0060, 0x0065) AM_READWRITE(pc1640_16le_port60_r,         pc1640_16le_port60_w)
480488   AM_RANGE(0x0070, 0x0071) AM_READWRITE(mc146818_port16le_r,      mc146818_port16le_w)
481489   AM_RANGE(0x0078, 0x0079) AM_READWRITE(pc1640_16le_mouse_x_r,   pc1640_16le_mouse_x_w)
r5994r5995
494502   AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ins8250_0", ins8250_r, ins8250_w, 0xffff)
495503ADDRESS_MAP_END
496504
505static ADDRESS_MAP_START( pc1512_map, ADDRESS_SPACE_PROGRAM, 16 )
506   AM_RANGE(0x00000, 0x9ffff) AM_RAMBANK(10)
507   AM_RANGE(0xa0000, 0xbffff) AM_NOP
508   AM_RANGE(0xc0000, 0xc7fff) AM_ROM
509   AM_RANGE(0xc8000, 0xcffff) AM_ROM
510   AM_RANGE(0xd0000, 0xfbfff) AM_NOP
511   AM_RANGE(0xfc000, 0xfffff) AM_ROM
512ADDRESS_MAP_END
497513
514static ADDRESS_MAP_START(pc1512_io, ADDRESS_SPACE_IO, 16)
515   AM_RANGE(0x0000, 0x000f) AM_DEVREADWRITE8("dma8237", dma8237_r, dma8237_w, 0xffff)
516   AM_RANGE(0x0020, 0x0021) AM_DEVREADWRITE8("pic8259", pic8259_r, pic8259_w, 0xffff)
517   AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE8("pit8253", pit8253_r, pit8253_w, 0xffff)
518   AM_RANGE(0x0060, 0x0065) AM_READWRITE(pc1640_16le_port60_r,         pc1640_16le_port60_w)
519   AM_RANGE(0x0070, 0x0071) AM_READWRITE(mc146818_port16le_r,      mc146818_port16le_w)
520   AM_RANGE(0x0078, 0x0079) AM_READWRITE(pc1640_16le_mouse_x_r,   pc1640_16le_mouse_x_w)
521   AM_RANGE(0x007a, 0x007b) AM_READWRITE(pc1640_16le_mouse_y_r,   pc1640_16le_mouse_y_w)
522   AM_RANGE(0x0080, 0x0087) AM_READWRITE8(pc_page_r,            pc_page_w, 0xffff)
523   AM_RANGE(0x0200, 0x0207) AM_READWRITE(pc16le_JOY_r,            pc16le_JOY_w)
524   AM_RANGE(0x0278, 0x027b) AM_DEVREADWRITE8("lpt_2", pc_lpt_r, pc_lpt_w, 0x00ff)
525   AM_RANGE(0x02e8, 0x02ef) AM_DEVREADWRITE8("ins8250_3", ins8250_r, ins8250_w, 0xffff)
526   AM_RANGE(0x02f8, 0x02ff) AM_DEVREADWRITE8("ins8250_1", ins8250_r, ins8250_w, 0xffff)
527   AM_RANGE(0x0320, 0x0323) AM_READWRITE(pc16le_HDC1_r,         pc16le_HDC1_w)
528   AM_RANGE(0x0324, 0x0327) AM_READWRITE(pc16le_HDC2_r,         pc16le_HDC2_w)
529   AM_RANGE(0x0378, 0x037b) AM_READ(pc1640_16le_port378_r) AM_DEVWRITE8("lpt_1", pc_lpt_w, 0x00ff)
530   AM_RANGE(0x03bc, 0x03bf) AM_DEVREADWRITE8("lpt_0", pc_lpt_r, pc_lpt_w, 0x00ff)
531   AM_RANGE(0x03e8, 0x03ef) AM_DEVREADWRITE8("ins8250_2", ins8250_r, ins8250_w, 0xffff)
532   AM_RANGE(0x03f0, 0x03f7) AM_READWRITE8(pc_fdc_r,            pc_fdc_w, 0xffff)
533   AM_RANGE(0x03f8, 0x03ff) AM_DEVREADWRITE8("ins8250_0", ins8250_r, ins8250_w, 0xffff)
534ADDRESS_MAP_END
498535
499536static INPUT_PORTS_START( pcmda )
500537   PORT_START("IN0") /* IN0 */
r5994r5995
17481785static MACHINE_DRIVER_START( pc200 )
17491786   MDRV_DRIVER_DATA(pc_state)
17501787   /* basic machine hardware */
1751   MDRV_CPU_PC(pc1640, pc200, I8086, 8000000, pc_frame_interrupt)
1788   MDRV_CPU_PC(pc200, pc200, I8086, 8000000, pc_frame_interrupt)
17521789
17531790   MDRV_MACHINE_START(pc)
17541791   MDRV_MACHINE_RESET(pc)
r5994r5995
17911828static MACHINE_DRIVER_START( pc1512 )
17921829   MDRV_DRIVER_DATA(pc_state)
17931830   /* basic machine hardware */
1794   MDRV_CPU_PC(pc1640, pc1640, I8086, 8000000, pc_frame_interrupt)
1831   MDRV_CPU_PC(pc1512, pc1512, I8086, 8000000, pc_frame_interrupt)
17951832
17961833   MDRV_MACHINE_START(pc)
17971834   MDRV_MACHINE_RESET(pc)

Previous 15994 Revisions Next


© 1998-2018 The MESS Team