Since ddc, i2c, and ramdac are in core now, remove their ModuleData stubs.
This commit is contained in:
Adam Jackson
parent
e88fa75c9b
commit
2e3cc861f9
|
|
@ -15,52 +15,6 @@
|
||||||
|
|
||||||
static const OptionInfoRec *DDCAvailableOptions(void *unused);
|
static const OptionInfoRec *DDCAvailableOptions(void *unused);
|
||||||
|
|
||||||
#if DDC_MODULE
|
|
||||||
|
|
||||||
static MODULESETUPPROTO(ddcSetup);
|
|
||||||
|
|
||||||
static XF86ModuleVersionInfo ddcVersRec =
|
|
||||||
{
|
|
||||||
"ddc",
|
|
||||||
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 ddcModuleData = { &ddcVersRec, ddcSetup, NULL };
|
|
||||||
|
|
||||||
ModuleInfoRec DDC = {
|
|
||||||
1,
|
|
||||||
"DDC",
|
|
||||||
NULL,
|
|
||||||
0,
|
|
||||||
DDCAvailableOptions,
|
|
||||||
};
|
|
||||||
|
|
||||||
static pointer
|
|
||||||
ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
|
||||||
{
|
|
||||||
static Bool setupDone = FALSE;
|
|
||||||
|
|
||||||
if (!setupDone) {
|
|
||||||
setupDone = TRUE;
|
|
||||||
xf86AddModuleInfo(&DDC, module);
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
* The return value must be non-NULL on success even though there
|
|
||||||
* is no TearDownProc.
|
|
||||||
*/
|
|
||||||
return (pointer)1;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define RETRIES 4
|
#define RETRIES 4
|
||||||
|
|
||||||
static unsigned char *EDIDRead_DDC1(
|
static unsigned char *EDIDRead_DDC1(
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
/* (c) Itai Nahshon
|
|
||||||
*
|
|
||||||
* This code is derived from and inspired by the I2C driver
|
|
||||||
* from the Linux kernel.
|
|
||||||
* (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
|
||||||
#include <xorg-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "xf86Module.h"
|
|
||||||
|
|
||||||
static MODULESETUPPROTO(i2cSetup);
|
|
||||||
|
|
||||||
static XF86ModuleVersionInfo i2cVersRec =
|
|
||||||
{
|
|
||||||
"i2c",
|
|
||||||
MODULEVENDORSTRING,
|
|
||||||
MODINFOSTRING1,
|
|
||||||
MODINFOSTRING2,
|
|
||||||
XORG_VERSION_CURRENT,
|
|
||||||
1, 2, 0,
|
|
||||||
ABI_CLASS_VIDEODRV, /* This needs the video driver ABI */
|
|
||||||
ABI_VIDEODRV_VERSION,
|
|
||||||
MOD_CLASS_NONE,
|
|
||||||
{0,0,0,0}
|
|
||||||
};
|
|
||||||
|
|
||||||
_X_EXPORT XF86ModuleData i2cModuleData = { &i2cVersRec, i2cSetup, NULL };
|
|
||||||
|
|
||||||
static pointer
|
|
||||||
i2cSetup(pointer module, pointer opts, int *errmaj, int *errmin) {
|
|
||||||
/* ErrorF("i2cSetup\n"); */
|
|
||||||
return (pointer)1;
|
|
||||||
}
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright 1998 by Alan Hourihane, Wigan, England.
|
|
||||||
*
|
|
||||||
* 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 Alan Hourihane not be used in
|
|
||||||
* advertising or publicity pertaining to distribution of the software without
|
|
||||||
* specific, written prior permission. Alan Hourihane makes no representations
|
|
||||||
* about the suitability of this software for any purpose. It is provided
|
|
||||||
* "as is" without express or implied warranty.
|
|
||||||
*
|
|
||||||
* ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
||||||
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
||||||
* EVENT SHALL ALAN HOURIHANE 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.
|
|
||||||
*
|
|
||||||
* Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk>
|
|
||||||
*
|
|
||||||
* Generic RAMDAC module.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
|
||||||
#include <xorg-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "xf86Module.h"
|
|
||||||
|
|
||||||
static XF86ModuleVersionInfo VersRec = {
|
|
||||||
"ramdac",
|
|
||||||
MODULEVENDORSTRING,
|
|
||||||
MODINFOSTRING1,
|
|
||||||
MODINFOSTRING2,
|
|
||||||
XORG_VERSION_CURRENT,
|
|
||||||
0, 1, 0,
|
|
||||||
ABI_CLASS_VIDEODRV,
|
|
||||||
ABI_VIDEODRV_VERSION,
|
|
||||||
MOD_CLASS_NONE,
|
|
||||||
{0, 0, 0, 0}
|
|
||||||
};
|
|
||||||
|
|
||||||
_X_EXPORT XF86ModuleData ramdacModuleData = { &VersRec, NULL, NULL };
|
|
||||||
Loading…
Reference in New Issue