RAM test のプログラム置き場を bank area に変更

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

diff --git a/client/trunk/reader_dozeu.c b/client/trunk/reader_dozeu.c
index ac4f60a..af014e2 100644 (file)
--- a/client/trunk/reader_dozeu.c
+++ b/client/trunk/reader_dozeu.c
@@ -19,7 +19,7 @@ static int usb_open_or_close(int oc)
        switch(oc){
        case READER_OPEN:
                ret = cusb_init(
-                       CUSB_DEVICE_AUTOFIND, &handle_usb,
+                       0, &handle_usb,
                        fw_bin, 
                        "F2FW", "V100"
                );
@@ -62,7 +62,7 @@ static void dz_init(void)
        cmd[i++] = DIRECTION_PORT_C;
        cmd[i++] = CMD_OED;
        cmd[i++] = DIRECTION_PORT_D;
-       usb_bulk_write(handle_usb, CPIPE, cmd, i);
+       usb_bulk_write(&handle_usb, CPIPE, cmd, i);
        
        //¦Õ2¤Î¾å¤²²¼¤²¤Ã¤Æ CTL ü»Ò¤À¤±¤É¤É¡¼¤ä¤ë¤ó¤À??
 
@@ -73,7 +73,7 @@ static void dz_init(void)
        memcpy(cmd + i, WAVEFORM_INIT, INIT_SIZE);
        i += INIT_SIZE;
        assert(i < 0x40);
-       usb_bulk_write(handle_usb, CPIPE, cmd, i);
+       usb_bulk_write(&handle_usb, CPIPE, cmd, i);
 }
 
 static void address_set(long address)
@@ -86,7 +86,7 @@ static void address_set(long address)
        cmd[i++] = CMD_OUTE;
        cmd[i++] = address >> 8;
        assert(i < 0x40);
-       usb_bulk_write(handle_usb, CPIPE, cmd, i);
+       usb_bulk_write(&handle_usb, CPIPE, cmd, i);
 }
 
 static void waveform_set(int num)
@@ -119,7 +119,7 @@ static void waveform_set(int num)
                        i += WAVE_SIZE;
                }
                assert(i < 0x200);
-               usb_bulk_write(handle_usb, CPIPE, cmd, i);
+               usb_bulk_write(&handle_usb, CPIPE, cmd, i);
        }
        waveform_bank = num;
 }
@@ -138,8 +138,8 @@ static void bus_read(long address, long length, u8 *data)
        const u8 CMD = CMD_SREAD;
        while(length != 0){
                address_set(address);
-               usb_bulk_write(handle_usb, CPIPE, &CMD, 1);
-               usb_bulk_read(handle_usb, RFIFO, data, 1);
+               usb_bulk_write(&handle_usb, CPIPE, &CMD, 1);
+               usb_bulk_read(&handle_usb, 2, data, 1);
                address++;
                data++;
                length--;
@@ -150,7 +150,7 @@ static void bus_write(long address, long data)
 {
        address_set(address);
        const u8 CMD[2] = {CMD_SWRITE, data};
-       usb_bulk_write(handle_usb, CPIPE, CMD, 2);
+       usb_bulk_write(&handle_usb, CPIPE, CMD, 2);
 }
 
 static void dz_cpu_read(long address, long length, u8 *data)

diff --git a/client/trunk/script_engine.c b/client/trunk/script_engine.c
index a271b16..7eec4e2 100644 (file)
--- a/client/trunk/script_engine.c
+++ b/client/trunk/script_engine.c
@@ -606,10 +606,10 @@ static int logical_check(const struct script *s, const struct st_config *c, stru
                                error += 1;
                        }
                        //address filter
-                       else if(address < 0x6000 || address >= 0x8000){
+                       else if(address < 0x5c00 || address >= 0xc000){
                                logical_print_illgalarea(s->line, STR_REGION_CPU, address);
                                error += 1;
-                       }else if(end >= 0x8000){
+                       }else if(0 && end >= 0x8000){
                                logical_print_overdump(s->line, STR_REGION_CPU, address, end);
                                error += 1;
                        }