Get rid of the now unused remaining moduleInfoRec bits.

This commit is contained in:
matthieu 2009-11-22 23:06:24 +00:00
parent 1403cc1e0c
commit d1e2bf33ac

View File

@ -24,7 +24,7 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
/* $OpenBSD: usbtablet.c,v 1.3 2009/11/22 22:30:18 matthieu Exp $ */ /* $OpenBSD: usbtablet.c,v 1.4 2009/11/22 23:06:24 matthieu Exp $ */
/* /*
* Driver for USB HID tablet devices. * Driver for USB HID tablet devices.
@ -53,9 +53,6 @@
#include <extnsionst.h> #include <extnsionst.h>
#include <extinit.h> #include <extinit.h>
#include "xf86Module.h"
#ifdef USB_GET_REPORT_ID #ifdef USB_GET_REPORT_ID
#define USB_NEW_HID #define USB_NEW_HID
#endif #endif
@ -119,7 +116,6 @@ struct USBTDevice {
/* Function prototypes */ /* Function prototypes */
static MODULESETUPPROTO(SetupProc); static MODULESETUPPROTO(SetupProc);
static void TearDownProc(pointer); static void TearDownProc(pointer);
static const OptionInfoRec *UsbTabletAvailableOptions(void *);
static LocalDevicePtr UsbTabletAllocateStylus(InputDriverPtr); static LocalDevicePtr UsbTabletAllocateStylus(InputDriverPtr);
static LocalDevicePtr UsbTabletAllocateEraser(InputDriverPtr); static LocalDevicePtr UsbTabletAllocateEraser(InputDriverPtr);
@ -162,15 +158,6 @@ typedef enum {
USBTOPT_SUPPRESS, USBTOPT_SUPPRESS,
} USBTOpts; } USBTOpts;
static const OptionInfoRec USBTOptions[] = {
{ USBTOPT_DEVICE, "device", OPTV_STRING, {0}, FALSE },
{ USBTOPT_DEBUG_LEVEL, "debuglevel", OPTV_INTEGER, {0}, FALSE},
{ USBTOPT_HISTORY_SIZE, "historysize", OPTV_INTEGER, {0}, FALSE},
{ USBTOPT_THRESHOLD, "threshold", OPTV_INTEGER, {0}, FALSE},
{ USBTOPT_SUPPRESS, "suppress", OPTV_INTEGER, {0}, FALSE},
{ -1, NULL, OPTV_NONE, {0}, FALSE}
};
XF86ModuleData usbtabletModuleData = {&VersionRec, XF86ModuleData usbtabletModuleData = {&VersionRec,
SetupProc, TearDownProc }; SetupProc, TearDownProc };
@ -805,12 +792,6 @@ UsbTabletOpenDevice(DeviceIntPtr pUSBT)
return 1; return 1;
} }
static const OptionInfoRec *
UsbTabletAvailableOptions(void *unused)
{
return USBTOptions;
}
static InputInfoPtr static InputInfoPtr
UsbTabletAllocate(InputDriverPtr drv, char *name, int flag) UsbTabletAllocate(InputDriverPtr drv, char *name, int flag)
{ {