aux/vga: remove vbs/vbe from mode, use shs/ehs when sync is ment, prefer detailed timing in edid

vbs/vbe members in Mode was only used in the vesadb
and cannot be changed from vgadb.

use shs/ehs in drivers when refering to the horizontal
sync pulse. clarify the matter in a comment.

link detailed timing modes at the head of the edid
modelist. these are the modes we'r interested in,
not the ones from vesadb.

1 files changed, 60 insertions, 182 deletions

diff --git a/sys/src/cmd/aux/vga/vesadb.c b/sys/src/cmd/aux/vga/vesadb.c
index 53e461258..83cfb4fca 100644
--- a/sys/src/cmd/aux/vga/vesadb.c
+++ b/sys/src/cmd/aux/vga/vesadb.c
@@ -1,5 +1,3 @@
-// DO NOT EDIT; this file is automatically generated from vesa.txt
-
 #include <u.h>
 #include <libc.h>
 #include <bio.h>
@@ -21,16 +19,12 @@ static Mode vesa640x480x60 = {
 	.y = 480,
 
 	.ht = 800,
-	.shb = 648,
-	.ehb = 648+144,
-	.shs = 656,
-	.ehs = 656+96,
+	.shb = 656,
+	.ehb = 656+96,
 
 	.vt = 525,
 	.vrs = 490,
 	.vre = 490+2,
-	.vbs = 488,
-	.vbe = 488+29,
 
 	.frequency = 25175000,
 
@@ -45,16 +39,12 @@ static Mode vesa640x480x72 = {
 	.y = 480,
 
 	.ht = 832,
-	.shb = 648,
-	.ehb = 648+176,
-	.shs = 664,
-	.ehs = 664+40,
+	.shb = 664,
+	.ehb = 664+40,
 
 	.vt = 520,
 	.vrs = 489,
 	.vre = 489+3,
-	.vbs = 488,
-	.vbe = 488+24,
 
 	.frequency = 31500000,
 
@@ -69,16 +59,12 @@ static Mode vesa640x480x75 = {
 	.y = 480,
 
 	.ht = 840,
-	.shb = 640,
-	.ehb = 640+200,
-	.shs = 656,
-	.ehs = 656+64,
+	.shb = 656,
+	.ehb = 656+64,
 
 	.vt = 500,
 	.vrs = 481,
 	.vre = 481+3,
-	.vbs = 480,
-	.vbe = 480+20,
 
 	.frequency = 31500000,
 
@@ -93,16 +79,12 @@ static Mode vesa640x480x85 = {
 	.y = 480,
 
 	.ht = 832,
-	.shb = 640,
-	.ehb = 640+192,
-	.shs = 696,
-	.ehs = 696+56,
+	.shb = 696,
+	.ehb = 696+56,
 
 	.vt = 509,
 	.vrs = 481,
 	.vre = 481+3,
-	.vbs = 480,
-	.vbe = 480+29,
 
 	.frequency = 36000000,
 
@@ -117,16 +99,12 @@ static Mode vesa800x600x56 = {
 	.y = 600,
 
 	.ht = 1024,
-	.shb = 800,
-	.ehb = 800+224,
-	.shs = 824,
-	.ehs = 824+72,
+	.shb = 824,
+	.ehb = 824+72,
 
 	.vt = 625,
 	.vrs = 601,
 	.vre = 601+2,
-	.vbs = 600,
-	.vbe = 600+25,
 
 	.frequency = 36000000,
 
@@ -141,16 +119,12 @@ static Mode vesa800x600x60 = {
 	.y = 600,
 
 	.ht = 1056,
-	.shb = 800,
-	.ehb = 800+256,
-	.shs = 840,
-	.ehs = 840+128,
+	.shb = 840,
+	.ehb = 840+128,
 
 	.vt = 628,
 	.vrs = 601,
 	.vre = 601+4,
-	.vbs = 600,
-	.vbe = 600+28,
 
 	.frequency = 40000000,
 
@@ -165,16 +139,12 @@ static Mode vesa800x600x72 = {
 	.y = 600,
 
 	.ht = 1040,
-	.shb = 800,
-	.ehb = 800+240,
-	.shs = 856,
-	.ehs = 856+120,
+	.shb = 856,
+	.ehb = 856+120,
 
 	.vt = 666,
 	.vrs = 637,
 	.vre = 637+6,
-	.vbs = 600,
-	.vbe = 600+66,
 
 	.frequency = 50000000,
 
@@ -189,16 +159,12 @@ static Mode vesa800x600x75 = {
 	.y = 600,
 
 	.ht = 1056,
-	.shb = 800,
-	.ehb = 800+256,
-	.shs = 816,
-	.ehs = 816+80,
+	.shb = 816,
+	.ehb = 816+80,
 
 	.vt = 625,
 	.vrs = 601,
 	.vre = 601+3,
-	.vbs = 600,
-	.vbe = 600+25,
 
 	.frequency = 49500000,
 
@@ -213,16 +179,12 @@ static Mode vesa800x600x85 = {
 	.y = 600,
 
 	.ht = 1048,
-	.shb = 800,
-	.ehb = 800+248,
-	.shs = 832,
-	.ehs = 832+64,
+	.shb = 832,
+	.ehb = 832+64,
 
 	.vt = 631,
 	.vrs = 601,
 	.vre = 601+3,
-	.vbs = 600,
-	.vbe = 600+31,
 
 	.frequency = 56250000,
 
@@ -237,16 +199,12 @@ static Mode vesa1024x768x60 = {
 	.y = 768,
 
 	.ht = 1344,
-	.shb = 1024,
-	.ehb = 1024+320,
-	.shs = 1048,
-	.ehs = 1048+136,
+	.shb = 1048,
+	.ehb = 1048+136,
 
 	.vt = 806,
 	.vrs = 771,
 	.vre = 771+6,
-	.vbs = 768,
-	.vbe = 768+38,
 
 	.frequency = 65000000,
 
@@ -261,16 +219,12 @@ static Mode vesa1024x768x70 = {
 	.y = 768,
 
 	.ht = 1328,
-	.shb = 1024,
-	.ehb = 1024+304,
-	.shs = 1048,
-	.ehs = 1048+136,
+	.shb = 1048,
+	.ehb = 1048+136,
 
 	.vt = 806,
 	.vrs = 771,
 	.vre = 771+6,
-	.vbs = 768,
-	.vbe = 768+38,
 
 	.frequency = 75000000,
 
@@ -285,16 +239,12 @@ static Mode vesa1024x768x75 = {
 	.y = 768,
 
 	.ht = 1312,
-	.shb = 1024,
-	.ehb = 1024+288,
-	.shs = 1040,
-	.ehs = 1040+96,
+	.shb = 1040,
+	.ehb = 1040+96,
 
 	.vt = 800,
 	.vrs = 769,
 	.vre = 769+3,
-	.vbs = 768,
-	.vbe = 768+32,
 
 	.frequency = 78750000,
 
@@ -309,16 +259,12 @@ static Mode vesa1024x768x85 = {
 	.y = 768,
 
 	.ht = 1376,
-	.shb = 1024,
-	.ehb = 1024+352,
-	.shs = 1072,
-	.ehs = 1072+96,
+	.shb = 1072,
+	.ehb = 1072+96,
 
 	.vt = 808,
 	.vrs = 769,
 	.vre = 769+3,
-	.vbs = 768,
-	.vbe = 768+40,
 
 	.frequency = 94500000,
 
@@ -333,16 +279,12 @@ static Mode vesa1152x864x75 = {
 	.y = 864,
 
 	.ht = 1600,
-	.shb = 1152,
-	.ehb = 1152+448,
-	.shs = 1216,
-	.ehs = 1216+128,
+	.shb = 1216,
+	.ehb = 1216+128,
 
 	.vt = 900,
 	.vrs = 865,
 	.vre = 865+3,
-	.vbs = 864,
-	.vbe = 864+36,
 
 	.frequency = 108000000,
 
@@ -357,16 +299,12 @@ static Mode vesa1280x960x60 = {
 	.y = 960,
 
 	.ht = 1800,
-	.shb = 1280,
-	.ehb = 1280+520,
-	.shs = 1376,
-	.ehs = 1376+112,
+	.shb = 1376,
+	.ehb = 1376+112,
 
 	.vt = 1000,
 	.vrs = 961,
 	.vre = 961+3,
-	.vbs = 960,
-	.vbe = 960+40,
 
 	.frequency = 108000000,
 
@@ -381,16 +319,12 @@ static Mode vesa1280x960x85 = {
 	.y = 960,
 
 	.ht = 1728,
-	.shb = 1280,
-	.ehb = 1280+448,
-	.shs = 1344,
-	.ehs = 1344+160,
+	.shb = 1344,
+	.ehb = 1344+160,
 
 	.vt = 1011,
 	.vrs = 961,
 	.vre = 961+3,
-	.vbs = 960,
-	.vbe = 960+51,
 
 	.frequency = 148500000,
 
@@ -405,16 +339,12 @@ static Mode vesa1280x1024x60 = {
 	.y = 1024,
 
 	.ht = 1688,
-	.shb = 1280,
-	.ehb = 1280+408,
-	.shs = 1328,
-	.ehs = 1328+112,
+	.shb = 1328,
+	.ehb = 1328+112,
 
 	.vt = 1066,
 	.vrs = 1025,
 	.vre = 1025+3,
-	.vbs = 1024,
-	.vbe = 1024+42,
 
 	.frequency = 108000000,
 
@@ -429,16 +359,12 @@ static Mode vesa1280x1024x75 = {
 	.y = 1024,
 
 	.ht = 1688,
-	.shb = 1280,
-	.ehb = 1280+408,
-	.shs = 1296,
-	.ehs = 1296+144,
+	.shb = 1296,
+	.ehb = 1296+144,
 
 	.vt = 1066,
 	.vrs = 1025,
 	.vre = 1025+3,
-	.vbs = 1024,
-	.vbe = 1024+42,
 
 	.frequency = 135000000,
 
@@ -453,16 +379,12 @@ static Mode vesa1280x1024x85 = {
 	.y = 1024,
 
 	.ht = 1728,
-	.shb = 1280,
-	.ehb = 1280+448,
-	.shs = 1344,
-	.ehs = 1344+160,
+	.shb = 1344,
+	.ehb = 1344+160,
 
 	.vt = 1072,
 	.vrs = 1025,
 	.vre = 1025+3,
-	.vbs = 1024,
-	.vbe = 1024+48,
 
 	.frequency = 157500000,
 
@@ -477,16 +399,12 @@ static Mode vesa1600x1200x60 = {
 	.y = 1200,
 
 	.ht = 2160,
-	.shb = 1600,
-	.ehb = 1600+560,
-	.shs = 1664,
-	.ehs = 1664+192,
+	.shb = 1664,
+	.ehb = 1664+192,
 
 	.vt = 1250,
 	.vrs = 1201,
 	.vre = 1201+3,
-	.vbs = 1200,
-	.vbe = 1200+50,
 
 	.frequency = 162000000,
 
@@ -501,16 +419,12 @@ static Mode vesa1600x1200x65 = {
 	.y = 1200,
 
 	.ht = 2160,
-	.shb = 1600,
-	.ehb = 1600+560,
-	.shs = 1664,
-	.ehs = 1664+192,
+	.shb = 1664,
+	.ehb = 1664+192,
 
 	.vt = 1250,
 	.vrs = 1201,
 	.vre = 1201+3,
-	.vbs = 1200,
-	.vbe = 1200+50,
 
 	.frequency = 175500000,
 
@@ -525,16 +439,12 @@ static Mode vesa1600x1200x70 = {
 	.y = 1200,
 
 	.ht = 2160,
-	.shb = 1600,
-	.ehb = 1600+560,
-	.shs = 1664,
-	.ehs = 1664+192,
+	.shb = 1664,
+	.ehb = 1664+192,
 
 	.vt = 1250,
 	.vrs = 1201,
 	.vre = 1201+3,
-	.vbs = 1200,
-	.vbe = 1200+50,
 
 	.frequency = 189000000,
 
@@ -549,16 +459,12 @@ static Mode vesa1600x1200x75 = {
 	.y = 1200,
 
 	.ht = 2160,
-	.shb = 1600,
-	.ehb = 1600+560,
-	.shs = 1664,
-	.ehs = 1664+192,
+	.shb = 1664,
+	.ehb = 1664+192,
 
 	.vt = 1250,
 	.vrs = 1201,
 	.vre = 1201+3,
-	.vbs = 1200,
-	.vbe = 1200+50,
 
 	.frequency = 202500000,
 
@@ -573,16 +479,12 @@ static Mode vesa1600x1200x85 = {
 	.y = 1200,
 
 	.ht = 2160,
-	.shb = 1600,
-	.ehb = 1600+560,
-	.shs = 1664,
-	.ehs = 1664+192,
+	.shb = 1664,
+	.ehb = 1664+192,
 
 	.vt = 1250,
 	.vrs = 1201,
 	.vre = 1201+3,
-	.vbs = 1200,
-	.vbe = 1200+50,
 
 	.frequency = 229500000,
 
@@ -597,16 +499,12 @@ static Mode vesa1792x1344x60 = {
 	.y = 1344,
 
 	.ht = 2448,
-	.shb = 1792,
-	.ehb = 1792+656,
-	.shs = 1920,
-	.ehs = 1920+200,
+	.shb = 1920,
+	.ehb = 1920+200,
 
 	.vt = 1394,
 	.vrs = 1345,
 	.vre = 1345+3,
-	.vbs = 1344,
-	.vbe = 1344+50,
 
 	.frequency = 204750000,
 
@@ -621,16 +519,12 @@ static Mode vesa1792x1344x75 = {
 	.y = 1344,
 
 	.ht = 2456,
-	.shb = 1792,
-	.ehb = 1792+664,
-	.shs = 1888,
-	.ehs = 1888+216,
+	.shb = 1888,
+	.ehb = 1888+216,
 
 	.vt = 1417,
 	.vrs = 1345,
 	.vre = 1345+3,
-	.vbs = 1344,
-	.vbe = 1344+73,
 
 	.frequency = 261000000,
 
@@ -645,16 +539,12 @@ static Mode vesa1856x1392x60 = {
 	.y = 1392,
 
 	.ht = 2528,
-	.shb = 1856,
-	.ehb = 1856+672,
-	.shs = 1952,
-	.ehs = 1952+224,
+	.shb = 1952,
+	.ehb = 1952+224,
 
 	.vt = 1439,
 	.vrs = 1393,
 	.vre = 1393+3,
-	.vbs = 1392,
-	.vbe = 1392+47,
 
 	.frequency = 218250000,
 
@@ -669,16 +559,12 @@ static Mode vesa1856x1392x75 = {
 	.y = 1392,
 
 	.ht = 2560,
-	.shb = 1856,
-	.ehb = 1856+704,
-	.shs = 1984,
-	.ehs = 1984+224,
+	.shb = 1984,
+	.ehb = 1984+224,
 
 	.vt = 1500,
 	.vrs = 1393,
 	.vre = 1393+3,
-	.vbs = 1392,
-	.vbe = 1392+108,
 
 	.frequency = 288000000,
 
@@ -693,16 +579,12 @@ static Mode vesa1920x1440x60 = {
 	.y = 1440,
 
 	.ht = 2600,
-	.shb = 1920,
-	.ehb = 1920+680,
-	.shs = 2048,
-	.ehs = 2048+208,
+	.shb = 2048,
+	.ehb = 2048+208,
 
 	.vt = 1500,
 	.vrs = 1441,
 	.vre = 1441+3,
-	.vbs = 1440,
-	.vbe = 1440+60,
 
 	.frequency = 234000000,
 
@@ -717,16 +599,12 @@ static Mode vesa1920x1440x75 = {
 	.y = 1440,
 
 	.ht = 2640,
-	.shb = 1920,
-	.ehb = 1920+720,
-	.shs = 2064,
-	.ehs = 2064+224,
+	.shb = 2064,
+	.ehb = 2064+224,
 
 	.vt = 1500,
 	.vrs = 1441,
 	.vre = 1441+3,
-	.vbs = 1440,
-	.vbe = 1440+60,
 
 	.frequency = 297000000,