From 5afcf079433d88ecbe8534671df68a92cf46c4cd Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 22 Nov 2009 23:00:43 +0000 Subject: Get rid of the now unused remaining moduleInfoRec bits. --- src/ws.c | 23 ----------------------- 1 file changed, 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 #include -#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) { -- cgit v1.2.3