From: Michal Vaner <vorner@ucw.cz>
Date: Sun, 30 Nov 2008 16:08:13 +0000 (+0100)
Subject: Better error message for missing fb-direct
X-Git-Tag: holmes-import~127
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=42399eb734f2b3576ba1b9c8d334ba3b3708cc5b;p=libucw.git

Better error message for missing fb-direct

Tells how it got disabled.
---

diff --git a/ucw/fb-param.c b/ucw/fb-param.c
index 0d9d6904..22f988c6 100644
--- a/ucw/fb-param.c
+++ b/ucw/fb-param.c
@@ -25,14 +25,21 @@ struct fb_params fbpar_def = {
 static char *
 fbpar_cf_commit(struct fb_params *p UNUSED)
 {
-#ifndef CONFIG_UCW_THREADS
   if (p->type == FB_DIRECT)
-    return "Direct I/O is supported only with CONFIG_UCW_THREADS";
+    {
+#ifndef CONFIG_UCW_THREADS
+      return "Direct I/O is supported only with CONFIG_UCW_THREADS";
+#endif
+#ifdef CONFIG_DARWIN
+      return "Direct I/O is not supported on darwin";
+#endif
+#ifndef CONFIG_DIRECT_IO
+      return "Direct I/O disabled by configure switch -CONFIG_DIRECT_IO";
 #endif
 #ifndef CONFIG_UCW_FB_DIRECT
-  if (p->type == FB_DIRECT)
-    return "Direct I/O is disabled";
+      return "Direct I/O disabled by configure switch -CONFIG_UCW_FB_DIRECT";
 #endif
+    }
   return NULL;
 }