summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@openbsd.org>2009-11-22 23:00:43 +0000
committerMatthieu Herrb <matthieu@openbsd.org>2009-11-22 23:00:43 +0000
commit5afcf079433d88ecbe8534671df68a92cf46c4cd (patch)
tree2a0171d51a3f5705c05278cbbb72f7677796d4b5
parent01366bfb5a1bb99af6559df5b5cd87b67674041e (diff)
Get rid of the now unused remaining moduleInfoRec bits.
-rw-r--r--src/ws.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/ws.c b/src/ws.c
index ca21cdb..c4411a1 100644
--- a/src/ws.c
+++ b/src/ws.c
@@ -34,8 +34,6 @@
#include <mipointer.h>
#include <extinit.h>
-#include "xf86Module.h"
-
#define NAXES 2 /* X and Y axes only */
#define NBUTTONS 32 /* max theoretical buttons */
#define DFLTBUTTONS 3 /* default number of buttons */
@@ -59,7 +57,6 @@ typedef struct WSDevice {
static MODULESETUPPROTO(SetupProc);
static void TearDownProc(pointer);
-static const OptionInfoRec *wsAvailableOptions(void *);
static InputInfoPtr wsPreInit(InputDriverPtr, IDevPtr, int);
static int wsProc(DeviceIntPtr, int);
@@ -102,20 +99,6 @@ typedef enum {
#define WS_NOZMAP 0
-static const OptionInfoRec WSOptions[] = {
- { WSOPT_DEVICE, "device", OPTV_STRING, {0}, FALSE },
- { WSOPT_DEBUG_LEVEL, "debugLevel", OPTV_INTEGER, {0}, FALSE },
- { WSOPT_MINX, "minX", OPTV_INTEGER, {0}, FALSE },
- { WSOPT_MAXX, "maxX", OPTV_INTEGER, {0}, FALSE },
- { WSOPT_MINY, "minY", OPTV_INTEGER, {0}, FALSE },
- { WSOPT_MAXY, "maxY", OPTV_INTEGER, {0}, FALSE },
- { WSOPT_ROTATE, "rotate", OPTV_STRING, {0}, FALSE },
- { WSOPT_SWAPXY, "swapxy", OPTV_BOOLEAN, {0}, FALSE },
- { WSOPT_SCREENNO, "ScreenNo", OPTV_INTEGER, {0}, FALSE },
- { WSOPT_ZAXIS_MAPPING, "ZAxisMapping", OPTV_STRING, {0}, FALSE },
- { -1, NULL, OPTV_NONE, {0}, FALSE }
-};
-
XF86ModuleData wsModuleData = {&VersionRec,
SetupProc, TearDownProc };
@@ -158,12 +141,6 @@ TearDownProc(pointer p)
DBG(1, ErrorF("WS TearDownProc called\n"));
}
-static const OptionInfoRec *
-wsAvailableOptions(void *unused)
-{
- return WSOptions;
-}
-
static InputInfoPtr
wsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
{