Commit a2502b58b3e5aaff036e15d31f2bac72d21648db
1 parent
ece096bb
Fix patch splitting lossage in vga.c
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2976 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
19 additions
and
4 deletions
hw/vga.c
| @@ -819,6 +819,14 @@ typedef void vga_draw_line_func(VGAState *s1, uint8_t *d, | @@ -819,6 +819,14 @@ typedef void vga_draw_line_func(VGAState *s1, uint8_t *d, | ||
| 819 | #define DEPTH 15 | 819 | #define DEPTH 15 |
| 820 | #include "vga_template.h" | 820 | #include "vga_template.h" |
| 821 | 821 | ||
| 822 | +#define BGR_FORMAT | ||
| 823 | +#define DEPTH 15 | ||
| 824 | +#include "vga_template.h" | ||
| 825 | + | ||
| 826 | +#define DEPTH 16 | ||
| 827 | +#include "vga_template.h" | ||
| 828 | + | ||
| 829 | +#define BGR_FORMAT | ||
| 822 | #define DEPTH 16 | 830 | #define DEPTH 16 |
| 823 | #include "vga_template.h" | 831 | #include "vga_template.h" |
| 824 | 832 |
qemu-doc.texi
| @@ -1629,7 +1629,7 @@ More information is available at | @@ -1629,7 +1629,7 @@ More information is available at | ||
| 1629 | @section Sparc32 System emulator invocation | 1629 | @section Sparc32 System emulator invocation |
| 1630 | 1630 | ||
| 1631 | Use the executable @file{qemu-system-sparc} to simulate a SparcStation 5 | 1631 | Use the executable @file{qemu-system-sparc} to simulate a SparcStation 5 |
| 1632 | -(sun4m architecture). The emulation is somewhat complete. | 1632 | +or SparcStation 10 (sun4m architecture). The emulation is somewhat complete. |
| 1633 | 1633 | ||
| 1634 | QEMU emulates the following sun4m peripherals: | 1634 | QEMU emulates the following sun4m peripherals: |
| 1635 | 1635 | ||
| @@ -1649,6 +1649,8 @@ and power/reset logic | @@ -1649,6 +1649,8 @@ and power/reset logic | ||
| 1649 | ESP SCSI controller with hard disk and CD-ROM support | 1649 | ESP SCSI controller with hard disk and CD-ROM support |
| 1650 | @item | 1650 | @item |
| 1651 | Floppy drive | 1651 | Floppy drive |
| 1652 | +@item | ||
| 1653 | +CS4231 sound device (only on SS-5, not working yet) | ||
| 1652 | @end itemize | 1654 | @end itemize |
| 1653 | 1655 | ||
| 1654 | The number of peripherals is fixed in the architecture. | 1656 | The number of peripherals is fixed in the architecture. |
| @@ -1664,13 +1666,14 @@ Solaris kernels don't work. | @@ -1664,13 +1666,14 @@ Solaris kernels don't work. | ||
| 1664 | 1666 | ||
| 1665 | @c man begin OPTIONS | 1667 | @c man begin OPTIONS |
| 1666 | 1668 | ||
| 1667 | -The following options are specific to the Sparc emulation: | 1669 | +The following options are specific to the Sparc32 emulation: |
| 1668 | 1670 | ||
| 1669 | @table @option | 1671 | @table @option |
| 1670 | 1672 | ||
| 1671 | -@item -g WxH | 1673 | +@item -g WxHx[xDEPTH] |
| 1672 | 1674 | ||
| 1673 | -Set the initial TCX graphic mode. The default is 1024x768. | 1675 | +Set the initial TCX graphic mode. The default is 1024x768x8, currently |
| 1676 | +the only other possible mode is 1024x768x24. | ||
| 1674 | 1677 | ||
| 1675 | @item -prom-env string | 1678 | @item -prom-env string |
| 1676 | 1679 | ||
| @@ -1681,6 +1684,10 @@ qemu-system-sparc -prom-env 'auto-boot?=false' \ | @@ -1681,6 +1684,10 @@ qemu-system-sparc -prom-env 'auto-boot?=false' \ | ||
| 1681 | -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' | 1684 | -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' |
| 1682 | @end example | 1685 | @end example |
| 1683 | 1686 | ||
| 1687 | +@item -M [SS-5|SS-10] | ||
| 1688 | + | ||
| 1689 | +Set the emulated machine type. Default is SS-5. | ||
| 1690 | + | ||
| 1684 | @end table | 1691 | @end table |
| 1685 | 1692 | ||
| 1686 | @c man end | 1693 | @c man end |