Exchange supported_revisions for supported_models parameter

To determine if an OS image is supported by the hardware,
check if the formal model name as provided to us by the
firmware through device-tree contains a certain string.

Example formal model names:

Raspberry Pi Model B Rev 2
Raspberry Pi 2 Model B Rev 1.1

It is sufficient to specify part of the formal name
in the supported_models parameter of os_list.json.

E.g.

supported_models: ['Pi Model']
supported_models: ['Pi 2']
supported_models: ['Pi Model','Pi 2']

The supported_models parameter can be omitted if all models are
supported.

Removes previous supported_revision / supported_hex_revision
parameters.

Author: maxnet

recovery/mainwindow.cpp

@@ -158,6 +158,7 @@ MainWindow::MainWindow(const QString &defaultDisplay, QSplashScreen *splash, QWi
     _qpd = NULL;
     QProcess::execute("mount -o ro -t vfat /dev/mmcblk0p1 /mnt");
 
+    _model = getFileContents("/proc/device-tree/model");
     QString cmdline = getFileContents("/proc/cmdline");
     if (cmdline.contains("showall"))
     {
@@ -399,60 +400,22 @@ bool MainWindow::isSupportedOs(const QString &name, const QVariantMap &values)
         return true;
     }
 
-    uint board_revision = readBoardRevision();
-    if (values.find("supported_revisions") != values.end())
+    if (values.contains("supported_models"))
     {
-        /* Check the supported revisions list */
-        QStringList revisions = values.value("supported_revisions").toString().remove(" ").split(",");
-        for (int i=0; i < revisions.size(); i++)
-        {
-            bool ok;
-            uint rev = revisions.at(i).toUInt(&ok, 10);
-            if (ok)
-            {
-                if ((rev & 0xffff) == (board_revision & 0xffff))
-                {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    else if (values.find("supported_hex_revisions") != values.end())
-    {
-        /* Check the supported revisions list */
-        QStringList revisions = values.value("supported_hex_revisions").toString().remove(" ").split(",");
-        for (int i=0; i < revisions.size(); i++)
+        QStringList supportedModels = values.value("supported_models").toStringList();
+
+        foreach (QString m, supportedModels)
         {
-            bool ok;
-            uint rev = revisions.at(i).toUInt(&ok, 16);
-            if (ok)
+            /* Check if the full formal model name (e.g. "Raspberry Pi 2 Model B Rev 1.1")
+             * contains the string we are told to look for (e.g. "Pi 2") */
+            if (_model.contains(m, Qt::CaseInsensitive))
             {
-                if ((rev & 0xffff) == (board_revision & 0xffff))
-                {
-                    return true;
-                }
+                return true;
             }
         }
+
         return false;
     }
-    else
-    {
-        /* Check the feature_level flag */
-        if (board_revision < 64) /* overflow otherwise */
-        {
-            quint64 featurelevel = values.value("feature_level", 58364).toULongLong();
-            quint64 mask = (quint64)1 << board_revision;
-            if ((featurelevel & mask) != mask)
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return false;
-        }
-    }
 
     return true;
 }

recovery/mainwindow.h

@@ -53,6 +53,7 @@ class MainWindow : public QMainWindow
     QMessageBox *_displayModeBox;
     QTimer _networkStatusPollTimer;
     QTime _time;
+    QString _model;
 
     QMap<QString,QVariantMap> listImages();
     virtual void changeEvent(QEvent * event);