EVL: Nicer detection

Author: hdiethelm

src/rtapi/uspace_common.h

@@ -381,24 +381,28 @@ static int detect_rtai() {
 }
 #endif
 #ifdef USPACE_XENOMAI
-static int detect_xenomai_evl() {
-    struct utsname u;
-    uname(&u);
-    return strcasestr (u.release, "-xenomai4") != 0; //ToDo: This is not nice
-}
 static int detect_xenomai() {
-    struct utsname u;
-    uname(&u);
-    return strcasestr (u.release, "-xenomai3") != 0; //ToDo: This is not nice
+    struct stat sb;
+    //Running xenomai has /proc/xenomai
+    return stat("/proc/xenomai", &sb) == 0;
 }
 #else
-static int detect_xenomai_evl() {
+static int detect_xenomai() {
     return 0;
 }
-static int detect_xenomai() {
+#endif
+#ifdef USPACE_XENOMAI_EVL
+static int detect_xenomai_evl() {
+    struct stat sb;
+    //Running xenomai evl has /dev/evl but no /proc/xenomai
+    return stat("/dev/evl", &sb) == 0;
+}
+#else
+static int detect_xenomai_evl() {
     return 0;
 }
 #endif
+
 static int detect_env_override() {
     char *p = getenv("LINUXCNC_FORCE_REALTIME");
     return p != NULL && atoi(p) != 0;

src/rtapi/uspace_xenomai_evl.cc

@@ -221,6 +221,6 @@ pthread_key_t XenomaiApp::key;
 extern "C" RtapiApp *make();
 
 RtapiApp *make() {
-    rtapi_print_msg(RTAPI_MSG_ERR, "Note: Using XENOMAI4 EVL (posix-skin) realtime\n");
+    rtapi_print_msg(RTAPI_MSG_ERR, "Note: Using XENOMAI4 EVL realtime\n");
     return new XenomaiApp;
 }