Commit f333581b authored by Seth W. Klein Klein's avatar Seth W. Klein Klein

Added infrastructure for driver specific usage messages and added vesa

    usage message.
parent 003e8771
......@@ -51,6 +51,13 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
vesaUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -51,6 +51,12 @@ InitInput (int argc, char **argv)
#endif
}
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -73,6 +73,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -59,6 +59,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg ();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -58,6 +58,12 @@ InitInput (int argc, char **argv)
extern pcmciaDisplayModeRec pcmciaDefaultModes[];
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -314,6 +314,12 @@ OsVendorInit (void)
KdOsInit (&ItsyOsFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -55,6 +55,13 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
vesaUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -48,6 +48,13 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
vesaUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -48,6 +48,13 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
vesaUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -50,6 +50,12 @@ InitInput (int argc, char **argv)
extern pcmciaDisplayModeRec pcmciaDefaultModes[];
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -51,6 +51,13 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
vesaUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -71,6 +71,16 @@ InitInput (int argc, char **argv)
extern int s3CpuTimeout;
extern int s3AccelTimeout;
void
ddxUseMsg (void)
{
ErrorF("\nSavage Driver Options:\n");
ErrorF("-cpu Sets CPU timout\n");
ErrorF("-accel Sets acceleration timout\n");
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -56,6 +56,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -47,6 +47,7 @@
#define subDisable vesaDisable
#define SubCardPrivRec VesaCardPrivRec
#define SubScreenPrivRec VesaScreenPrivRec
#define subUseMsg() vesaUseMsg()
#define subProcessArgument(c,v,i) vesaProcessArgument(c,v,i)
#else
#include <fbdev.h>
......@@ -67,6 +68,7 @@
#define subDisable fbdevDisable
#define SubCardPrivRec FbdevPriv
#define SubScreenPrivRec FbdevScrPriv
#define subUseMsg()
#define subProcessArgument(c,v,i) 0
#endif
......
......@@ -51,6 +51,13 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
subUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -353,26 +353,6 @@ AbortDDX(void)
}
}
void
ddxUseMsg()
{
ErrorF("\nTinyX Device Dependent Usage:\n");
ErrorF("-card pcmcia Use PCMCIA card as additional screen\n");
ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP{,DEPTH/BPP}[xFREQ]] Specify screen characteristics\n");
ErrorF("-zaphod Disable cursor screen switching\n");
ErrorF("-2button Emulate 3 button mouse\n");
ErrorF("-3button Disable 3 button mouse emulation\n");
ErrorF("-rawcoord Don't transform pointer coordinates on rotation\n");
ErrorF("-dumb Disable hardware acceleration\n");
ErrorF("-softCursor Force software cursor\n");
ErrorF("-videoTest Start the server, pause momentarily and exit\n");
ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
ErrorF("-switchCmd Command to execute on vt switch\n");
ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
ErrorF("\n");
}
void
ddxGiveUp ()
{
......@@ -671,6 +651,29 @@ KdParseRgba (char *rgba)
kdSubpixelOrder = SubPixelUnknown;
}
void
KdUseMsg (void)
{
ErrorF("\nTinyX Device Dependent Usage:\n");
ErrorF("-card pcmcia Use PCMCIA card as additional screen\n");
ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP{,DEPTH/BPP}[xFREQ]] Specify screen characteristics\n");
ErrorF("-zaphod Disable cursor screen switching\n");
ErrorF("-2button Emulate 3 button mouse\n");
ErrorF("-3button Disable 3 button mouse emulation\n");
ErrorF("-rawcoord Don't transform pointer coordinates on rotation\n");
ErrorF("-dumb Disable hardware acceleration\n");
ErrorF("-softCursor Force software cursor\n");
ErrorF("-videoTest Start the server, pause momentarily and exit\n");
ErrorF("-origin X,Y Locates the next screen in the the virtual screen (Xinerama)\n");
ErrorF("-mouse path[,n] Filename of mouse device, n is number of buttons\n");
ErrorF("-switchCmd Command to execute on vt switch\n");
ErrorF("vtxx Use virtual terminal xx instead of the next available\n");
/* XXX: what does -rgba do? */
#ifdef PSEUDO8
p8UseMsg ();
#endif
}
int
KdProcessArgument (int argc, char **argv, int i)
{
......
......@@ -578,6 +578,9 @@ KdParseMouse (char *arg);
void
KdParseRgba (char *rgba);
void
KdUseMsg (void);
int
KdProcessArgument (int argc, char **argv, int i);
......
......@@ -52,6 +52,20 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
#if 0
ErrorF("\nTrident Driver Options:\n");
ErrorF("-clk XXX: what's this?\n");
ErrorF("-mclk XXX: what's this?\n");
#endif
KdUseMsg();
#ifdef VESA
vesaUseMsg()
#endif
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -55,6 +55,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -126,6 +126,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
......@@ -67,6 +67,10 @@ violation with some rare BIOSes that violate the VESA specification,
but may cause slightly higher memory usage on systems that overcommit
memory.
.TP 8
.B -force-text
ignore saved video mode and switch back to regular 25x80 text mode
on server exit or VT switch.
.TP 8
.B -verbose
emit diagnostic messages during BIOS initialization and teardown.
.SH KEYBOARD
......
......@@ -1734,6 +1734,23 @@ vesaGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs)
}
}
void
vesaUseMsg (void)
{
ErrorF("\nTinyX VESA Usage:\n");
ErrorF("-mode VESA video mode to use (Be careful!)\n");
ErrorF("-listmodes List supported video modes\n");
ErrorF("-force Attempt even unsupported modes\n");
ErrorF("-shadow Always use shadow framebuffer (May increase performance)\n");
ErrorF("-nolinear Never use linear framebuffer (Not useful)\n");
ErrorF("-swaprgb Use if colors are wrong in PseudoColor and 16 color modes\n");
ErrorF("-map-holes Use contiguous memory map (For seg fault with rare BIOS)\n");
ErrorF("-verbose Emit diagnostic messages during BIOS initialization\n");
ErrorF("-force-text Always use standard 25x80 text mode on server exit or VT switch\n");
/* XXX: usage for -vesatest, -no-map-holes (don't need?),
* XXX: and -trash-font. Also in man page. */
}
int
vesaProcessArgument (int argc, char **argv, int i)
{
......
......@@ -275,6 +275,9 @@ vesaPutColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
void
vesaGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs);
void
vesaUseMsg (void);
int
vesaProcessArgument (int argc, char **argv, int i);
......
......@@ -75,6 +75,13 @@ InitInput (int argc, char **argv)
KdInitInput(&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
void
ddxUseMsg (void)
{
KdUseMsg();
vesaUseMsg();
}
int
ddxProcessArgument (int argc, char **argv, int i)
{
......
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