Mercurial > repos > blastem

comparison genesis.c @ 1534:c59adc305e46 nuklear_ui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Michael Pavone <pavone@retrodev.com>
date Sat, 24 Mar 2018 22:18:23 -0700
parents a568dca999b2 1f745318f10a
children ce1f93be0104
comparison
equal deleted inserted replaced
1528:855210dca5b9 1534:c59adc305e46
1283 gen->eeprom_map = rom->eeprom_map; 1283 gen->eeprom_map = rom->eeprom_map;
1284 gen->num_eeprom = rom->num_eeprom; 1284 gen->num_eeprom = rom->num_eeprom;
1285 if (gen->save_type == SAVE_I2C) { 1285 if (gen->save_type == SAVE_I2C) {
1286 eeprom_init(&gen->eeprom, gen->save_storage, gen->save_size); 1286 eeprom_init(&gen->eeprom, gen->save_storage, gen->save_size);
1287 } else if (gen->save_type == SAVE_NOR) { 1287 } else if (gen->save_type == SAVE_NOR) {
1288 nor_flash_init(&gen->nor, gen->save_storage, gen->save_size, rom->save_page_size, rom->save_product_id, rom->save_bus); 1288 memcpy(&gen->nor, rom->nor, sizeof(gen->nor));
1289 //nor_flash_init(&gen->nor, gen->save_storage, gen->save_size, rom->save_page_size, rom->save_product_id, rom->save_bus);
1289 } 1290 }
1290 } else { 1291 } else {
1291 gen->save_storage = NULL; 1292 gen->save_storage = NULL;
1292 } 1293 }
1293 1294