frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'alanc/master'

This commit is contained in:
Keith Packard 2012-05-22 10:32:29 -07:00
parent 2e237c838f 5a3a98fcb7
commit 457fc77691
3 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xfree86/common/xf86sbusBus.c
View File

@ -619,8 +619,9 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
pScrn->virtualY = psdp->height; pScrn->virtualY = psdp->height;
} }
static sbusPaletteKeyIndex; static DevPrivateKeyRec sbusPaletteKeyRec;
static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex; #define sbusPaletteKey (&sbusPaletteKeyRec)
typedef struct _sbusCmap { typedef struct _sbusCmap {
sbusDevicePtr psdp; sbusDevicePtr psdp;
CloseScreenProcPtr CloseScreen; CloseScreenProcPtr CloseScreen;
@ -692,6 +693,9 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
struct fbcmap fbcmap; struct fbcmap fbcmap;
unsigned char data[2]; unsigned char data[2];
if (!dixRegisterPrivateKey(sbusPaletteKey, PRIVATE_SCREEN, 0))
FatalError("Cannot register sbus private key");
cmap = xnfcalloc(1, sizeof(sbusCmapRec)); cmap = xnfcalloc(1, sizeof(sbusCmapRec));
dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap); dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
cmap->psdp = psdp; cmap->psdp = psdp;

25
hw/xfree86/doc/ddxDesign.xml
View File

@ -664,11 +664,6 @@ Here is what <function>InitOutput()</function> does:
This is done at the start of the first server generation only. This is done at the start of the first server generation only.
</para> </para>
<para>
The core server contains a list of mandatory modules. These are loaded
first. Currently the only module on this list is the bitmap font module.
</para>
<para> <para>
The next set of modules loaded are those specified explicitly in the The next set of modules loaded are those specified explicitly in the
&k.module; section of the config file. &k.module; section of the config file.
@ -5994,26 +5989,6 @@ typedef struct {
</blockquote></para></blockquote> </blockquote></para></blockquote>
<blockquote><para>
<programlisting>
void LoadFont(FontModule *font);
</programlisting>
<blockquote><para>
This registers the entry points for the font rasteriser module
identified by <parameter>font</parameter>. The <structname>FontModule</structname>
struct is defined as:
<programlisting>
typedef struct {
InitFont initFunc;
char * name;
pointer module;
} FontModule;
</programlisting>
</para>
</blockquote></para></blockquote>
</sect2> </sect2>
</sect1> </sect1>

4
hw/xfree86/utils/man/cvt.man
View File

@ -19,8 +19,8 @@ standard is printed. This modeline can be included in Xorg
.SH OPTIONS .SH OPTIONS
.TP 8 .TP 8
.BR refresh .BR refresh
Provide a vertical refresh rate in kHz. The CVT standard prefers either 50.0, Provide a vertical refresh rate in Hz. The CVT standard prefers either 50.0,
60.0, 75.0 or 85.0kHz. The default is 60.0kHz. 60.0, 75.0 or 85.0Hz. The default is 60.0Hz.
.TP 8 .TP 8
.BR \-v | \-\-verbose .BR \-v | \-\-verbose
Warn verbosely when a given mode does not completely correspond with CVT Warn verbosely when a given mode does not completely correspond with CVT