mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-30 05:36:10 +00:00
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)
This commit is contained in:
parent
04964d153d
commit
bfc43e99c4
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=25293
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue