Previous 15994 Revisions Next

r1629 Monday 28th January, 2008 at 20:47:40 UTC by Wilbert Pol
[VIC20] Fixed u7 regression.
[src/mess/drivers]vc20.c
[src/mess/includes]vc20.h
[src/mess/machine]vc20.c

src/mess/includes/vc20.h
r1628r1629
6565#define DATASSETTE_RECORD   (readinputportbytag( TAG_CASSETTE )&2)
6666#define DATASSETTE_STOP      (readinputportbytag( TAG_CASSETTE )&1)
6767
68/* macros to access the dip switches */
69#define EXPANSION (readinputportbytag( TAG_EXPANSION )&7)
70#define EXP_3K 1
71#define EXP_8K 2
72#define EXP_16K 3
73#define EXP_32K 4
74#define EXP_CUSTOM 5
75#define RAMIN0X0400 ((EXPANSION==EXP_3K)\
76   ||((EXPANSION==EXP_CUSTOM)&&(readinputportbytag( TAG_EXPANSION )&8)) )
77#define RAMIN0X2000 ((EXPANSION==EXP_8K)||(EXPANSION==EXP_16K)\
78   ||(EXPANSION==EXP_32K)\
79   ||((EXPANSION==EXP_CUSTOM)&&(readinputportbytag( TAG_EXPANSION )&0x10)) )
80#define RAMIN0X4000 ((EXPANSION==EXP_16K)||(EXPANSION==EXP_32K)\
81   ||((EXPANSION==EXP_CUSTOM)&&(readinputportbytag( TAG_EXPANSION )&0x20)) )
82#define RAMIN0X6000 ((EXPANSION==EXP_32K)\
83   ||((EXPANSION==EXP_CUSTOM)&&(readinputportbytag( TAG_EXPANSION )&0x40)) )
84#define RAMIN0XA000 ((EXPANSION==EXP_32K)\
85   ||((EXPANSION==EXP_CUSTOM)&&(readinputportbytag( TAG_EXPANSION )&0x80)) )
86
8768#define VC20ADDR2VIC6560ADDR(a) (((a)>0x8000)?((a)&0x1fff):((a)|0x2000))
8869#define VIC6560ADDR2VC20ADDR(a) (((a)>0x2000)?((a)&0x1fff):((a)|0x8000))
8970
9071
9172/*----------- defined in machine/vc20.c -----------*/
9273
93extern UINT8 *vc20_memory;
9474extern UINT8 *vc20_memory_9400;
9575
9676WRITE8_HANDLER ( vc20_write_9400 );
9777
78WRITE8_HANDLER( vc20_0400_w );
79WRITE8_HANDLER( vc20_2000_w );
80WRITE8_HANDLER( vc20_4000_w );
81WRITE8_HANDLER( vc20_6000_w );
82
9883/* split for more performance */
9984/* VIC reads bits 8 till 11 */
10085int vic6560_dma_read_color (int offset);
src/mess/machine/vc20.c
r1628r1629
3636static int serial_atn = 1, serial_clock = 1, serial_data = 1;
3737
3838static int ieee=0; /* ieee cartridge (interface and rom)*/
39static int vc20_rom_2000;
40static int vc20_rom_4000;
41static int vc20_rom_6000;
42static int vc20_rom_a000;
3943
40UINT8 *vc20_memory;
4144UINT8 *vc20_memory_9400;
4245
4346/** via 0 addr 0x9110
r1628r1629
441444   return program_read_byte(VIC6560ADDR2VC20ADDR (offset));
442445}
443446
447WRITE8_HANDLER( vc20_0400_w ) {
448   if ( mess_ram_size >= 8 * 1024 ) {
449      mess_ram[ 0x0400 + offset ] = data;
450   }
451}
452
453WRITE8_HANDLER( vc20_2000_w ) {
454   if ( ( mess_ram_size >= 16 * 1024 ) && ! vc20_rom_2000 ) {
455      mess_ram[ 0x2000 + offset ] = data;
456   }
457}
458
459WRITE8_HANDLER( vc20_4000_w ) {
460   if ( ( mess_ram_size >= 24 * 1024 ) && ! vc20_rom_4000 ) {
461      mess_ram[ 0x4000 + offset ] = data;
462   }
463}
464
465WRITE8_HANDLER( vc20_6000_w ) {
466   if ( ( mess_ram_size >= 32 * 1024 ) && ! vc20_rom_6000 ) {
467      mess_ram[ 0x6000 + offset ] = data;
468   }
469}
470
444471static void vc20_memory_init(void)
445472{
446473   static int inited=0;
r1628r1629
471498   for (i=0x1000;i<0x2000;i+=0x40) memset(memory+i,i&0x40?0:0xff,0x40);
472499#endif
473500
474   /* i think roms look like 0xff */
475   // german cost reduced vc20 reads back highbyte of address
476   // when empty!
477   memset (memory + 0x400, 0xff, 0x1000 - 0x400);
478   memset (memory + 0x2000, 0xff, 0x6000);
479   memset (memory + 0xa000, 0xff, 0x1000);
480
481501   /* clears ieee cartrige rom */
482502   /* memset (memory + 0xa000, 0xff, 0x2000); */
483503
r1628r1629
535555
536556MACHINE_RESET( vc20 )
537557{
538   if (RAMIN0X0400)
539   {
540      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x400, 0xfff, 0, 0, MWA8_RAM);
541      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x400, 0xfff, 0, 0, MRA8_RAM);
542   }
543   else
544   {
545      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x400, 0xfff, 0, 0, MWA8_NOP);
546      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x400, 0xfff, 0, 0, MRA8_ROM);
547   }
548   if (RAMIN0X2000)
549   {
550      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MWA8_RAM);
551      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MRA8_RAM);
552   }
553   else
554   {
555      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MWA8_NOP);
556      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x2000, 0x3fff, 0, 0, MRA8_ROM);
557   }
558   if (RAMIN0X4000)
559   {
560      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x5fff, 0, 0, MWA8_RAM);
561      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x5fff, 0, 0, MRA8_RAM);
562   }
563   else
564   {
565      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x5fff, 0, 0, MWA8_NOP);
566      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x4000, 0x5fff, 0, 0, MRA8_ROM);
567   }
568   if (RAMIN0X6000)
569   {
570      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MWA8_RAM);
571      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_RAM);
572   }
573   else
574   {
575      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MWA8_NOP);
576      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x7fff, 0, 0, MRA8_ROM);
577   }
578   if (ieee)
579   {
580      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0,MWA8_ROM);
581      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0, MRA8_ROM);
582   }
583   else if   (RAMIN0XA000)
584   {
585      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0,MWA8_RAM);
586      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0, MRA8_RAM);
587   }
588   else
589   {
590      memory_install_write8_handler (0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0,MWA8_NOP);
591      memory_install_read8_handler (0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0, MRA8_ROM);
592   }
558   memory_set_bankptr( 1, ( ( mess_ram_size >=  8 * 1024 ) ? mess_ram : memory_region(REGION_CPU1) ) + 0x0400 );
559   memory_set_bankptr( 2, ( ( mess_ram_size >= 16 * 1024 ) ? mess_ram : memory_region(REGION_CPU1) ) + 0x2000 );
560   memory_set_bankptr( 3, ( ( mess_ram_size >= 24 * 1024 ) ? mess_ram : memory_region(REGION_CPU1) ) + 0x4000 );
561   memory_set_bankptr( 4, ( ( mess_ram_size >= 32 * 1024 ) ? mess_ram : memory_region(REGION_CPU1) ) + 0x6000 );
562   memory_set_bankptr( 5, memory_region(REGION_CPU1) + 0xa000 );
593563
594564   cbm_serial_reset_write (0);
595565#ifdef VC1541
r1628r1629
648618DEVICE_INIT(vc20_rom)
649619{
650620   vc20_memory_init();
621   vc20_rom_2000 = 0;
622   vc20_rom_4000 = 0;
623   vc20_rom_6000 = 0;
624   vc20_rom_a000 = 0;
651625   return INIT_PASS;
652626}
653627
654628DEVICE_LOAD(vc20_rom)
655629{
656   UINT8 *mem = memory_region (REGION_CPU1);
657630   int size, read_;
658631   const char *cp;
659632   int addr = 0;
r1628r1629
712685   }
713686
714687   logerror("loading rom %s at %.4x size:%.4x\n",image_filename(image), addr, size);
715   read_ = image_fread(image, mem + addr, size);
688   read_ = image_fread(image, new_memory_region( Machine, REGION_USER1, ( size & 0x1FFF ) ? ( size + 0x2000 ) : size, 0 ), size);
716689   if (read_ != size)
717690      return 1;
691
692   /* Perform banking for the cartridge */
693   switch( addr ) {
694   case 0x2000:
695      memory_set_bankptr( 2, memory_region( REGION_USER1 ) );
696      vc20_rom_2000 = 1;
697      break;
698   case 0x4000:
699      memory_set_bankptr( 3, memory_region( REGION_USER1 ) );
700      vc20_rom_4000 = 1;
701      if ( size > 0x2000 ) {
702         memory_set_bankptr( 4, memory_region( REGION_USER1 ) + 0x2000 );
703         vc20_rom_6000 = 1;
704      }
705      break;
706   case 0x6000:
707      memory_set_bankptr( 4, memory_region( REGION_USER1 ) );
708      vc20_rom_6000 = 1;
709      break;
710   case 0xa000:
711      memory_set_bankptr( 5, memory_region( REGION_USER1 ) );
712      vc20_rom_a000 = 1;
713      break;
714   }
718715   return 0;
719716}
720717
src/mess/drivers/vc20.c
r1628r1629
165165#include "devices/cartslot.h"
166166
167167static ADDRESS_MAP_START( vc20_mem , ADDRESS_SPACE_PROGRAM, 8)
168   AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&vc20_memory)
169#if 0
170   AM_RANGE(0x0400, 0x0fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing; I think read 0xff! */
171#endif
168   AM_RANGE(0x0000, 0x03ff) AM_RAM
169   AM_RANGE(0x0400, 0x0fff) AM_ROMBANK(1) AM_WRITE( vc20_0400_w )   /* ram, rom or nothing */
172170   AM_RANGE(0x1000, 0x1fff) AM_RAM
173#if 0
174   AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing */
175   AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing */
176   AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing */
177#endif
171   AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) AM_WRITE( vc20_2000_w )   /* ram, rom or nothing */
172   AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(3) AM_WRITE( vc20_4000_w )   /* ram, rom or nothing */
173   AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(4) AM_WRITE( vc20_6000_w )   /* ram, rom or nothing */
178174   AM_RANGE(0x8000, 0x8fff) AM_ROM
179175   AM_RANGE(0x9000, 0x900f) AM_READWRITE( vic6560_port_r, vic6560_port_w )
180176   AM_RANGE(0x9010, 0x910f) AM_NOP
r1628r1629
183179   AM_RANGE(0x9130, 0x93ff) AM_NOP
184180   AM_RANGE(0x9400, 0x97ff) AM_READWRITE(MRA8_RAM, vc20_write_9400) AM_BASE(&vc20_memory_9400)   /*color ram 4 bit */
185181   AM_RANGE(0x9800, 0x9fff) AM_NOP
186#if 0
187   AM_RANGE(0xa000, 0xbfff) AM_ROM         /* or nothing */
188#endif
182   AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(5)
189183   AM_RANGE(0xc000, 0xffff) AM_ROM
190184ADDRESS_MAP_END
191185
192186static ADDRESS_MAP_START( vc20i_mem , ADDRESS_SPACE_PROGRAM, 8)
193   AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&vc20_memory)
194#if 0
195   AM_RANGE(0x0400, 0x0fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing; I think read 0xff! */
196#endif
187   AM_RANGE(0x0000, 0x03ff) AM_RAM
188   AM_RANGE(0x0400, 0x0fff) AM_ROMBANK(1) AM_WRITE( vc20_0400_w )   /* ram, rom or nothing */
197189   AM_RANGE(0x1000, 0x1fff) AM_RAM
198#if 0
199   AM_RANGE(0x2000, 0x3fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing */
200   AM_RANGE(0x4000, 0x5fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing */
201   AM_RANGE(0x6000, 0x7fff) AM_READ(MRA8_RAM)   /* ram, rom or nothing */
202#endif
190   AM_RANGE(0x2000, 0x3fff) AM_ROMBANK(2) AM_WRITE( vc20_2000_w )   /* ram, rom or nothing */
191   AM_RANGE(0x4000, 0x5fff) AM_ROMBANK(3) AM_WRITE( vc20_4000_w )   /* ram, rom or nothing */
192   AM_RANGE(0x6000, 0x7fff) AM_ROMBANK(4) AM_WRITE( vc20_6000_w )   /* ram, rom or nothing */
203193   AM_RANGE(0x8000, 0x8fff) AM_ROM
204194   AM_RANGE(0x9000, 0x900f) AM_READWRITE( vic6560_port_r, vic6560_port_w )
205195   AM_RANGE(0x9010, 0x910f) AM_NOP
r1628r1629
208198   AM_RANGE(0x9400, 0x97ff) AM_READWRITE( MRA8_RAM, vc20_write_9400) AM_BASE(&vc20_memory_9400)   /* color ram 4 bit */
209199   AM_RANGE(0x9800, 0x980f) AM_READWRITE( via_4_r, via_4_w )
210200   AM_RANGE(0x9810, 0x981f) AM_READWRITE( via_5_r, via_5_w )
211   AM_RANGE(0xa000, 0xbfff) AM_ROM
201   AM_RANGE(0xa000, 0xbfff) AM_ROMBANK(5)
212202   AM_RANGE(0xc000, 0xffff) AM_ROM
213203ADDRESS_MAP_END
214204
r1628r1629
646636
647637ROM_START (vic20)
648638   ROM_REGION (0x10000, REGION_CPU1,0)
639   ROM_FILL( 0x0000, 0x8000, 0xFF )
649640   ROM_LOAD ("901460.03", 0x8000, 0x1000, CRC(83e032a6) SHA1(4fd85ab6647ee2ac7ba40f729323f2472d35b9b4))
641   ROM_FILL( 0x9000, 0x3000, 0xFF )
650642   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
651643   ROM_LOAD ("901486.06", 0xe000, 0x2000, CRC(e5e7c174) SHA1(06de7ec017a5e78bd6746d89c2ecebb646efeb19))
652644ROM_END
653645
654646ROM_START (vic1001)
655647   ROM_REGION (0x10000, REGION_CPU1,0)
648   ROM_FILL( 0x0000, 0x8000, 0xFF )
656649   ROM_LOAD ("901460.02", 0x8000, 0x1000, CRC(fcfd8a4b) SHA1(dae61ac03065aa2904af5c123ce821855898c555))
650   ROM_FILL( 0x9000, 0x3000, 0xFF )
657651   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
658652   ROM_LOAD ("901486.02", 0xe000, 0x2000, CRC(336900d7) SHA1(c9ead45e6674d1042ca6199160e8583c23aeac22))
659653ROM_END
660654
661655ROM_START (vic20swe)
662656   ROM_REGION (0x10000, REGION_CPU1,0)
657   ROM_FILL( 0x0000, 0x8000, 0xFF )
663658   ROM_LOAD ("nec22101.207", 0x8000, 0x1000, CRC(d808551d) SHA1(f403f0b0ce5922bd61bbd768bdd6f0b38e648c9f))
659   ROM_FILL( 0x9000, 0x3000, 0xFF )
664660   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
665661   ROM_LOAD ("nec22081.206", 0xe000, 0x2000, CRC(b2a60662) SHA1(cb3e2f6e661ea7f567977751846ce9ad524651a3))
666662ROM_END
667663
668664ROM_START (vic20v)
669665   ROM_REGION (0x10000, REGION_CPU1,0)
666   ROM_FILL( 0x0000, 0x8000, 0xFF )
670667   ROM_LOAD ("901460.03", 0x8000, 0x1000, CRC(83e032a6) SHA1(4fd85ab6647ee2ac7ba40f729323f2472d35b9b4))
668   ROM_FILL( 0x9000, 0x3000, 0xFF )
671669   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
672670   ROM_LOAD ("901486.06", 0xe000, 0x2000, CRC(e5e7c174) SHA1(06de7ec017a5e78bd6746d89c2ecebb646efeb19))
673671   VC1540_ROM (REGION_CPU2)
r1628r1629
675673
676674ROM_START (vic20i)
677675   ROM_REGION (0x10000, REGION_CPU1,0)
676   ROM_FILL( 0x0000, 0x8000, 0xFF )
678677   ROM_LOAD ("901460.03", 0x8000, 0x1000, CRC(83e032a6) SHA1(4fd85ab6647ee2ac7ba40f729323f2472d35b9b4))
678   ROM_FILL( 0x9000, 0x2000, 0xFF )
679679   ROM_LOAD ("325329.04", 0xb000, 0x800, CRC(d37b6335) SHA1(828c965829d21c60e8c2d083caee045c639a270f))
680680   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
681681   ROM_LOAD ("901486.06", 0xe000, 0x2000, CRC(e5e7c174) SHA1(06de7ec017a5e78bd6746d89c2ecebb646efeb19))
r1628r1629
684684
685685ROM_START (vc20)
686686   ROM_REGION (0x10000, REGION_CPU1,0)
687   ROM_FILL( 0x0000, 0x8000, 0xFF )
687688   ROM_LOAD ("901460.03", 0x8000, 0x1000, CRC(83e032a6) SHA1(4fd85ab6647ee2ac7ba40f729323f2472d35b9b4))
689   ROM_FILL( 0x9000, 0x3000, 0xFF )
688690   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
689691   ROM_LOAD ("901486.07", 0xe000, 0x2000, CRC(4be07cb4) SHA1(ce0137ed69f003a299f43538fa9eee27898e621e))
690692ROM_END
691693
692694ROM_START (vc20v)
693695   ROM_REGION (0x10000, REGION_CPU1,0)
696   ROM_FILL( 0x0000, 0x8000, 0xFF )
694697   ROM_LOAD ("901460.03", 0x8000, 0x1000, CRC(83e032a6) SHA1(4fd85ab6647ee2ac7ba40f729323f2472d35b9b4))
698   ROM_FILL( 0x9000, 0x3000, 0xFF )
695699   ROM_LOAD ("901486.01", 0xc000, 0x2000, CRC(db4c43c1) SHA1(587d1e90950675ab6b12d91248a3f0d640d02e8d))
696700   ROM_LOAD ("901486.07", 0xe000, 0x2000, CRC(4be07cb4) SHA1(ce0137ed69f003a299f43538fa9eee27898e621e))
697701   VC1541_ROM (REGION_CPU2)
r1628r1629
817821   CONFIG_DEVICE(cbmfloppy_device_getinfo)
818822   CONFIG_DEVICE(vc20_quickload_getinfo)
819823   CONFIG_DEVICE(vc20tape_device_getinfo)
824   CONFIG_RAM_DEFAULT(5 * 1024)
825   CONFIG_RAM(8 * 1024)
826   CONFIG_RAM(16 * 1024)
827   CONFIG_RAM(24 * 1024)
828   CONFIG_RAM(32 * 1024)
820829SYSTEM_CONFIG_END
821830
822831SYSTEM_CONFIG_START(vc20v)
r1628r1629
824833   CONFIG_DEVICE(vc20_quickload_getinfo)
825834   CONFIG_DEVICE(vc20tape_device_getinfo)
826835   CONFIG_DEVICE(vc1541_device_getinfo)
836   CONFIG_RAM_DEFAULT(5 * 1024)
837   CONFIG_RAM(8 * 1024)
838   CONFIG_RAM(16 * 1024)
839   CONFIG_RAM(24 * 1024)
840   CONFIG_RAM(32 * 1024)
827841SYSTEM_CONFIG_END
828842
829843#ifdef PET_TEST_CODE
r1628r1629
832846   CONFIG_DEVICE(vc20_quickload_getinfo)
833847   CONFIG_DEVICE(vc20tape_device_getinfo)
834848   CONFIG_DEVICE(c2031_device_getinfo)
849   CONFIG_RAM_DEFAULT(5 * 1024)
850   CONFIG_RAM(8 * 1024)
851   CONFIG_RAM(16 * 1024)
852   CONFIG_RAM(24 * 1024)
853   CONFIG_RAM(32 * 1024)
835854SYSTEM_CONFIG_END
836855#endif
837856

Previous 15994 Revisions Next


© 1998-2018 The MESS Team