Commit 457fc776 authored by Keith Packard's avatar Keith Packard
Browse files

Merge remote-tracking branch 'alanc/master'

parents 2e237c83 5a3a98fc
......@@ -619,8 +619,9 @@ xf86SbusUseBuiltinMode(ScrnInfoPtr pScrn, sbusDevicePtr psdp)
pScrn->virtualY = psdp->height;
}
static sbusPaletteKeyIndex;
static DevPrivateKey sbusPaletteKey = &sbusPaletteKeyIndex;
static DevPrivateKeyRec sbusPaletteKeyRec;
#define sbusPaletteKey (&sbusPaletteKeyRec)
typedef struct _sbusCmap {
sbusDevicePtr psdp;
CloseScreenProcPtr CloseScreen;
......@@ -692,6 +693,9 @@ xf86SbusHandleColormaps(ScreenPtr pScreen, sbusDevicePtr psdp)
struct fbcmap fbcmap;
unsigned char data[2];
if (!dixRegisterPrivateKey(sbusPaletteKey, PRIVATE_SCREEN, 0))
FatalError("Cannot register sbus private key");
cmap = xnfcalloc(1, sizeof(sbusCmapRec));
dixSetPrivate(&pScreen->devPrivates, sbusPaletteKey, cmap);
cmap->psdp = psdp;
......
......@@ -664,11 +664,6 @@ Here is what <function>InitOutput()</function> does:
This is done at the start of the first server generation only.
</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>
The next set of modules loaded are those specified explicitly in the
&k.module; section of the config file.
......@@ -5994,26 +5989,6 @@ typedef struct {
</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>
</sect1>
......
......@@ -19,8 +19,8 @@ standard is printed. This modeline can be included in Xorg
.SH OPTIONS
.TP 8
.BR refresh
Provide a vertical refresh rate in kHz. The CVT standard prefers either 50.0,
60.0, 75.0 or 85.0kHz. The default is 60.0kHz.
Provide a vertical refresh rate in Hz. The CVT standard prefers either 50.0,
60.0, 75.0 or 85.0Hz. The default is 60.0Hz.
.TP 8
.BR \-v | \-\-verbose
Warn verbosely when a given mode does not completely correspond with CVT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment