Update latency tester

* Enable operation with all sources
* Measure strobe length on low-persistence displays

software/sys_controller/memory/flash.c

@@ -19,12 +19,11 @@
 
 #include <unistd.h>
 #include <string.h>
+#include "system.h"
 #include "flash.h"
-#include "lcd.h"
 #include "ci_crc.h"
 
 extern alt_epcq_controller_dev epcq_controller_0;
-extern char menu_row1[LCD_ROW_LEN+1], menu_row2[LCD_ROW_LEN+1];
 
 alt_epcq_controller_dev *epcq_controller_dev;
 
@@ -34,7 +33,7 @@ int check_flash()
     epcq_controller_dev = &epcq_controller_0;
 
     if ((epcq_controller_dev == NULL) || !(epcq_controller_dev->is_epcs && (epcq_controller_dev->page_size == PAGESIZE)))
-        return -1;
+        return -FLASH_DETECT_ERROR;
 
     printf("Flash size in bytes: %lu\nSector size: %lu (%lu pages)\nPage size: %lu\n",
             epcq_controller_dev->size_in_bytes, epcq_controller_dev->sector_size, epcq_controller_dev->sector_size/epcq_controller_dev->page_size, epcq_controller_dev->page_size);
@@ -48,7 +47,7 @@ int read_flash(alt_u32 offset, alt_u32 length, alt_u8 *dstbuf)
 
     retval = alt_epcq_controller_read(&epcq_controller_dev->dev, offset, dstbuf, length);
     if (retval != 0)
-        return -1;
+        return -FLASH_READ_ERROR;
 
     for (i=0; i<length; i++)
         dstbuf[i] = ALT_CI_NIOS_CUSTOM_INSTR_BITSWAP_0(dstbuf[i]) >> 24;
@@ -65,11 +64,8 @@ int write_flash_page(alt_u8 *pagedata, alt_u32 length, alt_u32 pagenum)
         retval = alt_epcq_controller_erase_block(&epcq_controller_dev->dev, pagenum*PAGESIZE);
 
         if (retval != 0) {
-            strncpy(menu_row1, "Flash erase", LCD_ROW_LEN+1);
-            sniprintf(menu_row1, LCD_ROW_LEN+1, "error %d", retval);
-            menu_row2[0] = '\0';
             printf("Flash erase error, sector %u\nRetval %d\n", (unsigned)(pagenum/PAGES_PER_SECTOR), retval);
-            return -200;
+            return -FLASH_ERASE_ERROR;
         }
     }
 
@@ -80,13 +76,11 @@ int write_flash_page(alt_u8 *pagedata, alt_u32 length, alt_u32 pagenum)
     retval = alt_epcq_controller_write_block(&epcq_controller_dev->dev, (pagenum/PAGES_PER_SECTOR)*PAGES_PER_SECTOR*PAGESIZE, pagenum*PAGESIZE, pagedata, length);
 
     if (retval != 0) {
-        strncpy(menu_row1, "Flash write", LCD_ROW_LEN+1);
-        strncpy(menu_row2, "error", LCD_ROW_LEN+1);
         printf("Flash write error, page %u\nRetval %d\n", (unsigned)pagenum, retval);
-        return -201;
+        return -FLASH_WRITE_ERROR;
     }
 
-    return retval;
+    return 0;
 }
 
 int verify_flash(alt_u32 offset, alt_u32 length, alt_u32 golden_crc, alt_u8 *tmpbuf)
@@ -99,16 +93,13 @@ int verify_flash(alt_u32 offset, alt_u32 length, alt_u32 golden_crc, alt_u8 *tmp
 
         retval = read_flash(i, bytes_to_read, tmpbuf);
         if (retval != 0)
-            return -202;
+            return retval;
 
         crcval = crcCI(tmpbuf, bytes_to_read, (i==0));
     }
 
-    if (crcval != golden_crc) {
-        sniprintf(menu_row1, LCD_ROW_LEN+1, "Flash verif fail");
-        menu_row2[0] = '\0';
-        return -203;
-    }
+    if (crcval != golden_crc)
+        return -FLASH_VERIFY_ERROR;
 
     return 0;
 }

software/sys_controller/memory/flash.h

@@ -32,6 +32,12 @@
 #define USERDATA_OFFSET 0x100000
 #define MAX_USERDATA_ENTRY 15    // 16 sectors for userdata
 
+#define FLASH_DETECT_ERROR      200
+#define FLASH_READ_ERROR        201
+#define FLASH_ERASE_ERROR       202
+#define FLASH_WRITE_ERROR       203
+#define FLASH_VERIFY_ERROR      204
+
 int check_flash();
 
 int read_flash(alt_u32 offset, alt_u32 length, alt_u8 *dstbuf);

software/sys_controller/memory/sdcard.c

@@ -31,11 +31,8 @@ int check_sdcard(alt_u8 *databuf)
 
     res = SD_Init(&sdcard_dev);
     printf("SD det status: %u\n", res);
-    if (res) {
-        sniprintf(menu_row1, LCD_ROW_LEN+1, "No SD card det.");
-        menu_row2[0] = '\0';
-        return 1;
-    }
+    if (res != SD_OK)
+        return res;
 
     return SD_Read(&sdcard_dev, databuf, 0, 0, 512);
 }