summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/dev/vga.c14
-rw-r--r--sys/arch/alpha/pci/tga.c3
-rw-r--r--sys/arch/alpha/tc/cfb.c3
-rw-r--r--sys/arch/alpha/tc/sfb.c3
-rw-r--r--sys/arch/alpha/wscons/wscons_emul.c10
-rw-r--r--sys/arch/alpha/wscons/wscons_raster.h3
-rw-r--r--sys/arch/alpha/wscons/wscons_rops.c12
-rw-r--r--sys/arch/alpha/wscons/wsconsvar.h3
-rw-r--r--sys/dev/ic/vga.c14
-rw-r--r--sys/dev/wscons/wscons_emul.c10
-rw-r--r--sys/dev/wscons/wscons_raster.h3
-rw-r--r--sys/dev/wscons/wscons_rops.c12
-rw-r--r--sys/dev/wscons/wsconsvar.h3
13 files changed, 78 insertions, 15 deletions
diff --git a/sys/arch/alpha/dev/vga.c b/sys/arch/alpha/dev/vga.c
index a67d5dd65d6..85f5c349ad0 100644
--- a/sys/arch/alpha/dev/vga.c
+++ b/sys/arch/alpha/dev/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.5 1997/07/31 04:03:43 kstailey Exp $ */
+/* $OpenBSD: vga.c,v 1.6 1997/07/31 13:40:01 kstailey Exp $ */
/* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */
/*
@@ -50,6 +50,7 @@ void vga_copycols __P((void *, int, int, int, int));
void vga_erasecols __P((void *, int, int, int));
void vga_copyrows __P((void *, int, int, int));
void vga_eraserows __P((void *, int, int));
+void vga_set_attr __P((void *, int));
struct wscons_emulfuncs vga_emulfuncs = {
vga_cursor,
@@ -58,6 +59,7 @@ struct wscons_emulfuncs vga_emulfuncs = {
vga_erasecols,
vga_copyrows,
vga_eraserows,
+ vga_set_attr,
};
int vgaprint __P((void *, const char *));
@@ -350,3 +352,13 @@ vga_eraserows(id, startrow, nrows)
bus_space_set_region_2(vc->vc_memt, vc->vc_memh, off, val, count);
}
+
+void
+vga_set_attr(id, val)
+ void *id;
+ int val;
+{
+ struct vga_config *vc = id;
+
+ vc->vc_so = val;
+}
diff --git a/sys/arch/alpha/pci/tga.c b/sys/arch/alpha/pci/tga.c
index b22c9f5f8f1..dd27161a797 100644
--- a/sys/arch/alpha/pci/tga.c
+++ b/sys/arch/alpha/pci/tga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tga.c,v 1.9 1997/01/24 19:58:00 niklas Exp $ */
+/* $OpenBSD: tga.c,v 1.10 1997/07/31 13:40:02 kstailey Exp $ */
/* $NetBSD: tga.c,v 1.13 1996/12/05 01:39:37 cgd Exp $ */
/*
@@ -85,6 +85,7 @@ struct wscons_emulfuncs tga_emulfuncs = {
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
+ rcons_setattr,
};
int tgaioctl __P((void *, u_long, caddr_t, int, struct proc *));
diff --git a/sys/arch/alpha/tc/cfb.c b/sys/arch/alpha/tc/cfb.c
index 7a1176f5bba..894d6e454ca 100644
--- a/sys/arch/alpha/tc/cfb.c
+++ b/sys/arch/alpha/tc/cfb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cfb.c,v 1.7 1997/01/24 19:58:08 niklas Exp $ */
+/* $OpenBSD: cfb.c,v 1.8 1997/07/31 13:40:03 kstailey Exp $ */
/* $NetBSD: cfb.c,v 1.7 1996/12/05 01:39:39 cgd Exp $ */
/*
@@ -81,6 +81,7 @@ struct wscons_emulfuncs cfb_emulfuncs = {
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
+ rcons_setattr,
};
int cfbioctl __P((void *, u_long, caddr_t, int, struct proc *));
diff --git a/sys/arch/alpha/tc/sfb.c b/sys/arch/alpha/tc/sfb.c
index 0bbff844adf..8e012398bbe 100644
--- a/sys/arch/alpha/tc/sfb.c
+++ b/sys/arch/alpha/tc/sfb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sfb.c,v 1.7 1997/01/24 19:58:17 niklas Exp $ */
+/* $OpenBSD: sfb.c,v 1.8 1997/07/31 13:40:03 kstailey Exp $ */
/* $NetBSD: sfb.c,v 1.7 1996/12/05 01:39:44 cgd Exp $ */
/*
@@ -81,6 +81,7 @@ struct wscons_emulfuncs sfb_emulfuncs = {
rcons_erasecols,
rcons_copyrows,
rcons_eraserows,
+ rcons_setattr,
};
int sfbioctl __P((void *, u_long, caddr_t, int, struct proc *));
diff --git a/sys/arch/alpha/wscons/wscons_emul.c b/sys/arch/alpha/wscons/wscons_emul.c
index 57c3bdb4e8f..3b472714570 100644
--- a/sys/arch/alpha/wscons/wscons_emul.c
+++ b/sys/arch/alpha/wscons/wscons_emul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_emul.c,v 1.10 1997/07/31 04:48:11 kstailey Exp $ */
+/* $OpenBSD: wscons_emul.c,v 1.11 1997/07/31 13:40:04 kstailey Exp $ */
/* $NetBSD: wscons_emul.c,v 1.7 1996/11/19 05:23:13 cgd Exp $ */
/*
@@ -370,6 +370,14 @@ wscons_emul_docontrol(we, c)
break;
case 'm': /* video attributes */
/* 7 for so; 0 for se */
+ switch (we->ac_args[0]) {
+ case 7:
+ (we->ac_ef->wef_set_attr)(we->ac_efa, 1);
+ break;
+ case 0:
+ (we->ac_ef->wef_set_attr)(we->ac_efa, 0);
+ break;
+ }
break;
}
}
diff --git a/sys/arch/alpha/wscons/wscons_raster.h b/sys/arch/alpha/wscons/wscons_raster.h
index 5a1d4a6b336..2a1a7c2a800 100644
--- a/sys/arch/alpha/wscons/wscons_raster.h
+++ b/sys/arch/alpha/wscons/wscons_raster.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_raster.h,v 1.3 1996/10/30 22:41:50 niklas Exp $ */
+/* $OpenBSD: wscons_raster.h,v 1.4 1997/07/31 13:40:05 kstailey Exp $ */
/* $NetBSD: wscons_raster.h,v 1.2 1996/07/09 00:55:47 cgd Exp $ */
/*
@@ -92,5 +92,6 @@ void rcons_copycols __P((void *, int, int, int, int));
void rcons_erasecols __P((void *, int, int, int));
void rcons_copyrows __P((void *, int, int, int));
void rcons_eraserows __P((void *, int, int));
+void rcons_setattr __P((void *, int));
#endif /* _DEV_PSEUDO_RCONS_H_ */
diff --git a/sys/arch/alpha/wscons/wscons_rops.c b/sys/arch/alpha/wscons/wscons_rops.c
index 24a461cca38..821d7b76523 100644
--- a/sys/arch/alpha/wscons/wscons_rops.c
+++ b/sys/arch/alpha/wscons/wscons_rops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_rops.c,v 1.3 1996/10/30 22:41:55 niklas Exp $ */
+/* $OpenBSD: wscons_rops.c,v 1.4 1997/07/31 13:40:05 kstailey Exp $ */
/* $NetBSD: wscons_rops.c,v 1.1 1996/04/12 02:00:55 cgd Exp $ */
/*
@@ -117,7 +117,7 @@ rcons_putstr(id, row, col, str, n)
}
/*
- * Possibly change to white-on-black or black-on-white modes.
+ * Possibly change entire display to white-on-black or black-on-white modes.
*/
void
rcons_invert(id, inverted)
@@ -216,3 +216,11 @@ rcons_eraserows(id, startrow, nrows)
rc->rc_raswidth, ny, rc->rc_ras_blank,
(struct raster *) 0, 0, 0);
}
+
+void
+rcons_setattr(id, val)
+ void *id;
+ int val;
+{
+ /* XXX */
+}
diff --git a/sys/arch/alpha/wscons/wsconsvar.h b/sys/arch/alpha/wscons/wsconsvar.h
index 27a14d3f96d..780fee0cb12 100644
--- a/sys/arch/alpha/wscons/wsconsvar.h
+++ b/sys/arch/alpha/wscons/wsconsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsvar.h,v 1.4 1997/01/24 19:58:33 niklas Exp $ */
+/* $OpenBSD: wsconsvar.h,v 1.5 1997/07/31 13:40:06 kstailey Exp $ */
/* $NetBSD: wsconsvar.h,v 1.4 1996/11/19 05:17:00 cgd Exp $ */
/*
@@ -51,6 +51,7 @@ struct wscons_emulfuncs {
void (*wef_copyrows) __P((void *c, int srcrow, int dstrow,
int nrows));
void (*wef_eraserows) __P((void *c, int row, int nrows));
+ void (*wef_set_attr) __P((void *, int));
};
struct wscons_odev_spec {
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index a67d5dd65d6..85f5c349ad0 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga.c,v 1.5 1997/07/31 04:03:43 kstailey Exp $ */
+/* $OpenBSD: vga.c,v 1.6 1997/07/31 13:40:01 kstailey Exp $ */
/* $NetBSD: vga.c,v 1.3 1996/12/02 22:24:54 cgd Exp $ */
/*
@@ -50,6 +50,7 @@ void vga_copycols __P((void *, int, int, int, int));
void vga_erasecols __P((void *, int, int, int));
void vga_copyrows __P((void *, int, int, int));
void vga_eraserows __P((void *, int, int));
+void vga_set_attr __P((void *, int));
struct wscons_emulfuncs vga_emulfuncs = {
vga_cursor,
@@ -58,6 +59,7 @@ struct wscons_emulfuncs vga_emulfuncs = {
vga_erasecols,
vga_copyrows,
vga_eraserows,
+ vga_set_attr,
};
int vgaprint __P((void *, const char *));
@@ -350,3 +352,13 @@ vga_eraserows(id, startrow, nrows)
bus_space_set_region_2(vc->vc_memt, vc->vc_memh, off, val, count);
}
+
+void
+vga_set_attr(id, val)
+ void *id;
+ int val;
+{
+ struct vga_config *vc = id;
+
+ vc->vc_so = val;
+}
diff --git a/sys/dev/wscons/wscons_emul.c b/sys/dev/wscons/wscons_emul.c
index 57c3bdb4e8f..3b472714570 100644
--- a/sys/dev/wscons/wscons_emul.c
+++ b/sys/dev/wscons/wscons_emul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_emul.c,v 1.10 1997/07/31 04:48:11 kstailey Exp $ */
+/* $OpenBSD: wscons_emul.c,v 1.11 1997/07/31 13:40:04 kstailey Exp $ */
/* $NetBSD: wscons_emul.c,v 1.7 1996/11/19 05:23:13 cgd Exp $ */
/*
@@ -370,6 +370,14 @@ wscons_emul_docontrol(we, c)
break;
case 'm': /* video attributes */
/* 7 for so; 0 for se */
+ switch (we->ac_args[0]) {
+ case 7:
+ (we->ac_ef->wef_set_attr)(we->ac_efa, 1);
+ break;
+ case 0:
+ (we->ac_ef->wef_set_attr)(we->ac_efa, 0);
+ break;
+ }
break;
}
}
diff --git a/sys/dev/wscons/wscons_raster.h b/sys/dev/wscons/wscons_raster.h
index 5a1d4a6b336..2a1a7c2a800 100644
--- a/sys/dev/wscons/wscons_raster.h
+++ b/sys/dev/wscons/wscons_raster.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_raster.h,v 1.3 1996/10/30 22:41:50 niklas Exp $ */
+/* $OpenBSD: wscons_raster.h,v 1.4 1997/07/31 13:40:05 kstailey Exp $ */
/* $NetBSD: wscons_raster.h,v 1.2 1996/07/09 00:55:47 cgd Exp $ */
/*
@@ -92,5 +92,6 @@ void rcons_copycols __P((void *, int, int, int, int));
void rcons_erasecols __P((void *, int, int, int));
void rcons_copyrows __P((void *, int, int, int));
void rcons_eraserows __P((void *, int, int));
+void rcons_setattr __P((void *, int));
#endif /* _DEV_PSEUDO_RCONS_H_ */
diff --git a/sys/dev/wscons/wscons_rops.c b/sys/dev/wscons/wscons_rops.c
index 24a461cca38..821d7b76523 100644
--- a/sys/dev/wscons/wscons_rops.c
+++ b/sys/dev/wscons/wscons_rops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wscons_rops.c,v 1.3 1996/10/30 22:41:55 niklas Exp $ */
+/* $OpenBSD: wscons_rops.c,v 1.4 1997/07/31 13:40:05 kstailey Exp $ */
/* $NetBSD: wscons_rops.c,v 1.1 1996/04/12 02:00:55 cgd Exp $ */
/*
@@ -117,7 +117,7 @@ rcons_putstr(id, row, col, str, n)
}
/*
- * Possibly change to white-on-black or black-on-white modes.
+ * Possibly change entire display to white-on-black or black-on-white modes.
*/
void
rcons_invert(id, inverted)
@@ -216,3 +216,11 @@ rcons_eraserows(id, startrow, nrows)
rc->rc_raswidth, ny, rc->rc_ras_blank,
(struct raster *) 0, 0, 0);
}
+
+void
+rcons_setattr(id, val)
+ void *id;
+ int val;
+{
+ /* XXX */
+}
diff --git a/sys/dev/wscons/wsconsvar.h b/sys/dev/wscons/wsconsvar.h
index 27a14d3f96d..780fee0cb12 100644
--- a/sys/dev/wscons/wsconsvar.h
+++ b/sys/dev/wscons/wsconsvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsconsvar.h,v 1.4 1997/01/24 19:58:33 niklas Exp $ */
+/* $OpenBSD: wsconsvar.h,v 1.5 1997/07/31 13:40:06 kstailey Exp $ */
/* $NetBSD: wsconsvar.h,v 1.4 1996/11/19 05:17:00 cgd Exp $ */
/*
@@ -51,6 +51,7 @@ struct wscons_emulfuncs {
void (*wef_copyrows) __P((void *c, int srcrow, int dstrow,
int nrows));
void (*wef_eraserows) __P((void *c, int row, int nrows));
+ void (*wef_set_attr) __P((void *, int));
};
struct wscons_odev_spec {