[src/trunk]: src/sys/arch/amiga/dev Make Amiga video drivers work again after...

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

details:   https://anonhg.NetBSD.org/src/rev/69c6280ffc2e
branches:  trunk
changeset: 782605:69c6280ffc2e
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Thu Nov 08 18:04:56 2012 +0000

description:
Make Amiga video drivers work again after device/softc changes.
Patch from chs@.

diffstat:

 sys/arch/amiga/dev/grf_cl.c   |  6 +++---
 sys/arch/amiga/dev/grf_cv.c   |  6 +++---
 sys/arch/amiga/dev/grf_cv3d.c |  6 +++---
 sys/arch/amiga/dev/grf_et.c   |  6 +++---
 sys/arch/amiga/dev/grf_rh.c   |  6 +++---
 sys/arch/amiga/dev/grf_rt.c   |  6 +++---
 sys/arch/amiga/dev/grf_ul.c   |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

diffs (189 lines):

diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_cl.c
--- a/sys/arch/amiga/dev/grf_cl.c       Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_cl.c       Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cl.c,v 1.47 2012/10/27 17:17:28 chs Exp $ */
+/*     $NetBSD: grf_cl.c,v 1.48 2012/11/08 18:04:56 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -36,7 +36,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.47 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cl.c,v 1.48 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "grfcl.h"
 #include "ite.h"
@@ -391,7 +391,7 @@
        /*
         * attach grf (once)
         */
-       if (amiga_config_found(cfdata, self, gp, grfclprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfclprint)) {
                attachflag = 1;
                printf("grfcl: %dMB ", cl_fbsize / 0x100000);
                switch (cltype) {
diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_cv.c
--- a/sys/arch/amiga/dev/grf_cv.c       Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_cv.c       Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cv.c,v 1.54 2012/10/27 17:17:28 chs Exp $ */
+/*     $NetBSD: grf_cv.c,v 1.55 2012/11/08 18:04:56 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.54 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv.c,v 1.55 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "grfcv.h"
 #include "ite.h"
@@ -555,7 +555,7 @@
        /*
         * attach grf
         */
-       if (amiga_config_found(cfdata, self, gp, grfcvprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfcvprint)) {
                if (self != NULL)
                        printf("grfcv: CyberVision64 with %dMB being used\n",
                            cv_fbsize/0x100000);
diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_cv3d.c
--- a/sys/arch/amiga/dev/grf_cv3d.c     Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_cv3d.c     Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_cv3d.c,v 1.28 2012/10/27 17:17:28 chs Exp $ */
+/*     $NetBSD: grf_cv3d.c,v 1.29 2012/11/08 18:04:56 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1995 Michael Teske
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.28 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_cv3d.c,v 1.29 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "ite.h"
 #include "wsdisplay.h"
@@ -506,7 +506,7 @@
        /*
         * attach grf
         */
-       if (amiga_config_found(cfdata, self, gp, grfcv3dprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfcv3dprint)) {
                if (self != NULL)
                        printf("%s: CyberVision64/3D with %dMB being used\n",
                            device_xname(self), cv3d_fbsize / 0x100000);
diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_et.c
--- a/sys/arch/amiga/dev/grf_et.c       Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_et.c       Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_et.c,v 1.30 2012/10/27 17:17:28 chs Exp $ */
+/*     $NetBSD: grf_et.c,v 1.31 2012/11/08 18:04:56 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -37,7 +37,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.30 2012/10/27 17:17:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_et.c,v 1.31 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "grfet.h"
 #include "ite.h"
@@ -325,7 +325,7 @@
        /*
         * attach grf (once)
         */
-       if (amiga_config_found(cfdata, self, gp, grfetprint)) {
+       if (amiga_config_found(cfdata, gp->g_device, gp, grfetprint)) {
                attachflag = 1;
                printf("grfet: %dMB ", et_fbsize / 0x100000);
                switch (ettype) {
diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_rh.c
--- a/sys/arch/amiga/dev/grf_rh.c       Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_rh.c       Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_rh.c,v 1.55 2012/10/27 17:17:29 chs Exp $ */
+/*     $NetBSD: grf_rh.c,v 1.56 2012/11/08 18:04:56 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1994 Markus Wild
@@ -34,7 +34,7 @@
 #include "opt_retina.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.55 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rh.c,v 1.56 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "grfrh.h"
 #include "ite.h"
@@ -1617,7 +1617,7 @@
        /*
         * attach grf
         */
-       amiga_config_found(cfdata, self, gp, grfrhprint);
+       amiga_config_found(cfdata, gp->g_device, gp, grfrhprint);
 }
 
 int
diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_rt.c
--- a/sys/arch/amiga/dev/grf_rt.c       Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_rt.c       Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_rt.c,v 1.56 2012/10/27 17:17:29 chs Exp $ */
+/*     $NetBSD: grf_rt.c,v 1.57 2012/11/08 18:04:56 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1993 Markus Wild
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.56 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_rt.c,v 1.57 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "grfrt.h"
 #include "ite.h"
@@ -881,7 +881,7 @@
        /*
         * attach grf
         */
-       amiga_config_found(cfdata, self, gp, grfrtprint);
+       amiga_config_found(cfdata, gp->g_device, gp, grfrtprint);
 }
 
 int
diff -r eb1691c088a5 -r 69c6280ffc2e sys/arch/amiga/dev/grf_ul.c
--- a/sys/arch/amiga/dev/grf_ul.c       Thu Nov 08 17:40:46 2012 +0000
+++ b/sys/arch/amiga/dev/grf_ul.c       Thu Nov 08 18:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: grf_ul.c,v 1.48 2012/10/27 17:17:29 chs Exp $ */
+/*     $NetBSD: grf_ul.c,v 1.49 2012/11/08 18:04:56 rkujawa Exp $ */
 #define UL_DEBUG
 
 /*-
@@ -33,7 +33,7 @@
 #include "opt_amigacons.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.48 2012/10/27 17:17:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf_ul.c,v 1.49 2012/11/08 18:04:56 rkujawa Exp $");
 
 #include "grful.h"
 #include "ite.h"
@@ -556,7 +556,7 @@
        /*
         * attach grf
         */
-       amiga_config_found(cfdata, self, gp, grfulprint);
+       amiga_config_found(cfdata, gp->g_device, gp, grfulprint);
 }
 
 int