Previous 15994 Revisions Next

r2408 Wednesday 16th April, 2008 at 10:12:05 UTC by Robbbert
[THOMSON] Fix for bug 1443 from Antoine Mine.
[src/mess/machine]thomson.c

src/mess/machine/thomson.c
r2407r2408
13151315   memory_configure_bank( THOM_VRAM_BANK, 0, 2, thom_vram, 0x2000 );
13161316   memory_configure_bank( THOM_CART_BANK, 0, 4, mem + 0x10000, 0x4000 );
13171317   memory_set_bank( THOM_BASE_BANK, 0 );
1318   memory_set_bank( THOM_VRAM_BANK, 0 );
1319   memory_set_bank( THOM_CART_BANK, 0 );
13181320
13191321   if ( mess_ram_size > 24*1024 )
13201322   {
r2407r2408
13971399   if ( bank != old_bank )
13981400      LOG_BANK(( "to770_update_ram_bank: RAM bank change %i\n", bank ));
13991401
1400   memory_set_bank( THOM_RAM_BANK, bank );
1401   memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xdfff, 0, 0,
1402                   (mess_ram_size == 128*1024 || bank < 2) ?
1403                   (write8_machine_func)(STATIC_BANK1 + THOM_RAM_BANK - 1) : SMH_UNMAP );
1402   if ( mess_ram_size == 128*1024 || bank < 2 )
1403   {
1404      memory_set_bank( THOM_RAM_BANK, bank );
1405      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xdfff, 0, 0, (write8_machine_func)(STATIC_BANK1 + THOM_RAM_BANK - 1) );
1406   }
1407   else
1408   {
1409      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xdfff, 0, 0, SMH_UNMAP );
1410   }
1411
14041412   old_bank = bank;
14051413}
14061414
r2407r2408
15561564   memory_configure_bank( THOM_VRAM_BANK, 0, 2, thom_vram, 0x2000 );
15571565   memory_configure_bank( THOM_CART_BANK, 0, 4, mem + 0x10000, 0x4000 );
15581566   memory_set_bank( THOM_BASE_BANK, 0 );
1567   memory_set_bank( THOM_RAM_BANK,  0 );
1568   memory_set_bank( THOM_VRAM_BANK, 0 );
1569   memory_set_bank( THOM_CART_BANK, 0 );
15591570
15601571   /* save-state */
15611572   state_save_register_global( thom_cart_nb_banks );
r2407r2408
16121623
16131624static void mo5_init_timer(void)
16141625{
1615   /* time is a faster than 50 Hz to match video framerate */
1626   /* time is a little faster than 50 Hz to match video framerate */
16161627   timer_adjust_periodic(mo5_periodic_timer, attotime_zero, 0, ATTOTIME_IN_USEC( 19968 ));
16171628}
16181629
r2407r2408
19121923   memory_configure_bank( THOM_CART_BANK, 4, 4, mess_ram + 0xc000, 0x4000 );
19131924   memory_configure_bank( THOM_VRAM_BANK, 0, 2, thom_vram, 0x2000 );
19141925   memory_set_bank( THOM_BASE_BANK, 0 );
1926   memory_set_bank( THOM_CART_BANK, 0 );
1927   memory_set_bank( THOM_VRAM_BANK, 0 );
19151928
19161929   /* save-state */
19171930   state_save_register_global( thom_cart_nb_banks );
r2407r2408
22402253   if ( old_bank != bank )
22412254      LOG_BANK(( "to9_update_ram_bank: bank %i selected (pia=$%02X disk=%i)\n", bank, portb & 0xf8, disk ));
22422255
2243   memory_set_bank( THOM_RAM_BANK, bank );
2244   memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xdfff, 0, 0,
2245                   (mess_ram_size == 192*1024 || bank < 6) ?
2246                   (write8_machine_func)(STATIC_BANK1 + THOM_RAM_BANK - 1) : SMH_NOP );
2256   if ( mess_ram_size == 192*1024 || bank < 6 )
2257   {
2258      memory_set_bank( THOM_RAM_BANK, bank );
2259      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xdfff, 0, 0, (write8_machine_func)(STATIC_BANK1 + THOM_RAM_BANK - 1) );
2260   }
2261   else
2262   {
2263      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xdfff, 0, 0, SMH_NOP );
2264   }
2265
22472266   old_bank = bank;
22482267}
22492268
r2407r2408
28652884   memory_configure_bank( THOM_CART_BANK, 0, 12, mem + 0x10000, 0x4000 );
28662885   memory_configure_bank( THOM_BASE_BANK, 0,  1, mess_ram + 0x4000, 0x4000 );
28672886   memory_configure_bank( THOM_RAM_BANK,  0, 10, mess_ram + 0x8000, 0x4000 );
2887   memory_set_bank( THOM_VRAM_BANK, 0 );
2888   memory_set_bank( THOM_CART_BANK, 0 );
28682889   memory_set_bank( THOM_BASE_BANK, 0 );
2890   memory_set_bank( THOM_RAM_BANK,  0 );
28692891
28702892   /* save-state */
28712893   state_save_register_global( thom_cart_nb_banks );
r2407r2408
32873309       undistorted space, such as cartridge, page 0 (video), or page 1
32883310   */
32893311   to8_data_vpage = bank;
3290   memory_set_bank( TO8_DATA_LO, to8_data_vpage );
3291   memory_set_bank( TO8_DATA_HI, to8_data_vpage );
3292   memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0,
3293                   (mess_ram_size == 512*1024 || to8_data_vpage < 16) ?
3294                   to8_data_vpage <= 4 ? to8_data_lo_w :
3295                   (write8_machine_func)(STATIC_BANK1 + TO8_DATA_LO - 1) :
3296                   SMH_NOP );
3297   memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0,
3298                   (mess_ram_size == 512*1024 || to8_data_vpage < 16) ?
3299                   to8_data_vpage <= 4 ? to8_data_hi_w :
3300                   (write8_machine_func)(STATIC_BANK1 + TO8_DATA_HI - 1) :
3301                   SMH_NOP );
3312   if ( mess_ram_size == 512*1024 || to8_data_vpage < 16 )
3313   {
3314      memory_set_bank( TO8_DATA_LO, to8_data_vpage );
3315      memory_set_bank( TO8_DATA_HI, to8_data_vpage );
3316      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0, to8_data_vpage <= 4 ? to8_data_lo_w : (write8_machine_func)(STATIC_BANK1 + TO8_DATA_LO - 1) );
3317      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, to8_data_vpage <= 4 ? to8_data_hi_w : (write8_machine_func)(STATIC_BANK1 + TO8_DATA_HI - 1) );
3318   }
3319   else
3320   {
3321      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xa000, 0xbfff, 0, 0, SMH_NOP );
3322      memory_install_write8_handler( 0, ADDRESS_SPACE_PROGRAM, 0xc000, 0xdfff, 0, 0, SMH_NOP );
3323   }
33023324}
33033325
33043326
r2407r2408
33563378            LOG_BANK(( "to8_update_cart_bank: CART is external cartridge bank %i\n", thom_cart_bank ));
33573379      }
33583380   }
3359   memory_set_bank( THOM_CART_BANK, bank );
3381
3382   if ( mess_ram_size == 512*1024 || bank < 16 )
3383   {
3384      memory_set_bank( THOM_CART_BANK, bank );
3385   }
3386
33603387   old_bank = bank;
33613388}
33623389
r2407r2408
38263853   memory_configure_bank( TO8_DATA_LO,    0, 32, mess_ram + 0x2000, 0x4000 );
38273854   memory_configure_bank( TO8_DATA_HI,    0, 32, mess_ram + 0x0000, 0x4000 );
38283855   memory_configure_bank( TO8_BIOS_BANK,  0,  2, mem + 0x30800, 0x2000 );
3829   memory_set_bank( TO8_SYS_LO, 0 );
3830   memory_set_bank( TO8_SYS_HI, 0 );
3856   memory_set_bank( THOM_CART_BANK, 0 );
3857   memory_set_bank( THOM_VRAM_BANK, 0 );
3858   memory_set_bank( TO8_SYS_LO,  0 );
3859   memory_set_bank( TO8_SYS_HI,  0 );
3860   memory_set_bank( TO8_DATA_LO, 0 );
3861   memory_set_bank( TO8_DATA_HI, 0 );
3862   memory_set_bank( TO8_BIOS_BANK, 0 );
38313863
38323864   /* save-state */
38333865   state_save_register_global( thom_cart_nb_banks );
r2407r2408
39884020   memory_configure_bank( TO8_DATA_LO,    0, 32, mess_ram + 0x2000, 0x4000 );
39894021   memory_configure_bank( TO8_DATA_HI,    0, 32, mess_ram + 0x0000, 0x4000 );
39904022   memory_configure_bank( TO8_BIOS_BANK,  0,  2, mem + 0x30800, 0x2000 );
3991   memory_set_bank( TO8_SYS_LO, 0 );
3992   memory_set_bank( TO8_SYS_HI, 0 );
4023   memory_set_bank( THOM_CART_BANK, 0 );
4024   memory_set_bank( THOM_VRAM_BANK, 0 );
4025   memory_set_bank( TO8_SYS_LO,  0 );
4026   memory_set_bank( TO8_SYS_HI,  0 );
4027   memory_set_bank( TO8_DATA_LO, 0 );
4028   memory_set_bank( TO8_DATA_HI, 0 );
4029   memory_set_bank( TO8_BIOS_BANK, 0 );
39934030
39944031   /* save-state */
39954032   state_save_register_global( thom_cart_nb_banks );
r2407r2408
45724609   memory_configure_bank( TO8_DATA_LO,    0, 8, mess_ram + 0x2000, 0x4000 );
45734610   memory_configure_bank( TO8_DATA_HI,    0, 8, mess_ram + 0x0000, 0x4000 );
45744611   memory_configure_bank( TO8_BIOS_BANK,  0, 2, mem + 0x23000, 0x4000 );
4575   memory_set_bank( TO8_SYS_LO, 0 );
4576   memory_set_bank( TO8_SYS_HI, 0 );
4612   memory_set_bank( THOM_CART_BANK, 0 );
4613   memory_set_bank( THOM_VRAM_BANK, 0 );
4614   memory_set_bank( TO8_SYS_LO,  0 );
4615   memory_set_bank( TO8_SYS_HI,  0 );
4616   memory_set_bank( TO8_DATA_LO, 0 );
4617   memory_set_bank( TO8_DATA_HI, 0 );
4618   memory_set_bank( TO8_BIOS_BANK, 0 );
45774619
45784620   /* save-state */
45794621   state_save_register_global( thom_cart_nb_banks );
r2407r2408
48394881   memory_configure_bank( TO8_DATA_LO,    0, 8, mess_ram + 0x2000, 0x4000 );
48404882   memory_configure_bank( TO8_DATA_HI,    0, 8, mess_ram + 0x0000, 0x4000 );
48414883   memory_configure_bank( TO8_BIOS_BANK,  0, 2, mem + 0x23000, 0x4000 );
4842   memory_set_bank( TO8_SYS_LO, 0 );
4843   memory_set_bank( TO8_SYS_HI, 0 );
4884   memory_set_bank( THOM_CART_BANK, 0 );
4885   memory_set_bank( THOM_VRAM_BANK, 0 );
4886   memory_set_bank( TO8_SYS_LO,  0 );
4887   memory_set_bank( TO8_SYS_HI,  0 );
4888   memory_set_bank( TO8_DATA_LO, 0 );
4889   memory_set_bank( TO8_DATA_HI, 0 );
4890   memory_set_bank( TO8_BIOS_BANK, 0 );
48444891
48454892   /* save-state */
48464893   state_save_register_global( thom_cart_nb_banks );

Previous 15994 Revisions Next


© 1998-2018 The MESS Team