Fix e2k display data

3 files changed, 8 insertions, 29 deletions

diff --git a/AUTHORS.md b/AUTHORS.md
index 74073a8c..18e568b9 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -28,6 +28,7 @@ Here is an incomplete list of contributors:
 * "jamesbond" (http://chiselapp.com/user/jamesbond/)
 * Ondrej Čerman <ocerman@sda1.eu>
 * Mike Hewitt <matroxmike@icloud.com>
+* Boris Afonot <boris.afonot@gmail.com>
 
 Includes code from or based on:
 
diff --git a/data/vendor.ids b/data/vendor.ids
index 06c7a041..3f170290 100644
--- a/data/vendor.ids
+++ b/data/vendor.ids
@@ -699,7 +699,6 @@ name AO MCST
     match_string EL2S4
     match_string MBE1C-PC
     match_string MONOCUB
-    match_string E8C
     match_string E8C-SWTX
     match_string_prefix MBE8C-PC
     match_string Elbrus-MCST
@@ -708,39 +707,18 @@ name AO MCST
     name_short Information:
     url www.mcst.ru/elbrus-4c
     match_string E2S
-
-name AO MCST
-    name_short Information:
     url www.mcst.ru/elbrus-1c-plus
     match_string E1C+
-
-name AO MCST
-    name_short Information:
     url www.mcst.ru/elbrus-2c-plus
     match_string E2C+DSP
-
-name AO MCST
-    name_short Information:
     url www.mcst.ru/elbrus-8c
     match_string E8C
-
-name AO MCST
-    name_short Information:
-    url www.mcst.ru/elbrus-8cb
+    url www.mcst.ru/elbrus-8sv
     match_string E8C2
-
-name AO MCST
-    name_short Information:
     url www.mcst.ru/elbrus-12c
     match_string E12C
-
-name AO MCST
-    name_short Information:
     url www.mcst.ru/elbrus-16c
     match_string E16C
-
-name AO MCST
-    name_short Information:
     url www.mcst.ru/elbrus-2c3
     match_string E2C3
 
diff --git a/modules/devices/e2k/processor.c b/modules/devices/e2k/processor.c
index 55e93e6d..64c11d34 100644
--- a/modules/devices/e2k/processor.c
+++ b/modules/devices/e2k/processor.c
@@ -1,7 +1,7 @@
 /*
  *    HardInfo - Displays System Information
  *    Copyright (C) 2020 EntityFX <artem.solopiy@gmail.com> and MCST Elbrus Team 
- *
+ *    modified by Boris Afonot <boris.afonot@gmail.com> (2022)
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
  *    the Free Software Foundation, version 2.
@@ -348,14 +348,16 @@ gchar *processor_get_info(GSList * processors)
 
     gchar *ret, *tmp, *hashkey;
     GSList *l;
-    gchar *icons=g_strdup("");
 
     tmp = g_strdup("");
 
     for (l = processors; l; l = l->next) {
         processor = (Processor *) l->data;
-
         gchar *model_name = g_strdup_printf("MCST Elbrus %s", processor->model_name);
+
+        if(!g_strcmp0(processor->vendor_id, "E8C"))
+            processor->vendor_id = g_strdup_printf("%s-SWTX", processor->vendor_id);
+
         const Vendor *v = vendor_match(processor->vendor_id, NULL);
         if (v)
             tag_vendor(&model_name, 0, v->name_short ? v->name_short : v->name, v->ansi_color, params.fmt_opts);
@@ -378,11 +380,9 @@ gchar *processor_get_info(GSList * processors)
                 "ColumnTitle$Value=%s\n"
                 "ColumnTitle$Extra1=%s\n"
                 "ShowColumnHeaders=true\n"
-                "%s"
                 "[Processors]\n"
-                "%s", _("Device"), _("Frequency"), _("Model"), icons, tmp);
+                "%s", _("Device"), _("Frequency"), _("Model"), tmp);
     g_free(tmp);
-    g_free(icons);
 
     return ret;
 }