Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(MESS) fixed thomson.c softlist cart loading (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2013-02-09 12:39:33 +00:00
parent 8abc4468e9
commit fc7626e2c7
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/mess/machine/thomson.c
View File

@ -403,9 +403,14 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, to7_cartridge )
{ {
int i,j; int i,j;
UINT8* pos = image.device().machine().root_device().memregion("maincpu" )->base() + 0x10000; UINT8* pos = image.device().machine().root_device().memregion("maincpu" )->base() + 0x10000;
offs_t size = image.length(); offs_t size;
char name[129]; char name[129];
if (image.software_entry() == NULL)
size = image.length();
else
size = image.get_software_region_length("rom");
/* get size & number of 16-KB banks */ /* get size & number of 16-KB banks */
if ( size <= 0x04000 ) if ( size <= 0x04000 )
thom_cart_nb_banks = 1; thom_cart_nb_banks = 1;
@ -415,14 +420,23 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, to7_cartridge )
thom_cart_nb_banks = 4; thom_cart_nb_banks = 4;
else else
{ {
logerror( "to7_cartridge_load: invalid cartridge size %i\n", size ); astring errmsg;
errmsg.printf("Invalid cartridge size %u", size);
image.seterror(IMAGE_ERROR_UNSUPPORTED, errmsg.cstr());
return IMAGE_INIT_FAIL; return IMAGE_INIT_FAIL;
} }
if ( image.fread( pos, size ) != size ) if (image.software_entry() == NULL)
{ {
logerror( "to7_cartridge_load: read error\n" ); if ( image.fread( pos, size ) != size )
return IMAGE_INIT_FAIL; {
image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Read error");
return IMAGE_INIT_FAIL;
}
}
else
{
memcpy(pos, image.get_software_region("rom"), size);
} }
/* extract name */ /* extract name */
@ -1945,10 +1959,15 @@ static UINT8 mo5_reg_cart; /* 0xa7cb bank switch */
DEVICE_IMAGE_LOAD_MEMBER( thomson_state, mo5_cartridge ) DEVICE_IMAGE_LOAD_MEMBER( thomson_state, mo5_cartridge )
{ {
UINT8* pos = image.device().machine().root_device().memregion("maincpu")->base() + 0x10000; UINT8* pos = image.device().machine().root_device().memregion("maincpu")->base() + 0x10000;
UINT64 size = image.length(); UINT64 size;
int i,j; int i,j;
char name[129]; char name[129];
if (image.software_entry() == NULL)
size = image.length();
else
size = image.get_software_region_length("rom");
/* get size & number of 16-KB banks */ /* get size & number of 16-KB banks */
if ( size > 32 && size <= 0x04000 ) if ( size > 32 && size <= 0x04000 )
thom_cart_nb_banks = 1; thom_cart_nb_banks = 1;
@ -1958,14 +1977,23 @@ DEVICE_IMAGE_LOAD_MEMBER( thomson_state, mo5_cartridge )
thom_cart_nb_banks = 4; thom_cart_nb_banks = 4;
else else
{ {
logerror( "mo5_cartridge_load: invalid cartridge size %u\n", (unsigned) size ); astring errmsg;
errmsg.printf("Invalid cartridge size "I64FMT, size);
image.seterror(IMAGE_ERROR_UNSUPPORTED, errmsg.cstr());
return IMAGE_INIT_FAIL; return IMAGE_INIT_FAIL;
} }
if ( image.fread(pos, size ) != size ) if (image.software_entry() == NULL)
{ {
logerror( "mo5_cartridge_load: read error\n" ); if ( image.fread(pos, size ) != size )
return IMAGE_INIT_FAIL; {
image.seterror(IMAGE_ERROR_INVALIDIMAGE, "Read error");
return IMAGE_INIT_FAIL;
}
}
else
{
memcpy(pos, image.get_software_region("rom"), size);
} }
/* extract name */ /* extract name */