From 8a19236fe51ed781a87b6742009d173a950480a4 Mon Sep 17 00:00:00 2001 From: tsutsui Date: Sun, 30 Mar 2008 01:41:36 +0000 Subject: [PATCH] One missed file in the previous commit: > Split softc and device_t for zsc(4) and its children. Pointed out by mrg@. --- sys/arch/sparc64/dev/kd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arch/sparc64/dev/kd.c b/sys/arch/sparc64/dev/kd.c index 59e0606bbeb6..afa7632825b0 100644 --- a/sys/arch/sparc64/dev/kd.c +++ b/sys/arch/sparc64/dev/kd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kd.c,v 1.47 2007/11/19 18:51:43 ad Exp $ */ +/* $NetBSD: kd.c,v 1.48 2008/03/30 01:41:36 tsutsui Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.47 2007/11/19 18:51:43 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kd.c,v 1.48 2008/03/30 01:41:36 tsutsui Exp $"); #include #include @@ -461,7 +461,7 @@ void cons_attach_input(struct cons_channel *cc, struct consdev *cn) { struct kd_softc *kd = &kd_softc; - struct kbd_softc *kds = cc->cc_dev; + struct kbd_softc *kds = cc->cc_private; struct kbd_state *ks; /* Share the keyboard state */ @@ -484,7 +484,7 @@ cons_attach_input(struct cons_channel *cc, struct consdev *cn) cn_tab->cn_pri = CN_INTERNAL; /* Set up initial PROM input channel for /dev/console */ - prom_cons_channel.cc_dev = NULL; + prom_cons_channel.cc_private = NULL; prom_cons_channel.cc_iopen = kd_rom_iopen; prom_cons_channel.cc_iclose = kd_rom_iclose; @@ -524,7 +524,7 @@ kdcninit(struct consdev *cn) kbd_xlate_init(ks); /* Set up initial PROM input channel for /dev/console */ - prom_cons_channel.cc_dev = NULL; + prom_cons_channel.cc_private = NULL; prom_cons_channel.cc_iopen = kd_rom_iopen; prom_cons_channel.cc_iclose = kd_rom_iclose; cons_attach_input(&prom_cons_channel);