Merge with sys/isa/syscons_isa.c and sys/dev/syscons/syscons.c

revisions 1.6 and 1.308, respectively.

Pointed-out by:		yokota

3 files changed, 15 insertions, 13 deletions

diff --git a/sys/pc98/cbus/syscons_cbus.c b/sys/pc98/cbus/syscons_cbus.c
index 5bca2d0..c30f702 100644
--- a/sys/pc98/cbus/syscons_cbus.c
+++ b/sys/pc98/cbus/syscons_cbus.c
@@ -1,5 +1,5 @@
 /*-
- * $Id: $
+ * $Id: syscons_pc98.c,v 1.1 1999/06/24 10:51:40 kato Exp $
  */
 
 #include "sc.h"
@@ -42,7 +42,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, };
@@ -88,7 +88,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;
@@ -111,7 +111,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))
diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c
index 3703e71..5c3f83c 100644
--- a/sys/pc98/pc98/syscons.c
+++ b/sys/pc98/pc98/syscons.c
@@ -25,7 +25,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.c,v 1.121 1999/06/03 13:50:54 kato Exp $
+ *  $Id: syscons.c,v 1.122 1999/06/24 10:51:38 kato Exp $
  */
 
 #include "sc.h"
@@ -2674,8 +2674,9 @@ scan_esc(scr_stat *scp, u_char c)
 	    if (n > scp->xsize - scp->xpos)
 		n = scp->xsize - scp->xpos;
 	    count = scp->xsize - (scp->xpos + n);
-	    sc_vtb_delete(&scp->vtb, scp->cursor_pos, n,
-			  sc->scr_map[0x20], scp->term.cur_color);
+	    sc_vtb_move(&scp->vtb, scp->cursor_pos + n, scp->cursor_pos, count);
+	    sc_vtb_erase(&scp->vtb, scp->cursor_pos + count, n,
+			 sc->scr_map[0x20], scp->term.cur_color);
 	    mark_for_update(scp, scp->cursor_pos);
 	    mark_for_update(scp, scp->cursor_pos + n + count - 1);
 	    break;
@@ -2685,8 +2686,9 @@ scan_esc(scr_stat *scp, u_char c)
 	    if (n > scp->xsize - scp->xpos)
 		n = scp->xsize - scp->xpos;
 	    count = scp->xsize - (scp->xpos + n);
-	    sc_vtb_ins(&scp->vtb, scp->cursor_pos, n,
-		       sc->scr_map[0x20], scp->term.cur_color);
+	    sc_vtb_move(&scp->vtb, scp->cursor_pos, scp->cursor_pos + n, count);
+	    sc_vtb_erase(&scp->vtb, scp->cursor_pos, n,
+			 sc->scr_map[0x20], scp->term.cur_color);
 	    mark_for_update(scp, scp->cursor_pos);
 	    mark_for_update(scp, scp->cursor_pos + n + count - 1);
 	    break;
diff --git a/sys/pc98/pc98/syscons_pc98.c b/sys/pc98/pc98/syscons_pc98.c
index 5bca2d0..c30f702 100644
--- a/sys/pc98/pc98/syscons_pc98.c
+++ b/sys/pc98/pc98/syscons_pc98.c
@@ -1,5 +1,5 @@
 /*-
- * $Id: $
+ * $Id: syscons_pc98.c,v 1.1 1999/06/24 10:51:40 kato Exp $
  */
 
 #include "sc.h"
@@ -42,7 +42,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, };
@@ -88,7 +88,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;
@@ -111,7 +111,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))