[Gc-linux-cvs] linux/drivers/video gcnfb.c,1.5,1.6

[<he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25092

Modified Files:
	gcnfb.c 
Log Message:
Added total lines to video mode.
Fixed vtrap so that it uses half _all_ lines, not half _visible_ lines.


Index: gcnfb.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/video/gcnfb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gcnfb.c	29 Oct 2004 22:18:32 -0000	1.5
+++ gcnfb.c	30 Oct 2004 00:09:36 -0000	1.6
@@ -62,6 +62,7 @@
 	const u32 *regs;
 	int width;
 	int height;
+	int lines;
 };
 
 static const u32 VIDEO_Mode640X480NtscYUV16[32] = {
@@ -115,6 +116,7 @@
 		.regs = VIDEO_Mode640X480NtscYUV16,
 		.width = 640,
 		.height = 480,
+		.lines = 525,
 	},
 	{
 		.format = VI_FMT_NTSC_480p,
@@ -122,6 +124,7 @@
 		.regs = VIDEO_Mode640x480NtscProgressiveYUV16,
 		.width = 640,
 		.height = 480,
+		.lines = 525,
 	},
 	{
 		.format = VI_FMT_PAL50_576i,
@@ -129,6 +132,7 @@
 		.regs = VIDEO_Mode640X576Pal50YUV16,
 		.width = 640,
 		.height = 576,
+		.lines = 625,
 	},
 	{
 		.format = VI_FMT_PAL60_480i,
@@ -136,6 +140,7 @@
 		.regs = VIDEO_Mode640X480Pal60YUV16,
 		.width = 640,
 		.height = 480,
+		.lines = 525,
 	},
 	{ .format = -1 }
 };
@@ -490,7 +495,7 @@
 
 	if (enable) {
 		/* XXX should we incorporate this in the video mode struct ? */
-		vtrap = gcnfb_video_mode->height / 2;
+		vtrap = gcnfb_video_mode->lines / 2;
 		htrap = VI_FMT_IS_NTSC(gcnfb_video_mode->format) ? 430 : 433;
 
 		/* progressive interrupts at 526 */