diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-30 15:43:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-30 15:43:57 +0000 |
| commit | 54fffe7283b49dcaae81e826eb0dff213552c4ec (patch) | |
| tree | c3a8c65ebffb5841251bd16edec93f0576f77418 /xorg-server/hw/xfree86/int10 | |
| parent | d718b0dd8ed27c6f8497077b8d4b088d9b7f7bd3 (diff) | |
| parent | f952d0d771de6d9b8ecc3cbbe3624203723bbb25 (diff) | |
| download | vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.gz vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.tar.bz2 vcxsrv-54fffe7283b49dcaae81e826eb0dff213552c4ec.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/int10')
| -rw-r--r-- | xorg-server/hw/xfree86/int10/xf86int10module.c | 107 |
1 files changed, 43 insertions, 64 deletions
diff --git a/xorg-server/hw/xfree86/int10/xf86int10module.c b/xorg-server/hw/xfree86/int10/xf86int10module.c index b4e5865da..52bf0eeb1 100644 --- a/xorg-server/hw/xfree86/int10/xf86int10module.c +++ b/xorg-server/hw/xfree86/int10/xf86int10module.c @@ -1,64 +1,43 @@ -/* - * XFree86 int10 module - * execute BIOS int 10h calls in x86 real mode environment - * Copyright 1999 Egbert Eich - */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86.h" -#include "xf86str.h" -#include "xf86Pci.h" -#include "xf86int10.h" - -#ifndef MOD_NAME -# define MOD_NAME int10 -#endif - -#define stringify(x) #x -#define STRING(x) stringify(x) -#define concat(x,y) x ## y -#define combine(a,b) concat(a,b) -#define NAME(x) combine(MOD_NAME,x) - -static MODULESETUPPROTO(NAME(Setup)); - -static XF86ModuleVersionInfo NAME(VersRec) = -{ - STRING(NAME( )), - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_VIDEODRV, /* needs the video driver ABI */ - ABI_VIDEODRV_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} -}; - -_X_EXPORT XF86ModuleData NAME(ModuleData) = { - &NAME(VersRec), - NAME(Setup), - NULL -}; - -static pointer -NAME(Setup)(pointer module, pointer opts, int *errmaj, int *errmin) -{ - static Bool setupDone = FALSE; - - if (!setupDone) { - setupDone = TRUE; - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - } - /* - * The return value must be non-NULL on success even though there - * is no TearDownProc. - */ - return (pointer)1; -} +/*
+ * XFree86 int10 module
+ * execute BIOS int 10h calls in x86 real mode environment
+ * Copyright 1999 Egbert Eich
+ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include "xf86str.h"
+#include "xf86Pci.h"
+#include "xf86int10.h"
+
+#ifndef MOD_NAME
+# define MOD_NAME int10
+#endif
+
+#define stringify(x) #x
+#define STRING(x) stringify(x)
+#define concat(x,y) x ## y
+#define combine(a,b) concat(a,b)
+#define NAME(x) combine(MOD_NAME,x)
+
+static XF86ModuleVersionInfo NAME(VersRec) =
+{
+ STRING(NAME( )),
+ MODULEVENDORSTRING,
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+ XORG_VERSION_CURRENT,
+ 1, 0, 0,
+ ABI_CLASS_VIDEODRV, /* needs the video driver ABI */
+ ABI_VIDEODRV_VERSION,
+ MOD_CLASS_NONE,
+ {0,0,0,0}
+};
+
+_X_EXPORT XF86ModuleData NAME(ModuleData) = {
+ &NAME(VersRec),
+ NULL,
+ NULL
+};
|