flash device dummy での書き込み処理と文字出力の変更

git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@231 24ea1065-a21e-4ca1-99c9-f5125deb0858

diff --git a/client/trunk/flashmemory.c b/client/trunk/flashmemory.c
index 9bcc9d1..5332400 100644 (file)
--- a/client/trunk/flashmemory.c
+++ b/client/trunk/flashmemory.c
@@ -421,15 +421,13 @@ static void dummy_write(const struct flash_order *d, long address, long length,
 /*
 ¥Ç¥Ð¥¤¥¹¥ê¥¹¥È
 */
-enum{
-       ID_SRAM = 0, ID_DUMMY = ID_SRAM
-};
+//0x80 °Ê¹ß¤ÏËÜÅö¤Î¥Ç¥Ð¥¤¥¹½ÅÊ£¤·¤Ê¤¤¤È»×¤¦. 狼 JEDEC ¤Î¤È¤³¤ò¤·¤é¤Ù¤Æ.
 static const struct flash_driver DRIVER_SRAM256K = {
        .name = "SRAM256K",
        .capacity = 0x8000,
        .pagesize = 0,
-       .id_manufacurer = ID_SRAM,
-       .id_device = ID_SRAM,
+       .id_manufacurer = FLASH_ID_DEVICE_SRAM,
+       .id_device = FLASH_ID_DEVICE_SRAM,
        .productid_check = productid_sram,
 #if DEBUG==1
        .erase = sram_erase,
@@ -442,8 +440,8 @@ static const struct flash_driver DRIVER_DUMMY = {
        .name = "dummy",
        .capacity = 0x40000,
        .pagesize = 0,
-       .id_manufacurer = ID_DUMMY,
-       .id_device = ID_DUMMY,
+       .id_manufacurer = FLASH_ID_DEVICE_DUMMY,
+       .id_device = FLASH_ID_DEVICE_DUMMY,
        .productid_check = productid_sram,
 #if DEBUG==1
        .erase = sram_erase,

diff --git a/client/trunk/flashmemory.h b/client/trunk/flashmemory.h
index 57a38b9..a54c672 100644 (file)
--- a/client/trunk/flashmemory.h
+++ b/client/trunk/flashmemory.h
@@ -48,4 +48,8 @@ struct flash_driver{
 };
 
 const struct flash_driver *flash_driver_get(const char *name);
+enum{
+       FLASH_ID_DEVICE_SRAM = 0xf0, 
+       FLASH_ID_DEVICE_DUMMY
+};
 #endif

diff --git a/client/trunk/script.c b/client/trunk/script.c
index dcd2738..cf40be6 100644 (file)
--- a/client/trunk/script.c
+++ b/client/trunk/script.c
@@ -975,7 +975,7 @@ static void read_result_print(const struct memory *m, long length)
 
 static void execute_program_begin(const struct memory *m)
 {
-       if(DEBUG==1){
+       if(0){ //DEBUG==1){
                return;
        }
        printf("writing %s area 0x%06x ... ", m->name, m->offset);
@@ -1087,6 +1087,9 @@ static int execute(const struct script *s, const struct st_config *c, struct rom
                        }
                        break;
                case SCRIPT_OPCODE_CPU_PROGRAM:{
+                       if(c->cpu_flash_driver->id_device == FLASH_ID_DEVICE_DUMMY){
+                               break;
+                       }
                        const long address = s->value[0];
                        const long length = s->value[1];
                        execute_program_begin(&cpu_rom);
@@ -1148,6 +1151,9 @@ static int execute(const struct script *s, const struct st_config *c, struct rom
                        }
                        break;
                case SCRIPT_OPCODE_PPU_PROGRAM:{
+                       if(c->ppu_flash_driver->id_device == FLASH_ID_DEVICE_DUMMY){
+                               break;
+                       }
                        const long address = s->value[0];
                        const long length = s->value[1];
                        execute_program_begin(&ppu_rom);

diff --git a/client/trunk/syntax.h b/client/trunk/syntax.h
index c1d0a57..8297b94 100644 (file)
--- a/client/trunk/syntax.h
+++ b/client/trunk/syntax.h
@@ -157,16 +157,10 @@ static const struct script_syntax SCRIPT_SYNTAX[] = {
                permittion: PERMITTION_ROM_PROGRAM,
                argc: 2, compare: SYNTAX_COMPARE_EQ,
                argv_type: ARGV_TYPE_ADDRESS_LENGTH
-       },{ //version 0.5.3 ¤ÇÇѻߤ¹¤ë
-               name: "PPU_RAMTEST",
-               script_opcode: SCRIPT_OPCODE_PPU_RAMFIND,
-               permittion: PERMITTION_ROM_DUMP,
-               argc: 0, compare: SYNTAX_COMPARE_EQ,
-               argv_type: ARGV_TYPE_NULL
        },{
                name: "PPU_RAMFIND",
                script_opcode: SCRIPT_OPCODE_PPU_RAMFIND,
-               permittion: PERMITTION_ROM_DUMP,
+               permittion: PERMITTION_ROM_DUMP | PERMITTION_ROM_PROGRAM,
                argc: 0, compare: SYNTAX_COMPARE_EQ,
                argv_type: ARGV_TYPE_NULL
        },{

diff --git a/client/trunk/unagi.txt b/client/trunk/unagi.txt
index b5a61c0..95bb696 100644 (file)
--- a/client/trunk/unagi.txt
+++ b/client/trunk/unagi.txt
@@ -64,6 +64,7 @@ ram file    - 
 \83W\83f\81[\83^\82ð\91ã\91Ö\83f\83o\83C\83X\82É\93]\91\97\82·\82é\83\82\81[\83h\82Å\82·\81B\90§\8cÀ\82Í\91½\82¢\82Å\82·\82ª\81A\88ê\89\9e\93®\8dì
 \8eÀ\90Ñ\82ª\82 \82è\82Ü\82·\81B
 \8eÀ\8c±\97v\91f\82ª\91½\82¢\8eÀ\91\95\82Ì\82½\82ß\81A\8fÚ\8d×\82Í\8cÂ\95Ê\82É\96â\82¢\8d\87\82í\82¹\82Ä\82­\82¾\82³\82¢\81B
+email: unagi.kaihatu@gmail.com
 
 --\83X\83N\83\8a\83v\83g\8ed\97l--
 ROM dump script \83p\83b\83P\81[\83W\82Ì syntax.txt \82ð\8eQ\8fÆ\82µ\82Ä\82­\82¾\82³\82¢\81B