From bfc43e99c4b2d973bc966596a3b8484f957b25c2 Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 30 Apr 1997 01:19:21 +0000
Subject: [PATCH] In comp_vgaregs skip cursor shape and 4 unused bytes (6
 total) instead of 2 unused. Previus code broke syscons on Diamond Stealth 3D
 3000 (video mode ptr was NULL with no real reason)

---
 sys/dev/syscons/syscons.c | 8 ++++----
 sys/i386/isa/syscons.c    | 8 ++++----
 sys/isa/syscons.c         | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index e80e6df0587..84655608b46 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.210 1997/04/20 16:05:33 bde Exp $
+ *  $Id: syscons.c,v 1.211 1997/04/27 09:03:10 yokota Exp $
  */
 
 #include "sc.h"
@@ -3396,12 +3396,12 @@ comp_vgaregs(u_char *buf1, u_char *buf2)
 {
     int i;
 
-    for(i = 0; i < 24; ++i) {
+    for(i = 0; i < 20; ++i) {
 	if (*buf1++ != *buf2++)
 	    return 1;
     }
-    buf1 += 2;	/* skip the cursor position register value */
-    buf2 += 2;
+    buf1 += 6;  /* skip the cursor shape and unused values */
+    buf2 += 6;
     for(i = 26; i < 64; ++i) {
 	if (*buf1++ != *buf2++)
 	    return 1;
diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c
index e80e6df0587..84655608b46 100644
--- a/sys/i386/isa/syscons.c
+++ b/sys/i386/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.210 1997/04/20 16:05:33 bde Exp $
+ *  $Id: syscons.c,v 1.211 1997/04/27 09:03:10 yokota Exp $
  */
 
 #include "sc.h"
@@ -3396,12 +3396,12 @@ comp_vgaregs(u_char *buf1, u_char *buf2)
 {
     int i;
 
-    for(i = 0; i < 24; ++i) {
+    for(i = 0; i < 20; ++i) {
 	if (*buf1++ != *buf2++)
 	    return 1;
     }
-    buf1 += 2;	/* skip the cursor position register value */
-    buf2 += 2;
+    buf1 += 6;  /* skip the cursor shape and unused values */
+    buf2 += 6;
     for(i = 26; i < 64; ++i) {
 	if (*buf1++ != *buf2++)
 	    return 1;
diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c
index e80e6df0587..84655608b46 100644
--- a/sys/isa/syscons.c
+++ b/sys/isa/syscons.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: syscons.c,v 1.210 1997/04/20 16:05:33 bde Exp $
+ *  $Id: syscons.c,v 1.211 1997/04/27 09:03:10 yokota Exp $
  */
 
 #include "sc.h"
@@ -3396,12 +3396,12 @@ comp_vgaregs(u_char *buf1, u_char *buf2)
 {
     int i;
 
-    for(i = 0; i < 24; ++i) {
+    for(i = 0; i < 20; ++i) {
 	if (*buf1++ != *buf2++)
 	    return 1;
     }
-    buf1 += 2;	/* skip the cursor position register value */
-    buf2 += 2;
+    buf1 += 6;  /* skip the cursor shape and unused values */
+    buf2 += 6;
     for(i = 26; i < 64; ++i) {
 	if (*buf1++ != *buf2++)
 	    return 1;