From 2271ee369d0c2055c58a258df3034735a8407caf Mon Sep 17 00:00:00 2001 From: naruko Date: Sun, 11 Jan 2009 19:08:50 +0000 Subject: [PATCH] =?utf8?q?CPU=5FCOMMAND=20=E3=82=92=E9=9A=8F=E6=99=82?= =?utf8?q?=E8=A8=AD=E5=AE=9A=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=82=8B?= =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@253 24ea1065-a21e-4ca1-99c9-f5125deb0858 --- client/trunk/script.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/trunk/script.c b/client/trunk/script.c index 7a11ad7..268b9cf 100644 --- a/client/trunk/script.c +++ b/client/trunk/script.c @@ -1066,9 +1066,6 @@ static int execute(const struct script *s, const struct st_config *c, struct rom program_compare = NULL; if(c->mode == MODE_ROM_PROGRAM){ printf("flashmemory/SRAM program mode. To abort programming, press Ctrl+C\n"); - if(r->ppu_rom.size != 0){ - c->ppu_flash_driver->init(&(r->ppu_flash)); - } int size = r->cpu_rom.size; if(size < r->ppu_rom.size){ size = r->ppu_rom.size; @@ -1085,6 +1082,9 @@ static int execute(const struct script *s, const struct st_config *c, struct rom while(s->opcode != SCRIPT_OPCODE_DUMP_END){ int end = 1; switch(s->opcode){ + case SCRIPT_OPCODE_CPU_COMMAND: + command_mask(MEMORY_AREA_CPU_ROM, s->value[0], s->value[1], s->value[2], &(r->cpu_flash)); + break; case SCRIPT_OPCODE_CPU_READ:{ struct memory *m; const long address = s->value[0]; @@ -1148,6 +1148,8 @@ static int execute(const struct script *s, const struct st_config *c, struct rom } } break; + case SCRIPT_OPCODE_PPU_COMMAND: + command_mask(MEMORY_AREA_PPU, s->value[0], s->value[1], s->value[2], &(r->ppu_flash)); case SCRIPT_OPCODE_PPU_RAMFIND: if(ppu_ramfind(d) == PPU_TEST_RAM){ printf("PPU_RAMFIND: charcter RAM found\n"); -- 2.11.0