diff options
author | Keith Packard <keithp@guitar.keithp.com> | 2007-02-16 02:17:11 -0800 |
---|---|---|
committer | Keith Packard <keithp@guitar.keithp.com> | 2007-02-16 02:17:11 -0800 |
commit | 0ab6c03c179cea58266f5fefc69931de395fcb24 (patch) | |
tree | f2a799ae1456700124043b908d1c64285c56c349 /hw/xfree86 | |
parent | 3d5e2bc5a622d09ba98c50df1018586dcba5c3df (diff) |
Ensure drivers can use new modes header files.
New modes header files required a few minor changes to be used by external
drivers, the most notable of which is the publication of the config file
parser header files.
Diffstat (limited to 'hw/xfree86')
-rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 3 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86Crtc.h | 1 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86DiDGA.c | 2 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86Modes.c | 5 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86Modes.h | 14 | ||||
-rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 7 | ||||
-rw-r--r-- | hw/xfree86/parser/Makefile.am | 4 |
7 files changed, 21 insertions, 15 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 74e4c76c7..37a3025d1 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -41,6 +41,9 @@ #define DPMS_SERVER #include "X11/extensions/dpms.h" #include "X11/Xatom.h" +#ifdef RENDER +#include "picturestr.h" +#endif /* * Initialize xf86CrtcConfig structure diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h index 9a70be4b9..756730e7b 100644 --- a/hw/xfree86/modes/xf86Crtc.h +++ b/hw/xfree86/modes/xf86Crtc.h @@ -28,7 +28,6 @@ #include "xf86Rename.h" #endif #include "xf86Modes.h" -#include "xf86Parser.h" #include "damage.h" /* Compat definitions for older X Servers. */ diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index 551f052c9..0964cefa7 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -35,6 +35,8 @@ #include "xf86Crtc.h" #include "xf86Modes.h" #include "gcstruct.h" +#include "scrnintstr.h" +#include "windowstr.h" static Bool xf86_dga_get_modes (ScreenPtr pScreen) diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index 37d0eb656..5b52bd76c 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -36,11 +36,6 @@ #endif #endif -#include <stddef.h> -#include <string.h> -#include <stdio.h> - -#include "xf86.h" #include "xf86Modes.h" #include "xf86Priv.h" diff --git a/hw/xfree86/modes/xf86Modes.h b/hw/xfree86/modes/xf86Modes.h index 94943339e..2bd4edeba 100644 --- a/hw/xfree86/modes/xf86Modes.h +++ b/hw/xfree86/modes/xf86Modes.h @@ -25,11 +25,17 @@ * */ -#ifndef _I830_XF86MODES_H_ -#define _I830_XF86MODES_H_ +#ifndef _XF86MODES_H_ +#define _XF86MODES_H_ + +#include <stddef.h> +#include <string.h> +#include <stdio.h> + +#include "xf86.h" #include "xorgVersion.h" -#include "xf86Parser.h" #include "edid.h" +#include "xf86Parser.h" #if XF86_MODES_RENAME #include "xf86Rename.h" #endif @@ -89,4 +95,4 @@ xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor); DisplayModePtr xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed); -#endif /* _I830_XF86MODES_H_ */ +#endif /* _XF86MODES_H_ */ diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index c8ea7785d..abdf92e78 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -496,19 +496,18 @@ void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations) { XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); +#if RANDR_12_INTERFACE ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); int c; + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - randrp->supported_rotations = rotations; - -#if RANDR_12_INTERFACE for (c = 0; c < config->num_crtc; c++) { xf86CrtcPtr crtc = config->crtc[c]; RRCrtcSetRotations (crtc->randr_crtc, rotations); } #endif + randrp->supported_rotations = rotations; } void diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am index 46ef79060..d9c4f4b5e 100644 --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am @@ -37,4 +37,6 @@ EXTRA_DIST = \ cpconfig.c sdk_HEADERS = \ - $(LIBHEADERS) + $(LIBHEADERS) \ + xf86Parser.h \ + xf86Optrec.h |