[src/netbsd-6]: src/sys/dev/wscons Pull up following revision(s) (requested b...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e96c40ff250b
branches:  netbsd-6
changeset: 776601:e96c40ff250b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Apr 11 08:38:07 2014 +0000

description:
Pull up following revision(s) (requested by khorben in ticket #1037):
        sys/dev/wscons/mra.c            1.6

Fixed wrong cast and invalid array access in the calibration framework,
as documented in PR kern/45872. The AA() macro accessed sample
coordinates as long integers, whereas they are really stored as signed
integers.

diffstat:

 sys/dev/wscons/mra.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 56c11e6b9972 -r e96c40ff250b sys/dev/wscons/mra.c
--- a/sys/dev/wscons/mra.c      Fri Apr 11 08:31:56 2014 +0000
+++ b/sys/dev/wscons/mra.c      Fri Apr 11 08:38:07 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mra.c,v 1.4 2006/10/09 10:43:01 peter Exp $    */
+/*     $NetBSD: mra.c,v 1.4.94.1 2014/04/11 08:38:07 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1999 Shin Takemura All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mra.c,v 1.4 2006/10/09 10:43:01 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mra.c,v 1.4.94.1 2014/04/11 08:38:07 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,7 +54,7 @@
        int64_t S11, S22, S12;
        int64_t SYY, S1Y, S2Y;
        int64_t A, B, C, M;
-#define AA(p, s, i)    (*((const long *)(((const char *)(p)) + (s) * (i))))
+#define AA(p, s, i)    (*((const int *)(((const char *)(p)) + (s) * (i))))
 #define X1(i)          AA(x1, x1s, i)
 #define X2(i)          AA(x2, x2s, i)
 #define Y(i)           AA(y, ys, i)