# HG changeset patch
# User asl
# Date 1093095953 0
# Node ID fcf5b538459b1992621b8a40bd9870e31e66876c
# Parent  c506b95a63461273b7d3c41cea848a4d759e2606
        * tests/flash[23].c: Removed calls to cyg_flash_get_block_info()
        and cyg_flash_get_limits() which have been removed.

diff --git a/packages/devs/flash/synthv2/current/ChangeLog b/packages/devs/flash/synthv2/current/ChangeLog
--- a/packages/devs/flash/synthv2/current/ChangeLog
+++ b/packages/devs/flash/synthv2/current/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-21  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* tests/flash[23].c: Removed calls to cyg_flash_get_block_info()
+	and cyg_flash_get_limits() which have been removed. 
+
 2004-08-03  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* cdl/flash_synth.cdl: Indicate we use the V2 device API.
diff --git a/packages/devs/flash/synthv2/current/tests/flash2.c b/packages/devs/flash/synthv2/current/tests/flash2.c
--- a/packages/devs/flash/synthv2/current/tests/flash2.c
+++ b/packages/devs/flash/synthv2/current/tests/flash2.c
@@ -82,11 +82,11 @@ void cyg_user_start(void)
 void cyg_user_start(void)
 {
     int ret;
-    cyg_flashaddr_t flash_start, flash_end;
+    cyg_flashaddr_t flash_start=0, flash_end=0;
     cyg_flash_info_t info;
     cyg_uint32 i=0;
     cyg_uint32 j;
-    int block_size, blocks;
+    int block_size=0, blocks=0;
     cyg_flashaddr_t prog_start;
     unsigned char * ptr;
 
@@ -96,28 +96,17 @@ void cyg_user_start(void)
     
     CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_init");
 
-    ret = cyg_flash_get_limits(&flash_start,&flash_end);
-    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_get_limits");
-    diag_printf("INFO: flash_start=%p, flash_end=%p\n", 
-                flash_start, flash_end);
-    
-    ret = cyg_flash_get_block_info(&block_size, &blocks);
-    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_get_block_info");
-    CYG_TEST_PASS_FAIL((block_size == CYGNUM_FLASH_SYNTH_V2_BLOCKSIZE),
-                      "correct block size");
-    CYG_TEST_PASS_FAIL((blocks == (CYGNUM_FLASH_SYNTH_V2_NUMBLOCKS +
-                                   (CYGNUM_FLASH_SYNTH_V2_NUMBOOT_BLOCKS *
-                                    CYGNUM_FLASH_SYNTH_V2_BOOT_BLOCKSIZE /
-                                    CYGNUM_FLASH_SYNTH_V2_BLOCKSIZE))),
-                      "correct number of blocks");
-    
-    diag_printf("INFO: block_size=0x%x, blocks=%d\n", block_size, blocks);
-    
     do {
       ret = cyg_flash_get_info(i, &info);
       if (ret == CYG_FLASH_ERR_OK) {
         diag_printf("INFO: Nth=%d, start=%p, end=%p\n",
                     i, info.start, info.end);
+        if (i == 0) {
+          flash_start = info.start;
+          flash_end = info.end;
+          block_size = info.block_info[0].block_size;
+          blocks = info.block_info[0].blocks;
+        }
         for (j=0;j < info.num_block_infos; j++) {
           diag_printf("INFO:\t block_size %d, blocks %d\n",
                       info.block_info[j].block_size,
diff --git a/packages/devs/flash/synthv2/current/tests/flash3.c b/packages/devs/flash/synthv2/current/tests/flash3.c
--- a/packages/devs/flash/synthv2/current/tests/flash3.c
+++ b/packages/devs/flash/synthv2/current/tests/flash3.c
@@ -98,11 +98,11 @@ CYG_FLASH_DRIVER(cyg_flash_synth_flashde
 void cyg_user_start(void)
 {
     int ret;
-    cyg_flashaddr_t flash_start, flash_end;
+    cyg_flashaddr_t flash_start=0, flash_end=0;
     cyg_flash_info_t info;
     cyg_uint32 i=0;
     cyg_uint32 j;
-    int block_size, blocks;
+    int block_size=0, blocks=0;
     cyg_flashaddr_t prog_start;
     unsigned char * ptr;
 
@@ -115,28 +115,18 @@ void cyg_user_start(void)
     
     CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_init");
 
-    ret = cyg_flash_get_limits(&flash_start,&flash_end);
-    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_get_limits");
-    diag_printf("INFO: flash_start=%p, flash_end=%p\n", 
-                flash_start, flash_end);
-    
-    ret = cyg_flash_get_block_info(&block_size, &blocks);
-    CYG_TEST_PASS_FAIL((ret == CYG_FLASH_ERR_OK),"flash_get_block_info");
-    CYG_TEST_PASS_FAIL((block_size == CYGNUM_FLASH_SYNTH_V2_BLOCKSIZE),
-                      "correct block size");
-    CYG_TEST_PASS_FAIL((blocks == (CYGNUM_FLASH_SYNTH_V2_NUMBLOCKS +
-                                   (CYGNUM_FLASH_SYNTH_V2_NUMBOOT_BLOCKS *
-                                    CYGNUM_FLASH_SYNTH_V2_BOOT_BLOCKSIZE /
-                                    CYGNUM_FLASH_SYNTH_V2_BLOCKSIZE))),
-                      "correct number of blocks");
-    
-    diag_printf("INFO: block_size=0x%x, blocks=%d\n", block_size, blocks);
-    
     do {
       ret = cyg_flash_get_info(i, &info);
       if (ret == CYG_FLASH_ERR_OK) {
         diag_printf("INFO: Nth=%d, start=%p, end=%p\n",
                     i, info.start, info.end);
+        if (i == 0) {
+          flash_start = info.start;
+          flash_end = info.end;
+          block_size = info.block_info[0].block_size;
+          blocks = info.block_info[0].blocks;
+        }
+        
         for (j=0;j < info.num_block_infos; j++) {
           diag_printf("INFO:\t block_size %d, blocks %d\n",
                       info.block_info[j].block_size,