Module Name: src
Committed By: rkujawa
Date: Thu Nov 8 18:04:56 UTC 2012
Modified Files:
src/sys/arch/amiga/dev: grf_cl.c grf_cv.c grf_cv3d.c grf_et.c grf_rh.c
grf_rt.c grf_ul.c
Log Message:
Make Amiga video drivers work again after device/softc changes.
Patch from chs@.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amiga/dev/grf_cl.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/amiga/dev/grf_cv.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/amiga/dev/grf_cv3d.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/grf_et.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amiga/dev/grf_rh.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/dev/grf_rt.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/dev/grf_ul.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/grf_cl.c
diff -u src/sys/arch/amiga/dev/grf_cl.c:1.47 src/sys/arch/amiga/dev/grf_cl.c:1.48
--- src/sys/arch/amiga/dev/grf_cl.c:1.47 Sat Oct 27 17:17:28 2012
+++ src/sys/arch/amiga/dev/grf_cl.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfclattach(device_t parent, device_t se
/*
* 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) {
Index: src/sys/arch/amiga/dev/grf_cv.c
diff -u src/sys/arch/amiga/dev/grf_cv.c:1.54 src/sys/arch/amiga/dev/grf_cv.c:1.55
--- src/sys/arch/amiga/dev/grf_cv.c:1.54 Sat Oct 27 17:17:28 2012
+++ src/sys/arch/amiga/dev/grf_cv.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfcvattach(device_t parent, device_t se
/*
* 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);
Index: src/sys/arch/amiga/dev/grf_cv3d.c
diff -u src/sys/arch/amiga/dev/grf_cv3d.c:1.28 src/sys/arch/amiga/dev/grf_cv3d.c:1.29
--- src/sys/arch/amiga/dev/grf_cv3d.c:1.28 Sat Oct 27 17:17:28 2012
+++ src/sys/arch/amiga/dev/grf_cv3d.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfcv3dattach(device_t parent, device_t
/*
* 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);
Index: src/sys/arch/amiga/dev/grf_et.c
diff -u src/sys/arch/amiga/dev/grf_et.c:1.30 src/sys/arch/amiga/dev/grf_et.c:1.31
--- src/sys/arch/amiga/dev/grf_et.c:1.30 Sat Oct 27 17:17:28 2012
+++ src/sys/arch/amiga/dev/grf_et.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfetattach(device_t parent, device_t se
/*
* 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) {
Index: src/sys/arch/amiga/dev/grf_rh.c
diff -u src/sys/arch/amiga/dev/grf_rh.c:1.55 src/sys/arch/amiga/dev/grf_rh.c:1.56
--- src/sys/arch/amiga/dev/grf_rh.c:1.55 Sat Oct 27 17:17:29 2012
+++ src/sys/arch/amiga/dev/grf_rh.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfrhattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, self, gp, grfrhprint);
+ amiga_config_found(cfdata, gp->g_device, gp, grfrhprint);
}
int
Index: src/sys/arch/amiga/dev/grf_rt.c
diff -u src/sys/arch/amiga/dev/grf_rt.c:1.56 src/sys/arch/amiga/dev/grf_rt.c:1.57
--- src/sys/arch/amiga/dev/grf_rt.c:1.56 Sat Oct 27 17:17:29 2012
+++ src/sys/arch/amiga/dev/grf_rt.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfrtattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, self, gp, grfrtprint);
+ amiga_config_found(cfdata, gp->g_device, gp, grfrtprint);
}
int
Index: src/sys/arch/amiga/dev/grf_ul.c
diff -u src/sys/arch/amiga/dev/grf_ul.c:1.48 src/sys/arch/amiga/dev/grf_ul.c:1.49
--- src/sys/arch/amiga/dev/grf_ul.c:1.48 Sat Oct 27 17:17:29 2012
+++ src/sys/arch/amiga/dev/grf_ul.c Thu Nov 8 18:04:56 2012
@@ -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 @@ grfulattach(device_t parent, device_t se
/*
* attach grf
*/
- amiga_config_found(cfdata, self, gp, grfulprint);
+ amiga_config_found(cfdata, gp->g_device, gp, grfulprint);
}
int
