mirror of https://github.com/xemu-project/xemu.git
Fix patch splitting lossage in vga.c
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2976 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
ece096bbdc
commit
a2502b58b3
8
hw/vga.c
8
hw/vga.c
|
@ -819,6 +819,14 @@ typedef void vga_draw_line_func(VGAState *s1, uint8_t *d,
|
||||||
#define DEPTH 15
|
#define DEPTH 15
|
||||||
#include "vga_template.h"
|
#include "vga_template.h"
|
||||||
|
|
||||||
|
#define BGR_FORMAT
|
||||||
|
#define DEPTH 15
|
||||||
|
#include "vga_template.h"
|
||||||
|
|
||||||
|
#define DEPTH 16
|
||||||
|
#include "vga_template.h"
|
||||||
|
|
||||||
|
#define BGR_FORMAT
|
||||||
#define DEPTH 16
|
#define DEPTH 16
|
||||||
#include "vga_template.h"
|
#include "vga_template.h"
|
||||||
|
|
||||||
|
|
|
@ -1629,7 +1629,7 @@ More information is available at
|
||||||
@section Sparc32 System emulator invocation
|
@section Sparc32 System emulator invocation
|
||||||
|
|
||||||
Use the executable @file{qemu-system-sparc} to simulate a SparcStation 5
|
Use the executable @file{qemu-system-sparc} to simulate a SparcStation 5
|
||||||
(sun4m architecture). The emulation is somewhat complete.
|
or SparcStation 10 (sun4m architecture). The emulation is somewhat complete.
|
||||||
|
|
||||||
QEMU emulates the following sun4m peripherals:
|
QEMU emulates the following sun4m peripherals:
|
||||||
|
|
||||||
|
@ -1649,6 +1649,8 @@ and power/reset logic
|
||||||
ESP SCSI controller with hard disk and CD-ROM support
|
ESP SCSI controller with hard disk and CD-ROM support
|
||||||
@item
|
@item
|
||||||
Floppy drive
|
Floppy drive
|
||||||
|
@item
|
||||||
|
CS4231 sound device (only on SS-5, not working yet)
|
||||||
@end itemize
|
@end itemize
|
||||||
|
|
||||||
The number of peripherals is fixed in the architecture.
|
The number of peripherals is fixed in the architecture.
|
||||||
|
@ -1664,13 +1666,14 @@ Solaris kernels don't work.
|
||||||
|
|
||||||
@c man begin OPTIONS
|
@c man begin OPTIONS
|
||||||
|
|
||||||
The following options are specific to the Sparc emulation:
|
The following options are specific to the Sparc32 emulation:
|
||||||
|
|
||||||
@table @option
|
@table @option
|
||||||
|
|
||||||
@item -g WxH
|
@item -g WxHx[xDEPTH]
|
||||||
|
|
||||||
Set the initial TCX graphic mode. The default is 1024x768.
|
Set the initial TCX graphic mode. The default is 1024x768x8, currently
|
||||||
|
the only other possible mode is 1024x768x24.
|
||||||
|
|
||||||
@item -prom-env string
|
@item -prom-env string
|
||||||
|
|
||||||
|
@ -1681,6 +1684,10 @@ qemu-system-sparc -prom-env 'auto-boot?=false' \
|
||||||
-prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single'
|
-prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single'
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
|
@item -M [SS-5|SS-10]
|
||||||
|
|
||||||
|
Set the emulated machine type. Default is SS-5.
|
||||||
|
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
@c man end
|
@c man end
|
||||||
|
|
Loading…
Reference in New Issue