[src/trunk]: src/sys/arch fix changes for struct device split for Lubbock.

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

details:   https://anonhg.NetBSD.org/src/rev/85c23ba63a0b
branches:  trunk
changeset: 752961:85c23ba63a0b
user:      bsh <bsh%NetBSD.org@localhost>
date:      Sat Mar 13 11:13:31 2010 +0000

description:
fix changes for struct device split for Lubbock.

diffstat:

 sys/arch/arm/sa11x0/sa1111_kbc.c       |  10 ++++++----
 sys/arch/evbarm/lubbock/lubbock_pcic.c |   9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r 06c021372252 -r 85c23ba63a0b sys/arch/arm/sa11x0/sa1111_kbc.c
--- a/sys/arch/arm/sa11x0/sa1111_kbc.c  Sat Mar 13 10:55:09 2010 +0000
+++ b/sys/arch/arm/sa11x0/sa1111_kbc.c  Sat Mar 13 11:13:31 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: sa1111_kbc.c,v 1.11 2009/05/29 14:15:44 rjs Exp $ */
+/*      $NetBSD: sa1111_kbc.c,v 1.12 2010/03/13 11:13:31 bsh Exp $ */
 
 /*
  * Copyright (c) 2004  Ben Harris.
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.11 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa1111_kbc.c,v 1.12 2010/03/13 11:13:31 bsh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -193,7 +193,8 @@
 
        if (!(sc->polling) && sc->ih_rx == NULL) {
                sc->ih_rx = sacc_intr_establish(
-                       (sacc_chipset_tag_t *) device_parent(sc->dev), 
+                       (sacc_chipset_tag_t *) 
+                         device_private(device_parent(sc->dev)), 
                        sc->intr+1, IST_EDGE_RAISE, IPL_TTY, sackbc_rxint, sc);
                if (sc->ih_rx == NULL) {
                        aprint_normal_dev(sc->dev, "can't establish interrupt\n");
@@ -206,7 +207,8 @@
 {
        if (sc->polling && sc->ih_rx) {
                sacc_intr_disestablish(
-                       (sacc_chipset_tag_t *) device_parent(sc->dev),
+                       (sacc_chipset_tag_t *)
+                         device_private(device_parent(sc->dev)),
                        sc->ih_rx);
                sc->ih_rx = NULL;
        }
diff -r 06c021372252 -r 85c23ba63a0b sys/arch/evbarm/lubbock/lubbock_pcic.c
--- a/sys/arch/evbarm/lubbock/lubbock_pcic.c    Sat Mar 13 10:55:09 2010 +0000
+++ b/sys/arch/evbarm/lubbock/lubbock_pcic.c    Sat Mar 13 11:13:31 2010 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: lubbock_pcic.c,v 1.5 2009/05/29 14:15:44 rjs Exp $    */
+/*      $NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.5 2009/05/29 14:15:44 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lubbock_pcic.c,v 1.6 2010/03/13 11:13:31 bsh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -90,8 +90,11 @@
 static void
 sacpcic_attach(device_t parent, device_t self, void *aux)
 {
+       struct sacpcic_softc *sc = device_private(self);
+
+       sc->sc_pc.sc_dev = self;
        sacpcic_attach_common(device_private(parent),
-           device_private(self), aux, lubbock_socket_setup);
+           sc, aux, lubbock_socket_setup);
 }