update

[l4.git] / l4 / pkg / fb-drv / server / src / main.cc

diff --git a/l4/pkg/fb-drv/server/src/main.cc b/l4/pkg/fb-drv/server/src/main.cc
index 36f04d2f4ce48fa73cd87bac03544d7f575188bb..9b9cae7cdf16ef7b997196dc18fb3a9ddca91b2b 100644 (file)
--- a/l4/pkg/fb-drv/server/src/main.cc
+++ b/l4/pkg/fb-drv/server/src/main.cc
@@ -1,15 +1,18 @@
 /*
- * (c) 2009 Technische Universität Dresden
+ * (c) 2009 Adam Lackorzynski <adam@os.inf.tu-dresden.de>,
+ *          Alexander Warg <warg@os.inf.tu-dresden.de>,
+ *          Torsten Frenzel <frenzel@os.inf.tu-dresden.de>
+ *     economic rights: Technische Universität Dresden (Germany)
+ *
  * This file is part of TUD:OS and distributed under the terms of the
  * GNU General Public License 2.
  * Please see the COPYING-GPL-2 file for details.
  */
-#include <l4/re/env>
-#include <l4/re/error_helper>
-#include <l4/re/namespace>
-#include <l4/re/util/cap_alloc>
+
+#include <l4/sys/capability>
+#include <l4/sys/typeinfo_svr>
 #include <l4/cxx/ipc_server>
-#include <l4/cxx/l4iostream>
+
 #include <cstdio>
 #include <getopt.h>
 #include <cstdlib>
@@ -70,6 +73,8 @@ Phys_fb::dispatch(l4_umword_t obj, L4::Ipc_iostream &ios)
   ios >> tag;
   switch (tag.label())
     {
+    case L4::Meta::Protocol:
+      return L4::Util::handle_meta_request<L4Re::Video::Goos>(ios);
     case L4Re::Protocol::Goos:
       return L4Re::Util::Video::Goos_svr::dispatch(obj, ios);
     case L4Re::Protocol::Dataspace:
@@ -110,7 +115,7 @@ Prog_args::Prog_args(int argc, char *argv[])
         default:
           printf("Unknown option '%c'\n", c);
           break;
-        };
+        }
     }
 }
 
@@ -148,7 +153,7 @@ int main(int argc, char *argv[])
 
   if (!fb->obj_cap().is_valid())
     {
-      printf("Failed to register in namespace, maybe ro?\n");
+      printf("Failed to connect.\n");
       return 1;
     }