From c04bb8d0cadc32951b55d2b83c3719d1d7475bf8 Mon Sep 17 00:00:00 2001
From: yokota <yokota@FreeBSD.org>
Date: Thu, 24 Jun 1999 09:06:48 +0000
Subject: Declare the correct size of softc and fix sc_get_softc().

---
 sys/isa/syscons_isa.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c
index fcb2b06..1104e26 100644
--- a/sys/isa/syscons_isa.c
+++ b/sys/isa/syscons_isa.c
@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: syscons_isa.c,v 1.4 1999/05/30 11:12:29 dfr Exp $
+ * $Id: syscons_isa.c,v 1.5 1999/06/22 14:13:41 yokota Exp $
  */
 
 #include "sc.h"
@@ -79,7 +79,7 @@ static device_method_t sc_methods[] = {
 static driver_t sc_driver = {
 	SC_DRIVER_NAME,
 	sc_methods,
-	1,                          /* XXX */
+	sizeof(sc_softc_t),
 };
 
 static sc_softc_t main_softc = { 0, 0, 0, -1, NULL, -1, NULL, };
@@ -125,7 +125,7 @@ sc_softc_t
 		main_softc.unit = unit;
 		return &main_softc;
 	} else {
-	        sc = (sc_softc_t *)devclass_get_softc(sc_devclass, unit);
+	        sc = (sc_softc_t *)device_get_softc(devclass_get_device(sc_devclass, unit));
 		if (!(sc->flags & SC_INIT_DONE)) {
 			sc->unit = unit;
 			sc->keyboard = -1;
@@ -148,7 +148,7 @@ sc_softc_t
 		return sc;
 	units = devclass_get_maxunit(sc_devclass);
 	for (i = 0; i < units; ++i) {
-	        sc = (sc_softc_t *)devclass_get_softc(sc_devclass, i);
+	        sc = (sc_softc_t *)device_get_softc(devclass_get_device(sc_devclass, i));
 		if (sc == NULL)
 			continue;
 		if (((adp == NULL) || (adp == sc->adp))
-- 
cgit v1.1