asic/hw rev is actually pre-A not A.

Author: adriweb

core/asic.c

@@ -90,15 +90,15 @@ static void plug_devices(void) {
 
 static asic_rev_t report_reset(asic_rev_t loaded_rev, emu_device_t device, bool* python) {
     /* Parse boot code routines to determine version. */
-    asic_rev_t default_rev = ASIC_REV_A;
+    asic_rev_t default_rev = ASIC_REV_PRE_A;
     boot_ver_t boot_ver;
     bool gotVer = bootver_parse(mem.flash.block, &boot_ver);
     if (gotVer) {
         gui_console_printf("[CEmu] Boot code version: %u.%u.%u.%04u\n",
             boot_ver.major, boot_ver.minor, boot_ver.revision, boot_ver.build);
 
         /* Determine the newest ASIC revision that is compatible */
-        for (int rev = ASIC_REV_A; rev <= ASIC_REV_M; rev++) {
+        for (int rev = ASIC_REV_PRE_A; rev <= ASIC_REV_M; rev++) {
             if (bootver_check_rev(&boot_ver, (asic_rev_t)rev, device)) {
                 default_rev = rev;
             }
@@ -112,7 +112,9 @@ static asic_rev_t report_reset(asic_rev_t loaded_rev, emu_device_t device, bool*
     else {
         gui_console_err_printf("[CEmu] Could not determine boot code version.\n");
     }
-    gui_console_printf("[CEmu] Default ASIC revision is Rev %c.\n", "AIM"[(int)default_rev - 1]);
+
+    const char* revsStr[] = { "pre-A", "rev I", "rev M" };
+    gui_console_printf("[CEmu] Default ASIC revision is %s.\n", revsStr[(int)default_rev - 1]);
 
     loaded_rev = gui_handle_reset((gotVer ? &boot_ver : NULL), loaded_rev, default_rev, device, python);
     return (loaded_rev != ASIC_REV_AUTO) ? loaded_rev : default_rev;

core/asic.h

@@ -18,7 +18,7 @@ typedef enum {
 
 typedef enum {
     ASIC_REV_AUTO = 0, /* Used only with set_asic_revision() */
-    ASIC_REV_A = 1,
+    ASIC_REV_PRE_A = 1,
     ASIC_REV_I = 2,
     ASIC_REV_M = 3
 } asic_rev_t;

gui/qt/emuthread.cpp

@@ -282,8 +282,8 @@ void EmuThread::unblock() {
 asic_rev_t EmuThread::handleReset(const boot_ver_t* bootVer, asic_rev_t loadedRev, asic_rev_t defaultRev, emu_device_t device, bool* python) {
     // Build a list of supported revisions
     QList<int> supportedRevs;
-    supportedRevs.reserve(ASIC_REV_M - ASIC_REV_A + 1);
-    for (int rev = ASIC_REV_A; rev <= ASIC_REV_M; rev++) {
+    supportedRevs.reserve(ASIC_REV_M - ASIC_REV_PRE_A + 1);
+    for (int rev = ASIC_REV_PRE_A; rev <= ASIC_REV_M; rev++) {
         if (bootver_check_rev(bootVer, (asic_rev_t)rev, device)) {
             supportedRevs.push_back(rev);
         }

gui/qt/mainwindow.ui

@@ -9634,7 +9634,7 @@ QPushButton:pressed {
                  <item row="3" column="0">
                   <widget class="QLabel" name="label_33">
                    <property name="text">
-                    <string>ASIC revision:</string>
+                    <string>ASIC/HW revision:</string>
                    </property>
                   </widget>
                  </item>
@@ -9697,7 +9697,7 @@ QPushButton:pressed {
                    </item>
                    <item>
                     <property name="text">
-                     <string>Rev A</string>
+                     <string>pre-A</string>
                     </property>
                    </item>
                    <item>

gui/sdl/main.c

@@ -279,12 +279,15 @@ int main(int argc, char **argv) {
                 if (strlen(optarg) == 1) {
                     char rev = toupper(optarg[0]);
                     if (rev < 'I') {
-                        asic_rev = ASIC_REV_A;
+                        asic_rev = ASIC_REV_PREA;
                     } else if (rev < 'M') {
                         asic_rev = ASIC_REV_I;
                     } else {
                         asic_rev = ASIC_REV_M;
                     }
+                } else if (!strcmp(optarg, "preA") || !strcmp(optarg, "pre-A") ||
+                           !strcmp(optarg, "prea") || !strcmp(optarg, "pre-a")) {
+                    asic_rev = ASIC_REV_PREA;
                 }
                 break;