File i855-crt-i915support.diff of Package i855crt

From: Jo "directhex" Shields <directhex@users.sourceforge.net>
Subject: i915 support patch
Date: 2005-05-31 07:39

have successfully patched i855crt to function on
recent i915 graphics controllers (specifically, a Dell
Latitude D410).

This patch also makes for some minor cleanups,
including a speling error, and mistaken use of ; rather
than || in a block if statement.

Mode support with the i915 appears to be uncooperative,
I was only able to get a stable (but very solid) image
with 1024x768@70 on a Belinea 17" TFT
---
 dumpreg.c |    7 ++++---
 i855crt.c |    9 +++++----
 i855crt.h |    2 ++
 3 files changed, 11 insertions(+), 7 deletions(-)

--- a/dumpreg.c
+++ b/dumpreg.c
@@ -36,10 +36,11 @@ char *i810_chip(char **buff_ptr, int *le
 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
-		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
+		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
-		(p = strstr(*buff_ptr, I865STR)) != NULL ;
+		(p = strstr(*buff_ptr, I865STR)) != NULL ||
+		(p = strstr(*buff_ptr, I915STR)) != NULL ;
 	
 		if(i)
 		{
@@ -89,7 +90,7 @@ int main (int argc, char *argv[])
 	chip = i810_chip(&buff, &len, pci_f);
 	if (chip == NULL) 
 	{
-		fprintf(stderr, "No know videocard has been found.\n");
+		fprintf(stderr, "No known videocard has been found.\n");
 		exit(1);
 	}
 	pclose(pci_f);
--- a/i855crt.c
+++ b/i855crt.c
@@ -260,14 +260,15 @@ char *i810_chip(char **buff_ptr, int *le
 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
-		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
+		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
-		(p = strstr(*buff_ptr, I865STR)) != NULL ;
+		(p = strstr(*buff_ptr, I865STR)) != NULL ||
+		(p = strstr(*buff_ptr, I915STR)) != NULL ;
 	
 		if(i)
 		{
-			fprintf(stderr,"This driver is untested with your videocard !\n");  
+			fprintf(stderr,"This driver is untested with your video card !\n");
 			return p;
 		}
 		
@@ -499,7 +500,7 @@ int main (int argc, char *argv[])
 	chip = i810_chip(&buff, &len, pci_f);
 	if (chip == NULL) 
 	{
-		fprintf(stderr, "No know videocard has been found.\n");
+		fprintf(stderr, "No known videocard has been found.\n");
 		exit(1);
 	}
 	pclose(pci_f);
--- a/i855crt.h
+++ b/i855crt.h
@@ -1,3 +1,4 @@
+
 /* 
 * This is part of the source for i855crt driver
 * copyright(c) Merello Andrea 2004
@@ -45,6 +46,7 @@
 #define I845STR			"8086:2562"
 #define I855STR			"8086:3582"
 #define I865STR			"8086:2572"
+#define I915STR			"8086:2592"
 #define MEMSTR			"Memory at"
 #define NONPRSTR		"32-bit, non-prefetchable"