Previous 15994 Revisions Next

r8718 Thursday 5th August, 2010 at 10:36:53 UTC by Fabio Priuli
Fixed device region tag problems pointed out by -valid checks after rev.8715.
Commodore and Luxor drivers should be back to working state (Curt, could you please check the fixes, especially for Conkort and IEEE daisy chain?)
[src/mess/drivers]cbmb.c pet.c
[src/mess/machine]c1541.c c1551.c c1571.c c1581.c c2040.c c9060.c conkort.c

src/mess/machine/conkort.c
r8717r8718
501501
502502static ADDRESS_MAP_START( slow_map, ADDRESS_SPACE_PROGRAM, 8 )
503503   ADDRESS_MAP_GLOBAL_MASK(0x1fff)
504   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_ROM AM_REGION("abc830", 0)
504   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_ROM AM_REGION("abc830:abc830", 0)
505505   AM_RANGE(0x1000, 0x13ff) AM_MIRROR(0x0c00) AM_RAM
506506ADDRESS_MAP_END
507507
r8717r8718
516516// Fast Controller
517517
518518static ADDRESS_MAP_START( fast_map, ADDRESS_SPACE_PROGRAM, 8 )
519   AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("conkort", 0)
519   AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("abc830:conkort", 0)
520520   AM_RANGE(0x2000, 0x3fff) AM_RAM
521521ADDRESS_MAP_END
522522
src/mess/machine/c1581.c
r8717r8718
164164   AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x2000) AM_RAM
165165   AM_RANGE(0x4000, 0x400f) AM_MIRROR(0x1ff0) AM_DEVREADWRITE(M8520_TAG, mos6526_r, mos6526_w)
166166   AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(WD1770_TAG, wd17xx_r, wd17xx_w)
167   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1581", 0)
167   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1581:c1581", 0)
168168ADDRESS_MAP_END
169169
170170/*-------------------------------------------------
r8717r8718
175175   AM_RANGE(0x0000, 0x1fff) AM_MIRROR(0x2000) AM_RAM
176176   AM_RANGE(0x4000, 0x400f) AM_MIRROR(0x1ff0) AM_DEVREADWRITE(M8520_TAG, mos6526_r, mos6526_w)
177177   AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(WD1770_TAG, wd17xx_r, wd17xx_w)
178   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1563", 0)
178   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1563:c1563", 0)
179179ADDRESS_MAP_END
180180
181181/*-------------------------------------------------
src/mess/machine/c2040.c
r8717r8718
432432   AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
433433   AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
434434   AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share4")
435   AM_RANGE(0x6000, 0x7fff) AM_MIRROR(0x0000) AM_ROM AM_REGION(C2040_REGION, 0x0000)
435   AM_RANGE(0x6000, 0x7fff) AM_MIRROR(0x0000) AM_ROM AM_REGION("drive:c2040", 0x0000)
436436ADDRESS_MAP_END
437437
438438/*-------------------------------------------------
r8717r8718
448448   AM_RANGE(0x0800, 0x0bff) AM_RAM AM_SHARE("share2")
449449   AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_SHARE("share3")
450450   AM_RANGE(0x1000, 0x13ff) AM_RAM AM_SHARE("share4")
451   AM_RANGE(0x1c00, 0x1fff) AM_ROM AM_REGION(C2040_REGION, 0x2000) // 6530
451   AM_RANGE(0x1c00, 0x1fff) AM_ROM AM_REGION("drive:c2040", 0x2000) // 6530
452452ADDRESS_MAP_END
453453
454454/*-------------------------------------------------
r8717r8718
465465   AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
466466   AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
467467   AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share4")
468   AM_RANGE(0x5000, 0x7fff) AM_ROM AM_REGION(C4040_REGION, 0x0000)
468   AM_RANGE(0x5000, 0x7fff) AM_ROM AM_REGION("drive:c4040", 0x0000)
469469ADDRESS_MAP_END
470470
471471/*-------------------------------------------------
r8717r8718
481481   AM_RANGE(0x0800, 0x0bff) AM_RAM AM_SHARE("share2")
482482   AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_SHARE("share3")
483483   AM_RANGE(0x1000, 0x13ff) AM_RAM AM_SHARE("share4")
484   AM_RANGE(0x1c00, 0x1fff) AM_ROM AM_REGION(C4040_REGION, 0x3000) // 6530
484   AM_RANGE(0x1c00, 0x1fff) AM_ROM AM_REGION("drive:c4040", 0x3000) // 6530
485485ADDRESS_MAP_END
486486
487487/*-------------------------------------------------
r8717r8718
497497   AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
498498   AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
499499   AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share4")
500   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(C8050_REGION, 0x0000)
500   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("drive:c8050", 0x0000)
501501ADDRESS_MAP_END
502502
503503/*-------------------------------------------------
r8717r8718
513513   AM_RANGE(0x0800, 0x0bff) AM_RAM AM_SHARE("share2")
514514   AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_SHARE("share3")
515515   AM_RANGE(0x1000, 0x13ff) AM_RAM AM_SHARE("share4")
516   AM_RANGE(0x1c00, 0x1fff) AM_ROM AM_REGION(C8050_REGION, 0x4000) // 6530
516   AM_RANGE(0x1c00, 0x1fff) AM_ROM AM_REGION("drive:c8050", 0x4000) // 6530
517517ADDRESS_MAP_END
518518
519519/*-------------------------------------------------
r8717r8718
529529   AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
530530   AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
531531   AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share4")
532   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(SFD1001_REGION, 0x0000)
532   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("drive:sfd1001", 0x0000)
533533ADDRESS_MAP_END
534534
535535/*-------------------------------------------------
r8717r8718
545545   AM_RANGE(0x0800, 0x0bff) AM_RAM AM_SHARE("share2")
546546   AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_SHARE("share3")
547547   AM_RANGE(0x1000, 0x13ff) AM_RAM AM_SHARE("share4")
548   AM_RANGE(0x1800, 0x1fff) AM_ROM AM_REGION(SFD1001_REGION, 0x4000)
548   AM_RANGE(0x1800, 0x1fff) AM_ROM AM_REGION("drive:sfd1001", 0x4000)
549549ADDRESS_MAP_END
550550
551551/*-------------------------------------------------
src/mess/machine/c1541.c
r8717r8718
432432   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
433433   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
434434   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
435   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1540", 0x0000)
435   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1540:c1540", 0x0000)
436436ADDRESS_MAP_END
437437
438438/*-------------------------------------------------
r8717r8718
443443   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
444444   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
445445   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
446   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541", 0x0000)
446   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541:c1541", 0x0000)
447447ADDRESS_MAP_END
448448
449449/*-------------------------------------------------
r8717r8718
454454   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
455455   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
456456   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
457   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541c", 0x0000)
457   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541:c1541c", 0x0000)
458458ADDRESS_MAP_END
459459
460460/*-------------------------------------------------
r8717r8718
465465   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
466466   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
467467   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
468   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541ii", 0x0000)
468   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541:c1541ii", 0x0000)
469469ADDRESS_MAP_END
470470
471471/*-------------------------------------------------
r8717r8718
476476   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
477477   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
478478   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
479   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("sx1541", 0x0000)
479   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c1541:sx1541", 0x0000)
480480ADDRESS_MAP_END
481481
482482/*-------------------------------------------------
r8717r8718
487487   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
488488   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
489489   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
490   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c2031", 0x0000)
490   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("c2031:c2031", 0x0000)
491491ADDRESS_MAP_END
492492
493493/*-------------------------------------------------
r8717r8718
498498   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x6000) AM_RAM
499499   AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_0_TAG, via_r, via_w)
500500   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x63f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
501   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("oc118", 0x0000)
501   AM_RANGE(0x8000, 0xbfff) AM_MIRROR(0x4000) AM_ROM AM_REGION("oc118:oc118", 0x0000)
502502ADDRESS_MAP_END
503503
504504/*-------------------------------------------------
src/mess/machine/c1551.c
r8717r8718
337337static ADDRESS_MAP_START( c1551_map, ADDRESS_SPACE_PROGRAM, 8 )
338338   AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x0800) AM_RAM
339339   AM_RANGE(0x4000, 0x4007) AM_MIRROR(0x3ff8) AM_DEVREADWRITE(M6523_0_TAG, tpi6525_r, tpi6525_w)
340   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("c1551", 0)
340   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("c1551:c1551", 0)
341341ADDRESS_MAP_END
342342
343343/*-------------------------------------------------
src/mess/machine/c9060.c
r8717r8718
136136   AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share2")
137137   AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share3")
138138   AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM AM_SHARE("share4")
139   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION(C9060_REGION, 0x0000)
139   AM_RANGE(0xc000, 0xffff) AM_ROM AM_REGION("c9060:c9060", 0x0000)
140140ADDRESS_MAP_END
141141
142142/*-------------------------------------------------
r8717r8718
151151   AM_RANGE(0x0800, 0x0bff) AM_RAM AM_SHARE("share2")
152152   AM_RANGE(0x0c00, 0x0fff) AM_RAM AM_SHARE("share3")
153153   AM_RANGE(0x1000, 0x13ff) AM_RAM AM_SHARE("share4")
154   AM_RANGE(0x1800, 0x1fff) AM_ROM AM_REGION(C9060_REGION, 0x2000) // 6530
154   AM_RANGE(0x1800, 0x1fff) AM_ROM AM_REGION("c9060:c9060", 0x2000) // 6530
155155ADDRESS_MAP_END
156156
157157/*-------------------------------------------------
src/mess/machine/c1571.c
r8717r8718
363363   AM_RANGE(0x1c00, 0x1c0f) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
364364   AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE(WD1770_TAG, wd17xx_r, wd17xx_w)
365365   AM_RANGE(0x4000, 0x400f) AM_DEVREADWRITE(M6526_TAG, mos6526_r, mos6526_w)
366   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1570", 0)
366   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1570:c1570", 0)
367367ADDRESS_MAP_END
368368
369369/*-------------------------------------------------
r8717r8718
376376   AM_RANGE(0x1c00, 0x1c0f) AM_MIRROR(0x03f0) AM_DEVREADWRITE(M6522_1_TAG, via_r, via_w)
377377   AM_RANGE(0x2000, 0x2003) AM_MIRROR(0x1ffc) AM_DEVREADWRITE(WD1770_TAG, wd17xx_r, wd17xx_w)
378378   AM_RANGE(0x4000, 0x400f) AM_MIRROR(0x3ff0) AM_DEVREADWRITE(M6526_TAG, mos6526_r, mos6526_w)
379   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1571", 0)
379   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1571:c1571", 0)
380380ADDRESS_MAP_END
381381
382382/*-------------------------------------------------
r8717r8718
391391//  AM_RANGE(0x400c, 0x400e) 5710 CIA
392392//  AM_RANGE(0x4010, 0x4017) 5710 CIA
393393//  AM_RANGE(0x6000, 0x7fff) RAM mirrors
394   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1571cr", 0)
394   AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("c1571:c1571cr", 0)
395395ADDRESS_MAP_END
396396
397397/*-------------------------------------------------
src/mess/drivers/cbmb.c
r8717r8718
415415{
416416   { "tpi6525_0" },
417417   { "cia" },
418   { C2040_IEEE488("c8250") },
418   { C2040_IEEE488("drive") },
419419   { NULL}
420420};
421421
r8717r8718
460460
461461   /* IEEE bus */
462462   MDRV_IEEE488_ADD("ieee_bus", ieee488_daisy)
463   MDRV_C8250_ADD("c8250", "ieee_bus", 8)
463   MDRV_C8250_ADD("drive", "ieee_bus", 8)
464464
465465   MDRV_IMPORT_FROM(cbmb_cartslot)
466466MACHINE_DRIVER_END
r8717r8718
542542
543543   /* IEEE bus */
544544   MDRV_IEEE488_ADD("ieee_bus", ieee488_daisy)
545   MDRV_C8250_ADD("c8250", "ieee_bus", 8)
545   MDRV_C8250_ADD("drive", "ieee_bus", 8)
546546
547547   MDRV_IMPORT_FROM(cbmb_cartslot)
548548MACHINE_DRIVER_END
src/mess/drivers/pet.c
r8717r8718
649649   { "pia_0" },
650650   { "pia_1", DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_DEVICE_LINE("pia_1", pia6821_cb1_w), DEVCB_DEVICE_LINE("pia_1", pia6821_ca1_w), DEVCB_NULL },
651651   { "via6522_0" },
652   { C2040_IEEE488("c4040") },
652   { C2040_IEEE488("drive") },
653653   { NULL}
654654};
655655
r8717r8718
706706
707707   /* IEEE bus */
708708   MDRV_IEEE488_ADD("ieee_bus", ieee488_daisy)
709   MDRV_C4040_ADD("c4040", "ieee_bus", 8)
709   MDRV_C4040_ADD("drive", "ieee_bus", 8)
710710MACHINE_DRIVER_END
711711
712712
r8717r8718
727727
728728   /* IEEE bus */
729729   MDRV_IEEE488_ADD("ieee_bus", ieee488_daisy)
730   MDRV_C4040_ADD("c4040", "ieee_bus", 8)
730   MDRV_C4040_ADD("drive", "ieee_bus", 8)
731731MACHINE_DRIVER_END
732732
733733
r8717r8718
783783
784784   /* IEEE bus */
785785   MDRV_IEEE488_ADD("ieee_bus", ieee488_daisy)
786   MDRV_C8050_ADD("c4040", "ieee_bus", 8)
786   MDRV_C8050_ADD("drive", "ieee_bus", 8)
787787MACHINE_DRIVER_END
788788
789789

Previous 15994 Revisions Next


© 1998-2018 The MESS Team