release 対応

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

diff --git a/client/trunk/Makefile b/client/trunk/Makefile
index 42ec6a2..83f734c 100644 (file)
--- a/client/trunk/Makefile
+++ b/client/trunk/Makefile
@@ -10,8 +10,8 @@ SOURCE_ANAGO = \
        flash_device.h progress.h reader_dummy.h script_common.h  script_dump.h script_flash.h squirrel_wrap.h \
        flashcore.nut flashdevice.nut \
        anago_en.txt anago_ja.txt porting.txt
-ARCHIVE_GZ = unagi_client_source.0.6.0.tar.gz
-ARCHIVE_ZIP = unagi_client_windows_060.zip
+ARCHIVE_GZ = unagi_client_source.0.6.x.tar.gz
+ARCHIVE_ZIP = unagi_client_windows_06x.zip
 TARGET_DIR = debug
 TARGET_MAK = debug.mak
 ifeq ($(PROFILE),1)

diff --git a/client/trunk/anago/Makefile b/client/trunk/anago/Makefile
index c018cf6..516cac7 100644 (file)
--- a/client/trunk/anago/Makefile
+++ b/client/trunk/anago/Makefile
@@ -3,8 +3,8 @@ LIBUSB = d:/dev/LibUSB-Win32
 SQUIRREL = ../SQUIRREL2
 KAZZO = ../../kazzo/firmware
 VPATH = ..
-CFLAGS = -g -O0
-#CFLAGS = -O2 -DNDEBUG
+#CFLAGS = -g -O0
+CFLAGS = -O2 -DNDEBUG
 CFLAGS += -Wall -Werror -I.. -I$(LIBUSB)/include -I$(SQUIRREL)/include -I$(KAZZO) -DDEBUG=1 -DANAGO=1
 LDFLAG = -L. -L$(LIBUSB)/lib/gcc -L$(SQUIRREL)/lib
 CC = gcc

diff --git a/client/trunk/anago/flashcore.nut b/client/trunk/anago/flashcore.nut
index 5305589..7c34488 100644 (file)
--- a/client/trunk/anago/flashcore.nut
+++ b/client/trunk/anago/flashcore.nut
@@ -30,9 +30,9 @@ function testrun(
 )
 {
        local trans_empty = 0;
-       if(board.mappernum != mapper){
-               print("mapper number not connected\n");
-               return;
+       if((board.mappernum != mapper) && (mapper != 0)){
+               print("mapper number are not connected\n");
+               print("af:" + board.mappernum + " image:" + mapper + "\n");
        }
        local cpu_loop = loopsize_get(board.cpu, cpu_trans, cpu_image_size, cpu_device_size);
        local ppu_loop = loopsize_get(board.ppu, ppu_trans, ppu_image_size, ppu_device_size);
@@ -55,6 +55,9 @@ function program(
 )
 {
        local trans_empty = 0;
+       if((board.mappernum != mapper) && (mapper != 0)){
+               return;
+       }
        local cpu_loop = loopsize_get(board.cpu, cpu_trans, cpu_image_size, cpu_device_size);
        local ppu_loop = loopsize_get(board.ppu, ppu_trans, ppu_image_size, ppu_device_size);
        local co_cpu = newthread(cpu_transfer);

diff --git a/client/trunk/flashmemory.c b/client/trunk/flashmemory.c
index 8a06ed5..d78d869 100644 (file)
--- a/client/trunk/flashmemory.c
+++ b/client/trunk/flashmemory.c
@@ -61,7 +61,7 @@ static void program_sram(const struct flash_order *d, long address, long length,
 }
 static void program_flash(const struct flash_order *d, long address, long length, const struct memory *m)
 {
-       d->program(address, length, m->data, true);
+       d->program(address, length, m->data, true, false);
 }
 /*
 ¥Ç¥Ð¥¤¥¹¥ê¥¹¥È

diff --git a/client/trunk/flashmemory.h b/client/trunk/flashmemory.h
index df5213a..4191c8d 100644 (file)
--- a/client/trunk/flashmemory.h
+++ b/client/trunk/flashmemory.h
@@ -31,10 +31,10 @@ struct flash_order{
        long command_mask;
        long pagesize;
        //struct reader_driver ¤Î´Ø¿ô¥Ý¥¤¥ó¥¿¤òÅϤ¹¾ì½ê
-       void (*config)(long c000, long c2aaa, long c5555, long unit);
+       void (*config)(long c000, long c2aaa, long c5555, long unit, bool retry);
        void (*erase)(long address, bool dowait);
        void (*write)(long address, long length, uint8_t *data);
-       long (*program)(long address, long length, const uint8_t *data, bool dowait);
+       long (*program)(long address, long length, const uint8_t *data, bool dowait, bool skip);
 };
 
 struct memory;

diff --git a/client/trunk/reader_kazzo.c b/client/trunk/reader_kazzo.c
index 6488a23..83bc08d 100644 (file)
--- a/client/trunk/reader_kazzo.c
+++ b/client/trunk/reader_kazzo.c
@@ -1,6 +1,5 @@
 #include <assert.h>
 #include <stdlib.h>
-//#include <stdbool.h>
 #include <usb.h>
 #include <kazzo_request.h>
 #include <kazzo_task.h>
@@ -146,17 +145,17 @@ static inline void pack_short_le(long l, uint8_t *t)
 static void flash_config(enum request r, enum index index, long c000x, long c2aaa, long c5555, long unit, bool retry)
 {
        const int size = 2 * 4 + 1;
-       uint8_t buf[10]; //[size];
+       uint8_t buf[size];
        uint8_t *t = buf;
        assert(unit >= 1 && unit < 0x400);
        pack_short_le(c000x, t);
-       t += 2;
+       t += sizeof(uint16_t);
        pack_short_le(c2aaa, t);
-       t += 2;
+       t += sizeof(uint16_t);
        pack_short_le(c5555, t);
-       t += 2;
+       t += sizeof(uint16_t);
        pack_short_le(unit, t);
-       t += 2;
+       t += sizeof(uint16_t);
        *t = retry == true ? 1 : 0;
        device_write(handle, r, index, 0, size, buf);
 }

diff --git a/client/trunk/script_engine.c b/client/trunk/script_engine.c
index 4b42ba5..b736453 100644 (file)
--- a/client/trunk/script_engine.c
+++ b/client/trunk/script_engine.c
@@ -1121,7 +1121,8 @@ static int execute(const struct script *s, const struct st_config *c, struct rom
                                        r->cpu_flash.command_0000,
                                        r->cpu_flash.command_2aaa,
                                        r->cpu_flash.command_5555,
-                                       r->cpu_flash.pagesize
+                                       r->cpu_flash.pagesize,
+                                       false
                                );
                                flashcommand_change_cpu = 0;
                        }
@@ -1214,7 +1215,8 @@ static int execute(const struct script *s, const struct st_config *c, struct rom
                                        r->ppu_flash.command_0000,
                                        r->ppu_flash.command_2aaa,
                                        r->ppu_flash.command_5555,
-                                       r->ppu_flash.pagesize
+                                       r->ppu_flash.pagesize,
+                                       false
                                );
                                flashcommand_change_ppu = 0;
                        }

diff --git a/client/trunk/version.h b/client/trunk/version.h
index 068e437..59e51cf 100644 (file)
--- a/client/trunk/version.h
+++ b/client/trunk/version.h
@@ -1,5 +1,5 @@
 //include from unagi.c only
-static const char STR_VERSION[] = "0.6.0 "
+static const char STR_VERSION[] = "0.6.1 "
 #if DEBUG==1
 "debug "
 #else