diff genesis.c @ 1534:c59adc305e46 nuklear_ui

Merge
author Michael Pavone <pavone@retrodev.com>
date Sat, 24 Mar 2018 22:18:23 -0700
parents a568dca999b2 1f745318f10a
children ce1f93be0104
line wrap: on
line diff
--- a/genesis.c	Tue Mar 13 22:18:20 2018 -0700
+++ b/genesis.c	Sat Mar 24 22:18:23 2018 -0700
@@ -1285,7 +1285,8 @@
 		if (gen->save_type == SAVE_I2C) {
 			eeprom_init(&gen->eeprom, gen->save_storage, gen->save_size);
 		} else if (gen->save_type == SAVE_NOR) {
-			nor_flash_init(&gen->nor, gen->save_storage, gen->save_size, rom->save_page_size, rom->save_product_id, rom->save_bus);
+			memcpy(&gen->nor, rom->nor, sizeof(gen->nor));
+			//nor_flash_init(&gen->nor, gen->save_storage, gen->save_size, rom->save_page_size, rom->save_product_id, rom->save_bus);
 		}
 	} else {
 		gen->save_storage = NULL;