[src/trunk]: src/sys/dev Fix hci_private data. slhci(4) is assuming, it is s...

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

details:   https://anonhg.NetBSD.org/src/rev/4b59832f26d0
branches:  trunk
changeset: 763008:4b59832f26d0
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Tue Mar 08 04:58:21 2011 +0000

description:
Fix hci_private data.  slhci(4) is assuming, it is slhci_softc.  not device_t.

diffstat:

 sys/dev/isa/slhci_isa.c       |  6 +++---
 sys/dev/pcmcia/slhci_pcmcia.c |  5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 332024985c99 -r 4b59832f26d0 sys/dev/isa/slhci_isa.c
--- a/sys/dev/isa/slhci_isa.c   Tue Mar 08 04:47:10 2011 +0000
+++ b/sys/dev/isa/slhci_isa.c   Tue Mar 08 04:58:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: slhci_isa.c,v 1.11 2009/05/12 09:10:16 cegger Exp $    */
+/*     $NetBSD: slhci_isa.c,v 1.12 2011/03/08 04:58:21 kiyohara Exp $  */
 
 /*
  * Copyright (c) 2001 Kiyoshi Ikehara. All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.11 2009/05/12 09:10:16 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_isa.c,v 1.12 2011/03/08 04:58:21 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -98,7 +98,7 @@
        bus_space_handle_t ioh;
 
        sc->sc_dev = self;
-       sc->sc_bus.hci_private = self;
+       sc->sc_bus.hci_private = sc;
 
        printf("\n"); /* XXX still needed? */
 
diff -r 332024985c99 -r 4b59832f26d0 sys/dev/pcmcia/slhci_pcmcia.c
--- a/sys/dev/pcmcia/slhci_pcmcia.c     Tue Mar 08 04:47:10 2011 +0000
+++ b/sys/dev/pcmcia/slhci_pcmcia.c     Tue Mar 08 04:58:21 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: slhci_pcmcia.c,v 1.7 2010/11/04 13:13:43 pgoyette Exp $ */
+/* $NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $ */
 /*
  * Not (c) 2007 Matthew Orgass
  * This file is public domain, meaning anyone can make any use of part or all 
@@ -11,7 +11,7 @@
 /* Glue for RATOC USB HOST CF+ Card (SL811HS chip) */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.7 2010/11/04 13:13:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slhci_pcmcia.c,v 1.8 2011/03/08 04:58:21 kiyohara Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -89,6 +89,7 @@
        struct pcmcia_function *pf = pa->pf;
 
        psc->sc_slhci.sc_dev = self;
+       psc->sc_slhci.sc_bus.hci_private = &psc->sc_slhci;
 
        psc->sc_pf = pf;
        psc->sc_flags = 0;