Previous 15994 Revisions Next

r3428 Saturday 11th October, 2008 at 05:49:04 UTC by Fabio Priuli
A few Commodore cleanups before 0.128:
[PET] removed a duplicate set (mmf9000 was just a different name for sp9000) and added notes on other sets to verify
[SYM1] removed cart support (no carts like those on a sym1)
[src/mess]messdriv.c
[src/mess/drivers]c16.c pet.c sym1.c
[src/mess/includes]sym1.h
[src/mess/machine]sym1.c

src/mess/includes/sym1.h
r3427r3428
3131DRIVER_INIT( sym1 );
3232MACHINE_RESET( sym1 );
3333
34void sym1_cartslot_getinfo(const mess_device_class *devclass, UINT32 state, union devinfo *info);
3534
36
3735#endif /* SYM1_H_ */
src/mess/messdriv.c
r3427r3428
327327   DRIVER( cbm8296 )   /* CBM 8296 (Basic 4, CRTC 50Hz, 80 columns)      */
328328   DRIVER( cbm8296d )   /* CBM 8296D                              */
329329   DRIVER( superpet )   /* SuperPET                                 */
330   DRIVER( sp9000 )   /* CBM SP9000                              */
331   DRIVER( mmf9000 )   /* MiniMainFrame 9000                        */
330   DRIVER( sp9000 )   /* CBM SP9000 / MiniMainFrame 9000               */
332331   DRIVER( mmf9000s )   /* MiniMainFrame 9000 (Sweden)                  */
333332
334333   DRIVER( vic1001 )   /* Commodore VIC-1001 (Japan)                  */
src/mess/machine/sym1.c
r3427r3428
2020#include "machine/74145.h"
2121#include "sound/speaker.h"
2222
23#include "devices/cartslot.h"
2423
25
2624#define LED_REFRESH_DELAY  ATTOTIME_IN_USEC(70)
2725
2826
r3427r3428
307305         0xf800, 0xffff, 0, 0, SMH_BANK1, SMH_NOP);
308306   memory_set_bankptr(1, sym1_monitor + 0x800);
309307}
310
311
312/******************************************************************************
313Cartridge Support
314******************************************************************************/
315
316static CBM_ROM sym1_cbm_cart = { 0 };
317
318static DEVICE_IMAGE_LOAD(sym_cart)
319{
320   int size = image_length(image), test;
321   const char *filetype;
322   int address = 0;
323
324   filetype = image_filetype(image);
325
326   /* Assign loading address according to extension */
327   if (!mame_stricmp (filetype, "60"))
328      address = 0x6000;
329   else if (!mame_stricmp (filetype, "c0"))
330      address = 0xc000;
331   else      // which address for .0080 files?!?
332      ;
333
334   logerror("Loading cart %s at %.4x size:%.4x\n", image_filename(image), address, size);
335
336   /* Does cart contain any data? */
337   sym1_cbm_cart.chip = (UINT8*) image_malloc(image, size);
338   if (!sym1_cbm_cart.chip)
339      return INIT_FAIL;
340
341   /* Store data, address & size */
342   sym1_cbm_cart.addr = address;
343   sym1_cbm_cart.size = size;
344   test = image_fread(image, sym1_cbm_cart.chip, sym1_cbm_cart.size);
345
346   if (test != sym1_cbm_cart.size)
347      return INIT_FAIL;
348           
349   /* Finally load the cart */
350//   memcpy(/* where?  base + sym1_cbm_cart.addr */, sym1_cbm_cart.chip, sym1_cbm_cart.size);
351
352   return INIT_PASS;
353}
354
355void sym1_cartslot_getinfo(const mess_device_class *devclass, UINT32 state, union devinfo *info)
356{
357   switch(state)
358   {
359      /* --- the following bits of info are returned as 64-bit signed integers --- */
360      case MESS_DEVINFO_INT_COUNT:            info->i = 2; break;
361
362      /* --- the following bits of info are returned as NULL-terminated strings --- */
363      case MESS_DEVINFO_STR_FILE_EXTENSIONS:      strcpy(info->s = device_temp_str(), "60,0080,c0"); break;
364
365      /* --- the following bits of info are returned as pointers to data or functions --- */
366      case MESS_DEVINFO_PTR_LOAD:               info->load = DEVICE_IMAGE_LOAD_NAME(sym_cart); break;
367
368      default:                           cartslot_device_getinfo(devclass, state, info); break;
369   }
370}
src/mess/drivers/sym1.c
r3427r3428
155155
156156
157157static SYSTEM_CONFIG_START( sym1 )
158   CONFIG_DEVICE(sym1_cartslot_getinfo)
159158   CONFIG_RAM_DEFAULT(4 * 1024) /* 4KB RAM */
160159   CONFIG_RAM        (3 * 1024) /* 3KB RAM */
161160   CONFIG_RAM        (2 * 1024) /* 2KB RAM */
src/mess/drivers/pet.c
r3427r3428
345345
346346[TO DO]
347347
348* Verify if pre-CRTC models had differences between NTSC & PAL systems.
349If no differences arise we can merge back the following sets:
350+ cbm30 (same as pet2001n) & cbm30b (same as pet2001b)
351+ cbm40o (same as pet40on) & cbm40ob (same as pet40ob)
352
348353* Emulate SuperPET / SP9000 / MMF9000 and their differences
349354
350355* Emulate CBM 8296 & 8296D (basically only a placeholder now)
r3427r3428
984989   ROM_LOAD( "901640-01.ub3", 0x0000, 0x1000, CRC(ee8229c4) SHA1(bf346f11595a3e65e55d6aeeaa2c0cec807b66c7) )
985990ROM_END
986991
987#define rom_mmf9000      rom_superpet
988992#define rom_sp9000      rom_superpet
989993
990994
r3427r3428
10911095   CONFIG_RAM_DEFAULT(8 * 1024)
10921096SYSTEM_CONFIG_END
10931097
1094/* Later PET 2001 - Basic "2" - RAM: 8k, 16k, 32k */
1098/* Later PET 2001 - Basic 2 - RAM: 8k, 16k, 32k */
10951099static SYSTEM_CONFIG_START( pet2 )
10961100   CONFIG_DEVICE(pet_cartslot_getinfo)
10971101   CONFIG_DEVICE(cbmfloppy_device_getinfo)
r3427r3428
11331137COMP(1979, cbm30,     0,   pet2001,   pet,       pet,       pet,       pet2,      "Commodore Business Machines Co.",  "CBM 30xx", GAME_NO_SOUND)
11341138COMP(1979, cbm30b,    0,   pet2001,   pet,       petb,      petb,      pet2,      "Commodore Business Machines Co.",  "CBM 30xx (Business keyboard)", GAME_NO_SOUND)
11351139COMP(1979, cbm30nor,  0,   pet2001,   pet,       petb,      petb,      pet2,      "Commodore Business Machines Co.",  "CBM 30xx (Norway, Business keyboard)", GAME_NO_SOUND | GAME_NOT_WORKING)
1140
11361141/* So called, THIN-40 */
11371142COMP(1980, pet40on,   0,   pet2001,   pet,       pet,       pet,       pet2,      "Commodore Business Machines Co.",  "PET 40xx (Basic 4, no CRTC, Normal keyboard)", GAME_NO_SOUND)
11381143COMP(1980, pet40ob,   0,   pet2001,   pet,       petb,      petb,      pet2,      "Commodore Business Machines Co.",  "PET 40xx (Basic 4, no CRTC, Business keyboard)", GAME_NO_SOUND)
r3427r3428
11441149COMP(1981, cbm80ger,  0,   pet2001,   pet80pal,  cbm8096,   pet80,     pet4,      "Commodore Business Machines Co.",  "CBM 80xx (Germany, Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND)
11451150COMP(1981, cbm80hun,  0,   pet2001,   pet80pal,  cbm8096,   pet80,     pet4,      "Commodore Business Machines Co.",  "CBM 80xx (Hungary, Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND | GAME_NOT_WORKING)
11461151COMP(1981, cbm80swe,  0,   pet2001,   pet80pal,  cbm8096,   pet80,     pet4,      "Commodore Business Machines Co.",  "CBM 80xx (Sweden, Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND)
1152
11471153/* So called, FAT-40 */
11481154COMP(1981, pet40b,    0,   pet2001,   pet80,     cbm8096,   pet80,     pet4,      "Commodore Business Machines Co.",  "PET 40xx (Basic 4, CRTC 60Hz, 80 columns)", GAME_NO_SOUND)
1149COMP(1981, pet40n,    0,   pet2001,   pet40,     pet,       pet40,     pet4o,      "Commodore Business Machines Co.",  "PET 40xx (Basic 4, CRTC 60Hz, 40 columns)", GAME_NO_SOUND)
1155COMP(1981, pet40n,    0,   pet2001,   pet40,     pet,       pet40,     pet4o,     "Commodore Business Machines Co.",  "PET 40xx (Basic 4, CRTC 60Hz, 40 columns)", GAME_NO_SOUND)
11501156COMP(1981, cbm40b,     0,   pet2001,   pet80pal,  cbm8096,   pet80,     pet4,      "Commodore Business Machines Co.",  "CBM 40xx (Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND)
1151COMP(1981, cbm40n,    0,   pet2001,   pet40pal,  pet,       pet40,     pet4o,      "Commodore Business Machines Co.",  "CBM 40xx (Basic 4, CRTC 50Hz, 40 columns)", GAME_NO_SOUND)
1157COMP(1981, cbm40n,    0,   pet2001,   pet40pal,  pet,       pet40,     pet4o,     "Commodore Business Machines Co.",  "CBM 40xx (Basic 4, CRTC 50Hz, 40 columns)", GAME_NO_SOUND)
11521158
11531159COMP(1981, superpet,  0,   pet2001,   superpet,  superpet,  superpet,  pet4,      "Commodore Business Machines Co.",  "SuperPET (CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING)
1154COMP(1981, sp9000,    0,   pet2001,   superpet,  superpet,  superpet,  pet4,      "Commodore Business Machines Co.",  "CBM SP9000 (CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING)
1155COMP(1981, mmf9000,   0,   pet2001,   superpet,  superpet,  superpet,  pet4,      "Commodore Business Machines Co.",  "MicroMainFrame 9000 (CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING)
1160COMP(1981, sp9000,    0,   pet2001,   superpet,  superpet,  superpet,  pet4,      "Commodore Business Machines Co.",  "CBM SP9000 / MicroMainFrame 9000 (CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING)
11561161COMP(198?, mmf9000s,  0,   pet2001,   superpet,  superpet,  superpet,  pet4,      "Commodore Business Machines Co.",  "MicroMainFrame 9000 (Sweden, CRTC 50Hz)", GAME_NO_SOUND | GAME_NOT_WORKING)
11571162
11581163COMP(1984, cbm8296,   0,   pet2001,   pet80pal,  cbm8096,   pet80,     pet4,      "Commodore Business Machines Co.",  "CBM 8296 (Basic 4, CRTC 50Hz, 80 columns)", GAME_NO_SOUND | GAME_NOT_WORKING)
src/mess/drivers/c16.c
r3427r3428
9494
9595[TO DO]
9696
97* Supported Systems:
98
99- Once we can add / remove devices, we shall only support c16, c116 and plus/4,
100removing the separated drivers for different floppy drives
101
97102* Floppy drives:
98103
99104- Drives 8 & 9 supported, but limited compatibility. Real disk emulation is

Previous 15994 Revisions Next


© 1998-2018 The MESS Team