diff options
| author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 20:36:20 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-15 20:36:20 -0800 |
| commit | d4eb4d065032112a38444e36f791cb468a5ca8f4 (patch) | |
| tree | 7414d13721f1009f92460f7967ea4bec3d015915 /hw/xfree86/ddc | |
| parent | 37fe4c49dc3a5faf2d3d56112b6bd78453045f6a (diff) | |
Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.
As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
Diffstat (limited to 'hw/xfree86/ddc')
| -rw-r--r-- | hw/xfree86/ddc/Makefile.am | 7 | ||||
| -rw-r--r-- | hw/xfree86/ddc/ddcProperty.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/ddc/xf86DDC.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am index a04b5e8fe..f3ac803e5 100644 --- a/hw/xfree86/ddc/Makefile.am +++ b/hw/xfree86/ddc/Makefile.am @@ -1,11 +1,10 @@ sdk_HEADERS = edid.h vdif.h xf86DDC.h -module_LTLIBRARIES = libddc.la +noinst_LIBRARIES = libddc.a -libddc_la_LDFLAGS = -avoid-version -libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ +libddc_a_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ interpret_vdif.c print_vdif.c ddcProperty.c \ - edid_modes.c + edid_modes.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 13083dd50..37efb5bd9 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -31,6 +31,7 @@ #include "property.h" #include "propertyst.h" #include "xf86DDC.h" +#include "xf86_ansic.h" #define EDID1_ATOM_NAME "XFree86_DDC_EDID1_RAWDATA" #define EDID2_ATOM_NAME "XFree86_DDC_EDID2_RAWDATA" diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index dd64bd56f..4ce585c9f 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -15,6 +15,8 @@ static const OptionInfoRec *DDCAvailableOptions(void *unused); +#if DDC_MODULE + static MODULESETUPPROTO(ddcSetup); static XF86ModuleVersionInfo ddcVersRec = @@ -57,6 +59,8 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin) return (pointer)1; } +#endif + #define RETRIES 4 static unsigned char *EDIDRead_DDC1( |