diff options
Diffstat (limited to 'src/emu/sound/fmopl.c')
| -rw-r--r-- | src/emu/sound/fmopl.c | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c index f7fa61e34fc..7f885bc1119 100644 --- a/src/emu/sound/fmopl.c +++ b/src/emu/sound/fmopl.c @@ -1877,36 +1877,36 @@ static void OPLsave_state_channel(device_t *device, OPL_CH *CH) for( ch=0 ; ch < 9 ; ch++, CH++ ) { /* channel */ - state_save_register_device_item(device, ch, CH->block_fnum); - state_save_register_device_item(device, ch, CH->kcode); + device->save_item(NAME(CH->block_fnum), ch); + device->save_item(NAME(CH->kcode), ch); /* slots */ for( slot=0 ; slot < 2 ; slot++ ) { OPL_SLOT *SLOT = &CH->SLOT[slot]; - state_save_register_device_item(device, ch * 2 + slot, SLOT->ar); - state_save_register_device_item(device, ch * 2 + slot, SLOT->dr); - state_save_register_device_item(device, ch * 2 + slot, SLOT->rr); - state_save_register_device_item(device, ch * 2 + slot, SLOT->KSR); - state_save_register_device_item(device, ch * 2 + slot, SLOT->ksl); - state_save_register_device_item(device, ch * 2 + slot, SLOT->mul); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->Cnt); - state_save_register_device_item(device, ch * 2 + slot, SLOT->FB); - state_save_register_device_item_array(device, ch * 2 + slot, SLOT->op1_out); - state_save_register_device_item(device, ch * 2 + slot, SLOT->CON); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->eg_type); - state_save_register_device_item(device, ch * 2 + slot, SLOT->state); - state_save_register_device_item(device, ch * 2 + slot, SLOT->TL); - state_save_register_device_item(device, ch * 2 + slot, SLOT->volume); - state_save_register_device_item(device, ch * 2 + slot, SLOT->sl); - state_save_register_device_item(device, ch * 2 + slot, SLOT->key); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->AMmask); - state_save_register_device_item(device, ch * 2 + slot, SLOT->vib); - - state_save_register_device_item(device, ch * 2 + slot, SLOT->wavetable); + device->save_item(NAME(SLOT->ar), ch * 2 + slot); + device->save_item(NAME(SLOT->dr), ch * 2 + slot); + device->save_item(NAME(SLOT->rr), ch * 2 + slot); + device->save_item(NAME(SLOT->KSR), ch * 2 + slot); + device->save_item(NAME(SLOT->ksl), ch * 2 + slot); + device->save_item(NAME(SLOT->mul), ch * 2 + slot); + + device->save_item(NAME(SLOT->Cnt), ch * 2 + slot); + device->save_item(NAME(SLOT->FB), ch * 2 + slot); + device->save_item(NAME(SLOT->op1_out), ch * 2 + slot); + device->save_item(NAME(SLOT->CON), ch * 2 + slot); + + device->save_item(NAME(SLOT->eg_type), ch * 2 + slot); + device->save_item(NAME(SLOT->state), ch * 2 + slot); + device->save_item(NAME(SLOT->TL), ch * 2 + slot); + device->save_item(NAME(SLOT->volume), ch * 2 + slot); + device->save_item(NAME(SLOT->sl), ch * 2 + slot); + device->save_item(NAME(SLOT->key), ch * 2 + slot); + + device->save_item(NAME(SLOT->AMmask), ch * 2 + slot); + device->save_item(NAME(SLOT->vib), ch * 2 + slot); + + device->save_item(NAME(SLOT->wavetable), ch * 2 + slot); } } } @@ -1918,26 +1918,26 @@ static void OPL_save_state(FM_OPL *OPL, device_t *device) { OPLsave_state_channel(device, OPL->P_CH); - state_save_register_device_item(device, 0, OPL->eg_cnt); - state_save_register_device_item(device, 0, OPL->eg_timer); + device->save_item(NAME(OPL->eg_cnt)); + device->save_item(NAME(OPL->eg_timer)); - state_save_register_device_item(device, 0, OPL->rhythm); + device->save_item(NAME(OPL->rhythm)); - state_save_register_device_item(device, 0, OPL->lfo_am_depth); - state_save_register_device_item(device, 0, OPL->lfo_pm_depth_range); - state_save_register_device_item(device, 0, OPL->lfo_am_cnt); - state_save_register_device_item(device, 0, OPL->lfo_pm_cnt); + device->save_item(NAME(OPL->lfo_am_depth)); + device->save_item(NAME(OPL->lfo_pm_depth_range)); + device->save_item(NAME(OPL->lfo_am_cnt)); + device->save_item(NAME(OPL->lfo_pm_cnt)); - state_save_register_device_item(device, 0, OPL->noise_rng); - state_save_register_device_item(device, 0, OPL->noise_p); + device->save_item(NAME(OPL->noise_rng)); + device->save_item(NAME(OPL->noise_p)); if( OPL->type & OPL_TYPE_WAVESEL ) { - state_save_register_device_item(device, 0, OPL->wavesel); + device->save_item(NAME(OPL->wavesel)); } - state_save_register_device_item_array(device, 0, OPL->T); - state_save_register_device_item_array(device, 0, OPL->st); + device->save_item(NAME(OPL->T)); + device->save_item(NAME(OPL->st)); #if BUILD_Y8950 if ( (OPL->type & OPL_TYPE_ADPCM) && (OPL->deltat) ) @@ -1947,15 +1947,15 @@ static void OPL_save_state(FM_OPL *OPL, device_t *device) if ( OPL->type & OPL_TYPE_IO ) { - state_save_register_device_item(device, 0, OPL->portDirection); - state_save_register_device_item(device, 0, OPL->portLatch); + device->save_item(NAME(OPL->portDirection)); + device->save_item(NAME(OPL->portLatch)); } #endif - state_save_register_device_item(device, 0, OPL->address); - state_save_register_device_item(device, 0, OPL->status); - state_save_register_device_item(device, 0, OPL->statusmask); - state_save_register_device_item(device, 0, OPL->mode); + device->save_item(NAME(OPL->address)); + device->save_item(NAME(OPL->status)); + device->save_item(NAME(OPL->statusmask)); + device->save_item(NAME(OPL->mode)); device->machine->state().register_postload(OPL_postload, OPL); } |
