diff options
| author | ache <ache@FreeBSD.org> | 1997-04-30 01:19:21 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-04-30 01:19:21 +0000 |
| commit | 16aefe23588f878ec84ea9aa2cd47dae96faa84e (patch) | |
| tree | 6427026a88f1304ef07fca9088955674de176a8e | |
| parent | 7f3702761f768ae5b3f9b26b5212a02d233b1010 (diff) | |
| download | FreeBSD-src-16aefe23588f878ec84ea9aa2cd47dae96faa84e.zip FreeBSD-src-16aefe23588f878ec84ea9aa2cd47dae96faa84e.tar.gz | |
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)
| -rw-r--r-- | sys/dev/syscons/syscons.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/syscons.c | 8 | ||||
| -rw-r--r-- | 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 e80e6df..8465560 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 e80e6df..8465560 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 e80e6df..8465560 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; |
