- introduce vbe_edid.c
to split out EDID part from bochsvga source.
Signed-off-by: Hiroshi Miura <[email protected]>
---
Makefile | 3 +-
vgasrc/bochsvga.c | 126 -------------------------------------------------
vgasrc/bochsvga.h | 2 -
vgasrc/vbe_edid.c | 136
+++++++++++++++++++++++++++++++++++++++++++++++++++++
vgasrc/vbe_edid.h | 4 ++
vgasrc/vgahw.h | 5 +-
6 files changed, 145 insertions(+), 131 deletions(-)
create mode 100644 vgasrc/vbe_edid.c
diff --git a/Makefile b/Makefile
index dfdec5c..8fb8b89 100644
--- a/Makefile
+++ b/Makefile
@@ -189,7 +189,8 @@ $(OUT)bios.bin.elf $(OUT)bios.bin: $(OUT)rom.o tools/checkrom.py
SRCVGA=src/output.c src/util.c src/pci.c \
vgasrc/vgabios.c vgasrc/vgafb.c vgasrc/vgafonts.c vgasrc/vbe.c \
vgasrc/stdvga.c vgasrc/stdvgamodes.c vgasrc/stdvgaio.c \
- vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c
+ vgasrc/clext.c vgasrc/bochsvga.c vgasrc/geodevga.c \
+ vgasrc/vbe_edid.c
CFLAGS16VGA = $(CFLAGS16INC) -Isrc
diff --git a/vgasrc/bochsvga.c b/vgasrc/bochsvga.c
index c12a859..1b0a332 100644
--- a/vgasrc/bochsvga.c
+++ b/vgasrc/bochsvga.c
@@ -15,7 +15,6 @@
#include "stdvga.h" // VGAREG_SEQU_ADDRESS
#include "pci.h" // pci_config_readl
#include "pci_regs.h" // PCI_BASE_ADDRESS_0
-#include "vbe_edid.h"
/****************************************************************
* Mode tables
@@ -326,131 +325,6 @@ bochsvga_set_mode(struct vgamode_s *vmode_g, int flags)
return 0;
}
-int bochsvga_get_ddc_capabilities(u16 unit)
-{
- if (unit != 0)
- return -1;
-
- return (1 << 8) | VBE_DDC1_PROTOCOL_SUPPORTED;
-}
-
-u8 most_chromaticity[8] VAR16 = {0xA6,0x55,0x48,0x9B,0x26,0x12,0x50,0x54};
-unsigned char vgabios_name[] VAR16 = "Sea VGABIOS";
-struct edid_detailed_timing vbe_edid_dtd_1920x1080 VAR16 = {
- WORDBE(0x3a02), 0x80, 0x90, 0x72, 0x38, 0x26,
- 0x40, 0x78, 0xD0, 0x13, 0x00, 0x14, 0x2B, 0x21,
- 0x00, 0x00, 0x1E};
-struct edid_detailed_timing vbe_edid_dtd_1280x1024 VAR16 = {
- WORDBE(0x2a30), 0x00, 0x98, 0x51, 0x00, 0x2A,
- 0x40, 0x30, 0x70, 0x13, 0x00, 0x2C, 0xE1, 0x10,
- 0x00, 0x00, 0x1E};
-struct edid_detailed_timing vbe_edid_dtd_1152x864 VAR16 = {
- WORDBE(0x2a30), 0x80, 0xC0, 0x41, 0x60, 0x24,
- 0x30, 0x40, 0x80, 0x13, 0x00, 0x2C, 0xE1, 0x10,
- 0x00, 0x00, 0x1E};
-struct edid_detailed_timing vbe_edid_dtd_1600x1200 VAR16 = {
- WORDBE(0x3c8c), 0x40, 0x30, 0x62, 0xB0, 0x32,
- 0x40, 0x40, 0xC0, 0x13, 0x00, 0x2C, 0xE1, 0x10,
- 0x00, 0x00, 0x1E};
-
-int bochsvga_read_edid_block0(u16 unit, u16 block, u16 seg, void *data)
-{
- struct vbe_edid_info *info = data;
- int i;
-
- memset_far(seg, info, 0, sizeof(*info));
- /* header */
- SET_FARVAR(seg, info->header[0], 0);
- for (i = 1; i < 7; i++) {
- SET_FARVAR(seg, info->header[i], 0xFF);
- }
- SET_FARVAR(seg, info->header[7], 0);
- /* Vendor/Product/Serial/Date */
- SET_FARVAR(seg, info->vendor, WORDBE(0x0421));
- SET_FARVAR(seg, info->product,WORDBE(0xABCD));
- SET_FARVAR(seg, info->serial, DWORDBE(0));
- /* date/version */
- SET_FARVAR(seg, info->week,54);
- SET_FARVAR(seg, info->year,10); /* 2000 */
- SET_FARVAR(seg, info->major_version,1);
- SET_FARVAR(seg, info->minor_version,3); /* 1.3 */
- /* video prameters */
- SET_FARVAR(seg, info->video_setup,0x0F);
- /* Video signal interface (analogue, 0.700 : 0.300 : 1.000 V p-p,
- Video Setup: Blank Level = Black Level, Separate Sync H & V Signals are
- supported, Composite Sync Signal on Horizontal is supported, Composite
- Sync Signal on Green Video is supported, Serration on the Vertical Sync
- is supported) */
- SET_FARVAR(seg, info->screen_width,0x21);
- SET_FARVAR(seg, info->screen_height,0x19); /* 330 mm * 250 mm */
- SET_FARVAR(seg, info->gamma,0x78); /* 2.2 */
- SET_FARVAR(seg, info->feature_flag,0x0D); /* no DMPS states, RGB, display is continuous frequency */
- SET_FARVAR(seg, info->least_chromaticity[0],0x78);
- SET_FARVAR(seg, info->least_chromaticity[1],0xF5);
- memcpy_far(seg, info->most_chromaticity, get_global_seg(), most_chromaticity,
- sizeof (most_chromaticity));
-
- SET_FARVAR(seg, info->established_timing[0], 0xFF);
- SET_FARVAR(seg, info->established_timing[1], 0xEF);
- SET_FARVAR(seg, info->established_timing[2], 0x80);
- /* 720x400@70Hz, 720x400@88Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz,
- 800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1152x870@75Hz,
- not 1024x768@87Hz(I), 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz */
- /* standard timings */
- SET_FARVAR(seg, info->standard_timing[0], VBE_EDID_STD_640x480_85Hz);
- SET_FARVAR(seg, info->standard_timing[1], VBE_EDID_STD_800x600_85Hz);
- SET_FARVAR(seg, info->standard_timing[2], VBE_EDID_STD_1024x768_85Hz);
- SET_FARVAR(seg, info->standard_timing[3], VBE_EDID_STD_1280x720_70Hz);
- SET_FARVAR(seg, info->standard_timing[4], VBE_EDID_STD_1280x960_60Hz);
- SET_FARVAR(seg, info->standard_timing[5], VBE_EDID_STD_1440x900_60Hz);
- SET_FARVAR(seg, info->standard_timing[6], VBE_EDID_STD_1600x1200_60Hz);
- SET_FARVAR(seg, info->standard_timing[7], VBE_EDID_STD_1680x1050_60Hz);
- /* detailed timing blocks */
- memcpy_far(seg, &(info->desc[0].dtd), get_global_seg(), &vbe_edid_dtd_1152x864,
- sizeof (vbe_edid_dtd_1152x864));
- memcpy_far(seg, &(info->desc[1].dtd), get_global_seg(), &vbe_edid_dtd_1280x1024,
- sizeof (vbe_edid_dtd_1280x1024));
- /* serial */
- for (i = 0; i < 5; i++) {
- SET_FARVAR(seg, info->desc[2].mtxtd.header[i], 0);
- }
- SET_FARVAR(seg, info->desc[2].mtxtd.header[3], 0xFF);
- for (i = 0; i < 10; i++) {
- SET_FARVAR(seg, info->desc[2].mtxtd.text[i], i+0x30);
- }
- SET_FARVAR(seg, info->desc[2].mtxtd.text[10], 0x0A);
- SET_FARVAR(seg, info->desc[2].mtxtd.text[11], 0x20);
- SET_FARVAR(seg, info->desc[2].mtxtd.text[12], 0x20);
- /* monitor name */
- for (i = 0; i < 5; i++) {
- SET_FARVAR(seg, info->desc[3].mtxtd.header[i], 0);
- }
- SET_FARVAR(seg, info->desc[3].mtxtd.header[3], 0xFC);
- memcpy_far(seg, info->desc[3].mtxtd.text, get_global_seg(), vgabios_name, 12);
- SET_FARVAR(seg, info->desc[3].mtxtd.text[12], 0x0A);
- /* ext */
- SET_FARVAR(seg, info->extensions, 0);
-
- /* checksum */
- u8 sum = -checksum_far(get_global_seg(), info, sizeof(info));
- SET_FARVAR(seg, info->checksum, sum);
-
- return 0;
-}
-
-int bochsvga_read_edid(u16 unit, u16 block, u16 seg, void *data)
-{
- if (unit != 0)
- return -1;
-
- switch (block) {
- case 0:
- return bochsvga_read_edid_block0(unit, block, seg, data);
- default:
- return -1;
- }
-}
-
/****************************************************************
* Init
****************************************************************/
diff --git a/vgasrc/bochsvga.h b/vgasrc/bochsvga.h
index 20a28bd..1c98203 100644
--- a/vgasrc/bochsvga.h
+++ b/vgasrc/bochsvga.h
@@ -67,7 +67,5 @@ int bochsvga_save_state(u16 seg, void *data, int states);
int bochsvga_restore_state(u16 seg, void *data, int states);
int bochsvga_set_mode(struct vgamode_s *vmode_g, int flags);
int bochsvga_init(void);
-int bochsvga_get_ddc_capabilities(u16 unit);
-int bochsvga_read_edid(u16 unit, u16 block, u16 seg, void *data);
#endif // bochsvga.h
diff --git a/vgasrc/vbe_edid.c b/vgasrc/vbe_edid.c
new file mode 100644
index 0000000..41570fc
--- /dev/null
+++ b/vgasrc/vbe_edid.c
@@ -0,0 +1,136 @@
+// VESA VBE EDID capability for virtual display
+//
+// Copyright (C) 2012 Hiroshi Miura <[email protected]>
+//
+// This file may be distributed under the terms of the GNU LGPLv3 license.
+
+#include "vbe.h" // VBE_CAPABILITY_8BIT_DAC
+#include "util.h" // dprintf
+#include "config.h" // CONFIG_*
+#include "vbe_edid.h"
+
+int vesa_get_ddc_capabilities(u16 unit)
+{
+ if (unit != 0)
+ return -1;
+
+ return (1 << 8) | VBE_DDC1_PROTOCOL_SUPPORTED;
+}
+
+u8 most_chromaticity[8] VAR16 = {0xA6,0x55,0x48,0x9B,0x26,0x12,0x50,0x54};
+unsigned char vgabios_name[] VAR16 = "Sea VGABIOS";
+struct edid_detailed_timing vbe_edid_dtd_1920x1080 VAR16 = {
+ WORDBE(0x3a02), 0x80, 0x90, 0x72, 0x38, 0x26,
+ 0x40, 0x78, 0xD0, 0x13, 0x00, 0x14, 0x2B, 0x21,
+ 0x00, 0x00, 0x1E};
+struct edid_detailed_timing vbe_edid_dtd_1280x1024 VAR16 = {
+ WORDBE(0x2a30), 0x00, 0x98, 0x51, 0x00, 0x2A,
+ 0x40, 0x30, 0x70, 0x13, 0x00, 0x2C, 0xE1, 0x10,
+ 0x00, 0x00, 0x1E};
+struct edid_detailed_timing vbe_edid_dtd_1152x864 VAR16 = {
+ WORDBE(0x2a30), 0x80, 0xC0, 0x41, 0x60, 0x24,
+ 0x30, 0x40, 0x80, 0x13, 0x00, 0x2C, 0xE1, 0x10,
+ 0x00, 0x00, 0x1E};
+struct edid_detailed_timing vbe_edid_dtd_1600x1200 VAR16 = {
+ WORDBE(0x3c8c), 0x40, 0x30, 0x62, 0xB0, 0x32,
+ 0x40, 0x40, 0xC0, 0x13, 0x00, 0x2C, 0xE1, 0x10,
+ 0x00, 0x00, 0x1E};
+
+int vesa_read_edid_block0(u16 unit, u16 block, u16 seg, void *data, u8 next)
+{
+ struct vbe_edid_info *info = data;
+ int i;
+
+ memset_far(seg, info, 0, sizeof(*info));
+ /* header */
+ SET_FARVAR(seg, info->header[0], 0);
+ for (i = 1; i < 7; i++) {
+ SET_FARVAR(seg, info->header[i], 0xFF);
+ }
+ SET_FARVAR(seg, info->header[7], 0);
+ /* Vendor/Product/Serial/Date */
+ SET_FARVAR(seg, info->vendor, WORDBE(0x0421));
+ SET_FARVAR(seg, info->product,WORDBE(0xABCD));
+ SET_FARVAR(seg, info->serial, DWORDBE(0));
+ /* date/version */
+ SET_FARVAR(seg, info->week,54);
+ SET_FARVAR(seg, info->year,10); /* 2000 */
+ SET_FARVAR(seg, info->major_version,1);
+ SET_FARVAR(seg, info->minor_version,3); /* 1.3 */
+ /* video prameters */
+ SET_FARVAR(seg, info->video_setup,0x0F);
+ /* Video signal interface (analogue, 0.700 : 0.300 : 1.000 V p-p,
+ Video Setup: Blank Level = Black Level, Separate Sync H & V Signals are
+ supported, Composite Sync Signal on Horizontal is supported, Composite
+ Sync Signal on Green Video is supported, Serration on the Vertical Sync
+ is supported) */
+ SET_FARVAR(seg, info->screen_width,0x21);
+ SET_FARVAR(seg, info->screen_height,0x19); /* 330 mm * 250 mm */
+ SET_FARVAR(seg, info->gamma,0x78); /* 2.2 */
+ SET_FARVAR(seg, info->feature_flag,0x0D); /* no DMPS states, RGB, display is continuous frequency */
+ SET_FARVAR(seg, info->least_chromaticity[0],0x78);
+ SET_FARVAR(seg, info->least_chromaticity[1],0xF5);
+ memcpy_far(seg, info->most_chromaticity, get_global_seg(), most_chromaticity,
+ sizeof (most_chromaticity));
+
+ SET_FARVAR(seg, info->established_timing[0], 0xFF);
+ SET_FARVAR(seg, info->established_timing[1], 0xEF);
+ SET_FARVAR(seg, info->established_timing[2], 0x80);
+ /* 720x400@70Hz, 720x400@88Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz,
+ 800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1152x870@75Hz,
+ not 1024x768@87Hz(I), 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz */
+ /* standard timings */
+ SET_FARVAR(seg, info->standard_timing[0], VBE_EDID_STD_640x480_85Hz);
+ SET_FARVAR(seg, info->standard_timing[1], VBE_EDID_STD_800x600_85Hz);
+ SET_FARVAR(seg, info->standard_timing[2], VBE_EDID_STD_1024x768_85Hz);
+ SET_FARVAR(seg, info->standard_timing[3], VBE_EDID_STD_1280x720_70Hz);
+ SET_FARVAR(seg, info->standard_timing[4], VBE_EDID_STD_1280x960_60Hz);
+ SET_FARVAR(seg, info->standard_timing[5], VBE_EDID_STD_1440x900_60Hz);
+ SET_FARVAR(seg, info->standard_timing[6], VBE_EDID_STD_1600x1200_60Hz);
+ SET_FARVAR(seg, info->standard_timing[7], VBE_EDID_STD_1680x1050_60Hz);
+ /* detailed timing blocks */
+ memcpy_far(seg, &(info->desc[0].dtd), get_global_seg(), &vbe_edid_dtd_1152x864,
+ sizeof (vbe_edid_dtd_1152x864));
+ memcpy_far(seg, &(info->desc[1].dtd), get_global_seg(), &vbe_edid_dtd_1280x1024,
+ sizeof (vbe_edid_dtd_1280x1024));
+ /* serial */
+ for (i = 0; i < 5; i++) {
+ SET_FARVAR(seg, info->desc[2].mtxtd.header[i], 0);
+ }
+ SET_FARVAR(seg, info->desc[2].mtxtd.header[3], 0xFF);
+ for (i = 0; i < 10; i++) {
+ SET_FARVAR(seg, info->desc[2].mtxtd.text[i], i+0x30);
+ }
+ SET_FARVAR(seg, info->desc[2].mtxtd.text[10], 0x0A);
+ SET_FARVAR(seg, info->desc[2].mtxtd.text[11], 0x20);
+ SET_FARVAR(seg, info->desc[2].mtxtd.text[12], 0x20);
+ /* monitor name */
+ for (i = 0; i < 5; i++) {
+ SET_FARVAR(seg, info->desc[3].mtxtd.header[i], 0);
+ }
+ SET_FARVAR(seg, info->desc[3].mtxtd.header[3], 0xFC);
+ memcpy_far(seg, info->desc[3].mtxtd.text, get_global_seg(), vgabios_name, 12);
+ SET_FARVAR(seg, info->desc[3].mtxtd.text[12], 0x0A);
+ /* ext */
+ SET_FARVAR(seg, info->extensions, next);
+
+ /* checksum */
+ u8 sum = -checksum_far(get_global_seg(), info, sizeof(info));
+ SET_FARVAR(seg, info->checksum, sum);
+
+ return 0;
+}
+
+int vesa_read_edid(u16 unit, u16 block, u16 seg, void *data)
+{
+ if (unit != 0)
+ return -1;
+
+ switch (block) {
+ case 0:
+ return vesa_read_edid_block0(unit, block, seg, data, 0);
+ default:
+ return -1;
+ }
+}
+
diff --git a/vgasrc/vbe_edid.h b/vgasrc/vbe_edid.h
index f15a2af..b5222aa 100644
--- a/vgasrc/vbe_edid.h
+++ b/vgasrc/vbe_edid.h
@@ -128,7 +128,11 @@ struct vbe_edid_info {
#define VBE_EDID_STD_1280x1024_60Hz 0x8081
#define VBE_EDID_STD_1440x900_60Hz 0x0095
#define VBE_EDID_STD_1600x1200_60Hz 0x40A9
+#define VBE_EDID_STD_1600x900_60Hz 0xC0A9
#define VBE_EDID_STD_1680x1050_60Hz 0x00B3
+#define VBE_EDID_STD_1920x1080_60Hz 0xC0D1
#define VBE_EDID_STD_NOP 0x0101
+int vesa_get_ddc_capabilities(u16 unit);
+int vesa_read_edid(u16 unit, u16 block, u16 seg, void *data);
#endif /* vbe_edid.h */
diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h
index 34945f3..1eed64a 100644
--- a/vgasrc/vgahw.h
+++ b/vgasrc/vgahw.h
@@ -8,6 +8,7 @@
#include "bochsvga.h" // bochsvga_set_mode
#include "stdvga.h" // stdvga_set_mode
#include "geodevga.h" // geodevga_init
+#include "vbe_edid.h"
static inline struct vgamode_s *vgahw_find_mode(int mode) {
if (CONFIG_VGA_CIRRUS)
@@ -131,13 +132,13 @@ static inline int vgahw_restore_state(u16 seg, void *data, int states) {
static inline int vgahw_get_ddc_capabilities(u16 unit) {
if (CONFIG_VGA_BOCHS)
- return bochsvga_get_ddc_capabilities(unit);
+ return vesa_get_ddc_capabilities(unit);
return stdvga_get_ddc_capabilities(unit);
}
static inline int vgahw_read_edid(u16 unit, u16 block, u16 seg, void *data) {
if (CONFIG_VGA_BOCHS)
- return bochsvga_read_edid(unit, block, seg, data);
+ return vesa_read_edid(unit, block, seg, data);
return stdvga_read_edid(unit, block, seg, data);
}
_______________________________________________
SeaBIOS mailing list
[email protected]
http://www.seabios.org/mailman/listinfo/seabios
