summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hw/kdrive/chips/chipsstub.c7
-rw-r--r--hw/kdrive/fbdev/fbinit.c6
-rw-r--r--hw/kdrive/i810/i810stub.c6
-rw-r--r--hw/kdrive/igs/igsstub.c6
-rw-r--r--hw/kdrive/ipaq/ipaq.c6
-rw-r--r--hw/kdrive/itsy/itsy.c6
-rw-r--r--hw/kdrive/mach64/mach64stub.c7
-rw-r--r--hw/kdrive/mga/mgastub.c7
-rw-r--r--hw/kdrive/nvidia/nvidiastub.c7
-rw-r--r--hw/kdrive/pcmcia/pcmciastub.c6
-rw-r--r--hw/kdrive/r128/r128stub.c7
-rw-r--r--hw/kdrive/savage/s3stub.c10
-rw-r--r--hw/kdrive/sis530/sisstub.c6
-rw-r--r--hw/kdrive/smi/smi.h2
-rw-r--r--hw/kdrive/smi/smistub.c7
-rw-r--r--hw/kdrive/src/kdrive.c43
-rw-r--r--hw/kdrive/src/kdrive.h3
-rw-r--r--hw/kdrive/trident/tridentstub.c14
-rw-r--r--hw/kdrive/trio/s3stub.c6
-rw-r--r--hw/kdrive/ts300/ts300.c6
-rw-r--r--hw/kdrive/vesa/Xvesa.man4
-rw-r--r--hw/kdrive/vesa/vesa.c17
-rw-r--r--hw/kdrive/vesa/vesa.h3
-rw-r--r--hw/kdrive/vesa/vesainit.c7
24 files changed, 179 insertions, 20 deletions
diff --git a/hw/kdrive/chips/chipsstub.c b/hw/kdrive/chips/chipsstub.c
index e46df972e..00a48a48f 100644
--- a/hw/kdrive/chips/chipsstub.c
+++ b/hw/kdrive/chips/chipsstub.c
@@ -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)
{
diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c
index 533aa9bf8..097f77fe6 100644
--- a/hw/kdrive/fbdev/fbinit.c
+++ b/hw/kdrive/fbdev/fbinit.c
@@ -51,6 +51,12 @@ InitInput (int argc, char **argv)
#endif
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c
index fc028288b..120e31c84 100644
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@@ -73,6 +73,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/igs/igsstub.c b/hw/kdrive/igs/igsstub.c
index 832c9df23..00dd450f8 100644
--- a/hw/kdrive/igs/igsstub.c
+++ b/hw/kdrive/igs/igsstub.c
@@ -59,6 +59,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg ();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/ipaq/ipaq.c b/hw/kdrive/ipaq/ipaq.c
index fcdfefd82..0a2a37caa 100644
--- a/hw/kdrive/ipaq/ipaq.c
+++ b/hw/kdrive/ipaq/ipaq.c
@@ -58,6 +58,12 @@ InitInput (int argc, char **argv)
extern pcmciaDisplayModeRec pcmciaDefaultModes[];
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/itsy/itsy.c b/hw/kdrive/itsy/itsy.c
index ef8ca6dad..4f2ac1cbb 100644
--- a/hw/kdrive/itsy/itsy.c
+++ b/hw/kdrive/itsy/itsy.c
@@ -314,6 +314,12 @@ OsVendorInit (void)
KdOsInit (&ItsyOsFuncs);
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/mach64/mach64stub.c b/hw/kdrive/mach64/mach64stub.c
index 29ebb1bc1..03d47608d 100644
--- a/hw/kdrive/mach64/mach64stub.c
+++ b/hw/kdrive/mach64/mach64stub.c
@@ -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)
{
diff --git a/hw/kdrive/mga/mgastub.c b/hw/kdrive/mga/mgastub.c
index 45f6f5792..56b9d7149 100644
--- a/hw/kdrive/mga/mgastub.c
+++ b/hw/kdrive/mga/mgastub.c
@@ -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)
{
diff --git a/hw/kdrive/nvidia/nvidiastub.c b/hw/kdrive/nvidia/nvidiastub.c
index 285a73844..57ba3bd9b 100644
--- a/hw/kdrive/nvidia/nvidiastub.c
+++ b/hw/kdrive/nvidia/nvidiastub.c
@@ -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)
{
diff --git a/hw/kdrive/pcmcia/pcmciastub.c b/hw/kdrive/pcmcia/pcmciastub.c
index 8759f4a08..b2145eab5 100644
--- a/hw/kdrive/pcmcia/pcmciastub.c
+++ b/hw/kdrive/pcmcia/pcmciastub.c
@@ -50,6 +50,12 @@ InitInput (int argc, char **argv)
extern pcmciaDisplayModeRec pcmciaDefaultModes[];
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/r128/r128stub.c b/hw/kdrive/r128/r128stub.c
index 30dc32c66..8608d3f10 100644
--- a/hw/kdrive/r128/r128stub.c
+++ b/hw/kdrive/r128/r128stub.c
@@ -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)
{
diff --git a/hw/kdrive/savage/s3stub.c b/hw/kdrive/savage/s3stub.c
index d5c55d598..a678d9ec5 100644
--- a/hw/kdrive/savage/s3stub.c
+++ b/hw/kdrive/savage/s3stub.c
@@ -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)
{
diff --git a/hw/kdrive/sis530/sisstub.c b/hw/kdrive/sis530/sisstub.c
index f1f242b40..8d0f8d002 100644
--- a/hw/kdrive/sis530/sisstub.c
+++ b/hw/kdrive/sis530/sisstub.c
@@ -56,6 +56,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/smi/smi.h b/hw/kdrive/smi/smi.h
index abee819bf..d4733213f 100644
--- a/hw/kdrive/smi/smi.h
+++ b/hw/kdrive/smi/smi.h
@@ -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
diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c
index fb4e1bad7..82286e1f6 100644
--- a/hw/kdrive/smi/smistub.c
+++ b/hw/kdrive/smi/smistub.c
@@ -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)
{
diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index a6065f6f4..0c1e1bac9 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -354,26 +354,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 ()
{
AbortDDX ();
@@ -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)
{
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 0fb991ec6..77b675912 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -578,6 +578,9 @@ KdParseMouse (char *arg);
void
KdParseRgba (char *rgba);
+void
+KdUseMsg (void);
+
int
KdProcessArgument (int argc, char **argv, int i);
diff --git a/hw/kdrive/trident/tridentstub.c b/hw/kdrive/trident/tridentstub.c
index 1e9761141..0dd15f1b5 100644
--- a/hw/kdrive/trident/tridentstub.c
+++ b/hw/kdrive/trident/tridentstub.c
@@ -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)
{
diff --git a/hw/kdrive/trio/s3stub.c b/hw/kdrive/trio/s3stub.c
index 80d8fd56a..fe76d4066 100644
--- a/hw/kdrive/trio/s3stub.c
+++ b/hw/kdrive/trio/s3stub.c
@@ -55,6 +55,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/ts300/ts300.c b/hw/kdrive/ts300/ts300.c
index bd239d9fa..00f80e87a 100644
--- a/hw/kdrive/ts300/ts300.c
+++ b/hw/kdrive/ts300/ts300.c
@@ -126,6 +126,12 @@ InitInput (int argc, char **argv)
KdInitInput (&LinuxMouseFuncs, &LinuxKeyboardFuncs);
}
+void
+ddxUseMsg (void)
+{
+ KdUseMsg();
+}
+
int
ddxProcessArgument (int argc, char **argv, int i)
{
diff --git a/hw/kdrive/vesa/Xvesa.man b/hw/kdrive/vesa/Xvesa.man
index fdac902ca..137531c1b 100644
--- a/hw/kdrive/vesa/Xvesa.man
+++ b/hw/kdrive/vesa/Xvesa.man
@@ -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
diff --git a/hw/kdrive/vesa/vesa.c b/hw/kdrive/vesa/vesa.c
index 74bfb857e..5e6f5d470 100644
--- a/hw/kdrive/vesa/vesa.c
+++ b/hw/kdrive/vesa/vesa.c
@@ -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)
{
diff --git a/hw/kdrive/vesa/vesa.h b/hw/kdrive/vesa/vesa.h
index 4cad3ac2a..e447427c6 100644
--- a/hw/kdrive/vesa/vesa.h
+++ b/hw/kdrive/vesa/vesa.h
@@ -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);
diff --git a/hw/kdrive/vesa/vesainit.c b/hw/kdrive/vesa/vesainit.c
index 45092add0..09bc4a1fc 100644
--- a/hw/kdrive/vesa/vesainit.c
+++ b/hw/kdrive/vesa/vesainit.c
@@ -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)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 15:36:08 +0000