fillw is in machine/cpu.h now.

diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index 1d47179..e3b331d 100644 (file)
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pcvt_ext.c,v 1.3 1996/04/18 17:48:29 niklas Exp $     */
+/*     $OpenBSD: pcvt_ext.c,v 1.4 1996/05/07 12:26:27 mickey Exp $     */
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -2330,7 +2330,7 @@ switch_screen(int n, int oldgrafx, int newgrafx)
                if(vsp->force24 && (vsp->vt_pure_mode == M_PUREVT) &&
                        (vgacs[vsp->vga_charset].screen_size == SIZ_25ROWS))
                {
-                       fillw(' ', vsp->Crtat + vsp->screen_rows * vsp->maxcol,
+                       fillw(' ', (caddr_t)vsp->Crtat + vsp->screen_rows * vsp->maxcol,
                                vsp->maxcol);
                }
        }

diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
index 53590fe..35ea387 100644 (file)
--- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pcvt_hdr.h,v 1.8 1996/05/07 07:22:27 deraadt Exp $    */
+/*     $OpenBSD: pcvt_hdr.h,v 1.9 1996/05/07 12:26:29 mickey Exp $     */
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -1194,7 +1194,7 @@ extern u_char             *saved_charsets[NVGAFONTS];
 extern void bcopyb(void *from, void *to, u_int length);
 #endif
 
-#if !PCVT_FREEBSD || (PCVT_FREEBSD < 200)
+#if (!PCVT_FREEBSD || (PCVT_FREEBSD < 200)) && (PCVT_NETBSD < 110)
 extern void fillw(U_short value, void *addr, u_int length);
 #endif
 

diff --git a/sys/arch/i386/isa/pcvt/pcvt_out.c b/sys/arch/i386/isa/pcvt/pcvt_out.c
index cdee550..7a09a68 100644 (file)
--- a/sys/arch/i386/isa/pcvt/pcvt_out.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_out.c
@@ -1293,7 +1293,7 @@ vt_coldinit(void)
 
                        if (filllen > 0)
                                fillw(user_attr | ' ',
-                                     svsp->Crtat+svsp->cur_offset,
+                                     (caddr_t)svsp->Crtat+svsp->cur_offset,
                                      filllen);
                }
                svsp->smode.mode = VT_AUTO;
@@ -1423,7 +1423,7 @@ vt_coldmalloc(void)
                {
                        vs[nscr].Crtat = vs[nscr].Memory;
                        fillw(user_attr | ' ',
-                               vs[nscr].Crtat,
+                               (caddr_t)vs[nscr].Crtat,
                                vs[nscr].maxcol * vs[nscr].screen_rowsize);
                        totalscreens++;
                }
@@ -1643,7 +1643,7 @@ set_emulation_mode(struct video_state *svsp, int mode)
        else if(mode == M_PUREVT)       /* hp/vt-mode -> vt-pure */
        {
                fillw(user_attr | ' ',
-                     svsp->Crtat + svsp->screen_rows * svsp->maxcol,
+                     (caddr_t)svsp->Crtat + svsp->screen_rows * svsp->maxcol,
                      (svsp->screen_rowsize - svsp->screen_rows)
                      * svsp->maxcol);
 
@@ -1919,7 +1919,7 @@ vt_col(struct video_state *svsp, int cols)
                swritefkl(0,(u_char *)"132     COLUMNS*",svsp);
 
        fillw(user_attr | ' ',
-               svsp->Crtat,
+               (caddr_t)svsp->Crtat,
                svsp->maxcol * svsp->screen_rowsize);
 
        clr_parms(svsp);                /* escape parameter init */
@@ -1966,7 +1966,7 @@ update_hp(struct video_state *svsp)
                return;
 
        fillw (user_attr | ' ',
-              svsp->Crtat + svsp->screen_rows * svsp->maxcol,
+              (caddr_t)svsp->Crtat + svsp->screen_rows * svsp->maxcol,
               (svsp->screen_rowsize - svsp->screen_rows) * svsp->maxcol);
 
        if (!svsp->labels_on)

diff --git a/sys/arch/i386/isa/pcvt/pcvt_sup.c b/sys/arch/i386/isa/pcvt/pcvt_sup.c
index 97c6583..32b226c 100644 (file)
--- a/sys/arch/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_sup.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pcvt_sup.c,v 1.2 1996/04/18 17:48:36 niklas Exp $     */
+/*     $OpenBSD: pcvt_sup.c,v 1.3 1996/05/07 12:26:32 mickey Exp $     */
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -1087,11 +1087,11 @@ set_charset(struct video_state *svsp, int curvgacs)
                }
                if (newrows < newsize)
                        fillw(user_attr | ' ',
-                             svsp->Crtat + newrows * svsp->maxcol,
+                             (caddr_t)svsp->Crtat + newrows * svsp->maxcol,
                              (newsize - newrows) * svsp->maxcol);
        } else if (oldrows < newsize)
                fillw(user_attr | ' ',
-                     svsp->Crtat + oldrows * svsp->maxcol,
+                     (caddr_t)svsp->Crtat + oldrows * svsp->maxcol,
                      (newsize - oldrows) * svsp->maxcol);
 
        svsp->screen_rowsize = newsize;
@@ -1906,7 +1906,7 @@ scrnsv_timedout(void *arg)
        {
                /* second call, now blank the screen */
                /* fill screen with blanks */
-               fillw(/* (BLACK<<8) + */ ' ', vsp->Crtat, scrnsv_size / 2);
+               fillw(/* (BLACK<<8) + */ ' ', (caddr_t)vsp->Crtat, scrnsv_size / 2);
 
 #if PCVT_PRETTYSCRNS
                scrnsv_current = vsp->Crtat;

diff --git a/sys/arch/i386/isa/pcvt/pcvt_vtf.c b/sys/arch/i386/isa/pcvt/pcvt_vtf.c
index 6e2056d..0c3e1bb 100644 (file)
--- a/sys/arch/i386/isa/pcvt/pcvt_vtf.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_vtf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pcvt_vtf.c,v 1.2 1996/04/18 17:48:37 niklas Exp $     */
+/*     $OpenBSD: pcvt_vtf.c,v 1.3 1996/05/07 12:26:33 mickey Exp $     */
 
 /*
  * Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -322,20 +322,20 @@ vt_clreos(struct video_state *svsp)
        switch(svsp->parms[0])
        {
                case 0:
-                       fillw(user_attr | ' ', svsp->Crtat + svsp->cur_offset,
+                       fillw(user_attr | ' ', (caddr_t)svsp->Crtat + svsp->cur_offset,
                                svsp->Crtat +
                                (svsp->maxcol * svsp->screen_rows) -
                                (svsp->Crtat + svsp->cur_offset));
                        break;
 
                case 1:
-                       fillw(user_attr | ' ', svsp->Crtat,
+                       fillw(user_attr | ' ', (caddr_t)svsp->Crtat,
                                svsp->Crtat + svsp->cur_offset -
                                svsp->Crtat + 1 );
                        break;
 
                case 2:
-                       fillw(user_attr | ' ', svsp->Crtat,
+                       fillw(user_attr | ' ', (caddr_t)svsp->Crtat,
                                svsp->maxcol * svsp->screen_rows);
                        break;
        }
@@ -351,19 +351,19 @@ vt_clreol(struct video_state *svsp)
        {
                case 0:
                        fillw(user_attr | ' ',
-                               svsp->Crtat + svsp->cur_offset,
+                               (caddr_t)svsp->Crtat + svsp->cur_offset,
                                svsp->maxcol-svsp->col);
                        break;
 
                case 1:
                        fillw(user_attr | ' ',
-                               svsp->Crtat + svsp->cur_offset - svsp->col,
+                               (caddr_t)svsp->Crtat + svsp->cur_offset - svsp->col,
                                svsp->col + 1);
                        break;
 
                case 2:
                        fillw(user_attr | ' ',
-                               svsp->Crtat + svsp->cur_offset - svsp->col,
+                               (caddr_t)svsp->Crtat + svsp->cur_offset - svsp->col,
                                svsp->maxcol);
                        break;
        }
@@ -440,7 +440,7 @@ vt_curadr(struct video_state *svsp)
 void
 vt_ris(struct video_state *svsp)
 {
-       fillw(user_attr | ' ', svsp->Crtat, svsp->maxcol * svsp->screen_rows);
+       fillw(user_attr | ' ', (caddr_t)svsp->Crtat, svsp->maxcol * svsp->screen_rows);
        svsp->cur_offset = 0;           /* cursor upper left corner */
        svsp->col = 0;
        svsp->row = 0;
@@ -1297,7 +1297,7 @@ vt_il(struct video_state *svsp)
                          svsp->maxcol * (svsp->scrr_end-svsp->row+1-p) * CHR );
 
                    fillw(user_attr | ' ',
-                         svsp->Crtat + svsp->cur_offset,
+                         (caddr_t)svsp->Crtat + svsp->cur_offset,
                          p * svsp->maxcol);
                }
        }
@@ -1354,7 +1354,7 @@ vt_dl(struct video_state *svsp)
                          svsp->maxcol * (svsp->scrr_end-svsp->row+1-p) * CHR );
 
                    fillw(user_attr | ' ',
-                         svsp->Crtat + ((svsp->scrr_end-p+1) * svsp->maxcol),
+                         (caddr_t)svsp->Crtat + ((svsp->scrr_end-p+1) * svsp->maxcol),
                          p * svsp->maxcol);
                }
        }
@@ -1429,7 +1429,7 @@ vt_ech(struct video_state *svsp)
        else if(p > svsp->maxcol-svsp->col)
                p = svsp->maxcol-svsp->col;
 
-       fillw(user_attr | ' ', (svsp->Crtat + svsp->cur_offset), p);
+       fillw(user_attr | ' ', (caddr_t)(svsp->Crtat + svsp->cur_offset), p);
 }
 
 /*---------------------------------------------------------------------------*
@@ -2021,7 +2021,7 @@ roll_up(struct video_state *svsp, int n)
        }
 
        fillw(  user_attr | ' ',
-               svsp->Crtat + ((svsp->scrr_end - n + 1) * svsp->maxcol),
+               (caddr_t)svsp->Crtat + ((svsp->scrr_end - n + 1) * svsp->maxcol),
                n * svsp->maxcol);
 
 /*XXX*/        if(svsp->scroll_lock && svsp->openf && curproc)
@@ -2075,7 +2075,7 @@ roll_down(struct video_state *svsp, int n)
        }
 
        fillw(  user_attr | ' ',
-               svsp->Crtat + (svsp->scrr_beg * svsp->maxcol),
+               (caddr_t)svsp->Crtat + (svsp->scrr_beg * svsp->maxcol),
                n * svsp->maxcol);
 
 /*XXX*/        if(svsp->scroll_lock && svsp->openf && curproc)