diff options
author | Adam Jackson <ajax@redhat.com> | 2017-03-24 15:58:54 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2017-05-03 16:00:54 -0400 |
commit | c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1 (patch) | |
tree | 3447c054e519f286b9edccf392d260572d959e72 /hw/kdrive/ephyr/os.c | |
parent | c0375dced38674ed98562529530d89ff02c48100 (diff) |
kdrive: Remove KdOsFuncs
Only the Init slot was used, and Xephyr can just as easily do that
initialization directly.
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/kdrive/ephyr/os.c')
-rw-r--r-- | hw/kdrive/ephyr/os.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/hw/kdrive/ephyr/os.c b/hw/kdrive/ephyr/os.c deleted file mode 100644 index 12bbc5497..000000000 --- a/hw/kdrive/ephyr/os.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Xephyr - A kdrive X server thats runs in a host X window. - * Authored by Matthew Allum <mallum@o-hand.com> - * - * Copyright © 2004 Nokia - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Nokia not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Nokia makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * NOKIA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL NOKIA BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif -#include "ephyr.h" - -extern void processScreenArg(const char *screen_size, char *parent_id); - -static int -EphyrInit(void) -{ - /* - * make sure at least one screen - * has been added to the system. - */ - if (!KdCardInfoLast()) { - processScreenArg("640x480", NULL); - } - return hostx_init(); -} - -KdOsFuncs EphyrOsFuncs = { - .Init = EphyrInit, -}; |