CVS commit: src/sys/dev

[KIYOHARA Takashi]

Module Name:    src
Committed By:   kiyohara
Date:           Tue Mar  8 04:58:21 UTC 2011

Modified Files:
        src/sys/dev/isa: slhci_isa.c
        src/sys/dev/pcmcia: slhci_pcmcia.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/isa/slhci_isa.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pcmcia/slhci_pcmcia.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/dev/isa/slhci_isa.c
diff -u src/sys/dev/isa/slhci_isa.c:1.11 src/sys/dev/isa/slhci_isa.c:1.12
--- src/sys/dev/isa/slhci_isa.c:1.11	Tue May 12 09:10:16 2009
+++ src/sys/dev/isa/slhci_isa.c	Tue Mar  8 04:58:21 2011
@@ -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? */
 

Index: src/sys/dev/pcmcia/slhci_pcmcia.c
diff -u src/sys/dev/pcmcia/slhci_pcmcia.c:1.7 src/sys/dev/pcmcia/slhci_pcmcia.c:1.8
--- src/sys/dev/pcmcia/slhci_pcmcia.c:1.7	Thu Nov  4 13:13:43 2010
+++ src/sys/dev/pcmcia/slhci_pcmcia.c	Tue Mar  8 04:58:21 2011
@@ -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;