Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev Rename vc_ccol and vc_crow in struct pcdisplayscreen...
details: https://anonhg.NetBSD.org/src/rev/a37187d3a16f
branches: trunk
changeset: 533675:a37187d3a16f
user: junyoung <junyoung%NetBSD.org@localhost>
date: Sun Jul 07 06:36:32 2002 +0000
description:
Rename vc_ccol and vc_crow in struct pcdisplayscreen to cursorcol
and cursorrow, respectively, to be consistent with other members
in the structure.
diffstat:
sys/dev/ic/pcdisplay_subr.c | 20 ++++++++++----------
sys/dev/ic/pcdisplayvar.h | 4 ++--
sys/dev/ic/vga.c | 22 +++++++++++-----------
sys/dev/isa/ega.c | 22 +++++++++++-----------
sys/dev/isa/pcdisplay.c | 12 ++++++------
5 files changed, 40 insertions(+), 40 deletions(-)
diffs (280 lines):
diff -r 06cba344e774 -r a37187d3a16f sys/dev/ic/pcdisplay_subr.c
--- a/sys/dev/ic/pcdisplay_subr.c Sun Jul 07 00:46:20 2002 +0000
+++ b/sys/dev/ic/pcdisplay_subr.c Sun Jul 07 06:36:32 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_subr.c,v 1.22 2002/07/01 13:17:48 christos Exp $ */
+/* $NetBSD: pcdisplay_subr.c,v 1.23 2002/07/07 06:36:32 junyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.22 2002/07/01 13:17:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.23 2002/07/07 06:36:32 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,8 @@
*/
memt = scr->hdl->ph_memt;
memh = scr->hdl->ph_memh;
- off = (scr->vc_crow * scr->type->ncols + scr->vc_ccol) * 2 +
- scr->dispoffset;
+ off = (scr->cursorrow * scr->type->ncols + scr->cursorcol) * 2
+ + scr->dispoffset;
scr->cursortmp = bus_space_read_2(memt, memh, off);
bus_space_write_2(memt, memh, off, scr->cursortmp ^ 0x7700);
@@ -100,7 +100,7 @@
/* Remove old cursor image */
if (scr->cursoron) {
- off = scr->vc_crow * scr->type->ncols + scr->vc_ccol;
+ off = scr->cursorrow * scr->type->ncols + scr->cursorcol;
if (scr->active)
bus_space_write_2(memt, memh, scr->dispoffset + off * 2,
scr->cursortmp);
@@ -108,13 +108,13 @@
scr->mem[off] = scr->cursortmp;
}
- scr->vc_crow = row;
- scr->vc_ccol = col;
+ scr->cursorrow = row;
+ scr->cursorcol = col;
if ((scr->cursoron = on) == 0)
return;
- off = (scr->vc_crow * scr->type->ncols + scr->vc_ccol);
+ off = (scr->cursorrow * scr->type->ncols + scr->cursorcol);
if (scr->active) {
off = off * 2 + scr->dispoffset;
scr->cursortmp = bus_space_read_2(memt, memh, off);
@@ -127,8 +127,8 @@
struct pcdisplayscreen *scr = id;
int pos;
- scr->vc_crow = row;
- scr->vc_ccol = col;
+ scr->cursorrow = row;
+ scr->cusrorcol = col;
scr->cursoron = on;
if (scr->active) {
diff -r 06cba344e774 -r a37187d3a16f sys/dev/ic/pcdisplayvar.h
--- a/sys/dev/ic/pcdisplayvar.h Sun Jul 07 00:46:20 2002 +0000
+++ b/sys/dev/ic/pcdisplayvar.h Sun Jul 07 06:36:32 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplayvar.h,v 1.9 2002/06/26 23:05:33 christos Exp $ */
+/* $NetBSD: pcdisplayvar.h,v 1.10 2002/07/07 06:36:33 junyoung Exp $ */
/*
* Copyright (c) 1998
@@ -46,7 +46,7 @@
#ifdef PCDISPLAY_SOFTCURSOR
int cursortmp; /* glyph & attribute behind software cursor */
#endif
- int vc_ccol, vc_crow; /* current cursor position */
+ int cursorcol, cursorrow; /* current cursor position */
int dispoffset; /* offset of displayed area in video mem */
};
diff -r 06cba344e774 -r a37187d3a16f sys/dev/ic/vga.c
--- a/sys/dev/ic/vga.c Sun Jul 07 00:46:20 2002 +0000
+++ b/sys/dev/ic/vga.c Sun Jul 07 06:36:32 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.59 2002/07/04 14:37:11 junyoung Exp $ */
+/* $NetBSD: vga.c,v 1.60 2002/07/07 06:36:33 junyoung Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.59 2002/07/04 14:37:11 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.60 2002/07/07 06:36:33 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -516,8 +516,8 @@
scr->pcs.dispoffset = scr->mindispoffset;
}
- scr->pcs.vc_crow = cpos / type->ncols;
- scr->pcs.vc_ccol = cpos % type->ncols;
+ scr->pcs.cursorrow = cpos / type->ncols;
+ scr->pcs.cursorcol = cpos % type->ncols;
pcdisplay_cursor_init(&scr->pcs, existing);
#ifdef __alpha__
@@ -708,8 +708,8 @@
vga_init_screen(&vga_console_vc, &vga_console_screen, scr, 1, &defattr);
wsdisplay_cnattach(scr, &vga_console_screen,
- vga_console_screen.pcs.vc_ccol,
- vga_console_screen.pcs.vc_crow,
+ vga_console_screen.pcs.cursorcol,
+ vga_console_screen.pcs.cursorrow,
defattr);
vgaconsole = 1;
@@ -848,8 +848,8 @@
}
*cookiep = scr;
- *curxp = scr->pcs.vc_ccol;
- *curyp = scr->pcs.vc_crow;
+ *curxp = scr->pcs.cursorcol;
+ *curyp = scr->pcs.cursorrow;
return (0);
}
@@ -1021,7 +1021,7 @@
vc->active = scr;
pcdisplay_cursor(&scr->pcs, scr->pcs.cursoron,
- scr->pcs.vc_crow, scr->pcs.vc_ccol);
+ scr->pcs.cursorrow, scr->pcs.cursorcol);
vc->wantedscreen = 0;
if (vc->switchcb)
@@ -1103,7 +1103,7 @@
if (cursoron)
pcdisplay_cursor(&scr->pcs, 0,
- scr->pcs.vc_crow, scr->pcs.vc_ccol);
+ scr->pcs.cursorrow, scr->pcs.cursorcol);
#endif
/* scroll up whole screen */
if ((scr->pcs.dispoffset + srcrow * ncols * 2)
@@ -1123,7 +1123,7 @@
#ifdef PCDISPLAY_SOFTCURSOR
if (cursoron)
pcdisplay_cursor(&scr->pcs, 1,
- scr->pcs.vc_crow, scr->pcs.vc_ccol);
+ scr->pcs.cursorrow, scr->pcs.cursorcol);
#endif
} else {
bus_space_copy_region_2(memt, memh,
diff -r 06cba344e774 -r a37187d3a16f sys/dev/isa/ega.c
--- a/sys/dev/isa/ega.c Sun Jul 07 00:46:20 2002 +0000
+++ b/sys/dev/isa/ega.c Sun Jul 07 06:36:32 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ega.c,v 1.10 2002/07/04 14:37:11 junyoung Exp $ */
+/* $NetBSD: ega.c,v 1.11 2002/07/07 06:36:34 junyoung Exp $ */
/*
* Copyright (c) 1999
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.10 2002/07/04 14:37:11 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.11 2002/07/07 06:36:34 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -384,8 +384,8 @@
scr->pcs.dispoffset = scr->mindispoffset;
}
- scr->pcs.vc_crow = cpos / type->ncols;
- scr->pcs.vc_ccol = cpos % type->ncols;
+ scr->pcs.cursorrow = cpos / type->ncols;
+ scr->pcs.cursorcol = cpos % type->ncols;
pcdisplay_cursor_init(&scr->pcs, existing);
res = ega_allocattr(scr, 0, 0, 0, attrp);
@@ -574,8 +574,8 @@
ega_console_dc.active = &ega_console_screen;
wsdisplay_cnattach(scr, &ega_console_screen,
- ega_console_screen.pcs.vc_ccol,
- ega_console_screen.pcs.vc_crow,
+ ega_console_screen.pcs.cursorcol,
+ ega_console_screen.pcs.cursorrow,
defattr);
egaconsole = 1;
@@ -651,8 +651,8 @@
}
*cookiep = scr;
- *curxp = scr->pcs.vc_ccol;
- *curyp = scr->pcs.vc_crow;
+ *curxp = scr->pcs.cursorcol;
+ *curyp = scr->pcs.cursorrow;
return (0);
}
@@ -783,7 +783,7 @@
vc->active = scr;
pcdisplay_cursor(&scr->pcs, scr->pcs.cursoron,
- scr->pcs.vc_crow, scr->pcs.vc_ccol);
+ scr->pcs.cursorrow, scr->pcs.cursorcol);
vc->wantedscreen = 0;
if (vc->switchcb)
@@ -905,7 +905,7 @@
if (cursoron)
pcdisplay_cursor(&scr->pcs, 0,
- scr->pcs.vc_crow, scr->pcs.vc_ccol);
+ scr->pcs.cursorrow, scr->pcs.cursorcol);
#endif
/* scroll up whole screen */
if ((scr->pcs.dispoffset + srcrow * ncols * 2)
@@ -925,7 +925,7 @@
#ifdef PCDISPLAY_SOFTCURSOR
if (cursoron)
pcdisplay_cursor(&scr->pcs, 1,
- scr->pcs.vc_crow, scr->pcs.vc_ccol);
+ scr->pcs.cursorrow, scr->pcs.cursorcol);
#endif
} else {
bus_space_copy_region_2(memt, memh,
diff -r 06cba344e774 -r a37187d3a16f sys/dev/isa/pcdisplay.c
--- a/sys/dev/isa/pcdisplay.c Sun Jul 07 00:46:20 2002 +0000
+++ b/sys/dev/isa/pcdisplay.c Sun Jul 07 06:36:32 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.18 2002/07/04 14:37:11 junyoung Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.19 2002/07/07 06:36:34 junyoung Exp $ */
/*
* Copyright (c) 1998
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.18 2002/07/04 14:37:11 junyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.19 2002/07/07 06:36:34 junyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -221,8 +221,8 @@
dc->pcs.dispoffset = 0;
- dc->pcs.vc_crow = cpos / pcdisplay_scr.ncols;
- dc->pcs.vc_ccol = cpos % pcdisplay_scr.ncols;
+ dc->pcs.cursorrow = cpos / pcdisplay_scr.ncols;
+ dc->pcs.cursorcol = cpos % pcdisplay_scr.ncols;
pcdisplay_cursor_init(&dc->pcs, 1);
}
@@ -362,8 +362,8 @@
pcdisplay_init(&pcdisplay_console_dc, iot, memt, mono);
wsdisplay_cnattach(&pcdisplay_scr, &pcdisplay_console_dc,
- pcdisplay_console_dc.pcs.vc_ccol,
- pcdisplay_console_dc.pcs.vc_crow,
+ pcdisplay_console_dc.pcs.cursorcol,
+ pcdisplay_console_dc.pcs.cursorrow,
FG_LIGHTGREY | BG_BLACK);
pcdisplayconsole = 1;
Home |
Main Index |
Thread Index |
Old Index