summaryrefslogtreecommitdiff
path: root/sys/arch/luna88k/dev/omrasops.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/luna88k/dev/omrasops.c')
-rw-r--r--sys/arch/luna88k/dev/omrasops.c288
1 files changed, 261 insertions, 27 deletions
diff --git a/sys/arch/luna88k/dev/omrasops.c b/sys/arch/luna88k/dev/omrasops.c
index 43f7ad56bbf..889f68fdc9a 100644
--- a/sys/arch/luna88k/dev/omrasops.c
+++ b/sys/arch/luna88k/dev/omrasops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omrasops.c,v 1.10 2013/11/16 22:45:37 aoyama Exp $ */
+/* $OpenBSD: omrasops.c,v 1.11 2014/01/02 15:30:34 aoyama Exp $ */
/* $NetBSD: omrasops.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
/*-
@@ -50,17 +50,32 @@
#include <luna88k/dev/omrasops.h>
/* wscons emulator operations */
-int om_cursor(void *, int, int, int);
-int om_putchar(void *, int, int, u_int, long);
int om_copycols(void *, int, int, int, int);
int om_copyrows(void *, int, int, int num);
int om_erasecols(void *, int, int, int, long);
int om_eraserows(void *, int, int, long);
+int om1_cursor(void *, int, int, int);
+int om1_putchar(void *, int, int, u_int, long);
+int om4_cursor(void *, int, int, int);
+int om4_putchar(void *, int, int, u_int, long);
-/* internal functions (for 1bpp, in omrasops1.c) */
-int om_windowmove1(struct rasops_info *, u_int16_t, u_int16_t,
- u_int16_t, u_int16_t, u_int16_t, u_int16_t, int16_t,
- int16_t /* ignored */);
+/* depth-depended setup functions */
+void setup_omrasops1(struct rasops_info *);
+void setup_omrasops4(struct rasops_info *);
+
+/* internal functions for 1bpp/4bpp */
+int om1_windowmove(struct rasops_info *, u_int16_t, u_int16_t, u_int16_t,
+ u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t);
+int om4_windowmove(struct rasops_info *, u_int16_t, u_int16_t, u_int16_t,
+ u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t);
+
+/* MI function in src/sys/dev/rasops/rasops.c */
+int rasops_alloc_cattr(void *, int, int, int, long *);
+
+static int (*om_windowmove)(struct rasops_info *, u_int16_t, u_int16_t,
+ u_int16_t, u_int16_t, u_int16_t, u_int16_t, int16_t, int16_t);
+
+extern struct wsscreen_descr omfb_stdscreen;
#define ALL1BITS (~0U)
#define ALL0BITS (0U)
@@ -70,9 +85,10 @@ int om_windowmove1(struct rasops_info *, u_int16_t, u_int16_t,
/*
* Blit a character at the specified co-ordinates.
+ * - 1bpp version -
*/
int
-om_putchar(void *cookie, int row, int startcol, u_int uc, long attr)
+om1_putchar(void *cookie, int row, int startcol, u_int uc, long attr)
{
struct rasops_info *ri = cookie;
u_int8_t *p;
@@ -103,12 +119,11 @@ om_putchar(void *cookie, int row, int startcol, u_int uc, long attr)
glyph = (glyph << 8) | *fb++;
glyph <<= (4 - ri->ri_font->stride) * NBBY;
glyph = (glyph >> align) ^ inverse;
- W(p) = (R(p) & ~lmask) | (glyph & lmask);
+ *W(p) = (*R(p) & ~lmask) | (glyph & lmask);
p += scanspan;
height--;
}
- }
- else {
+ } else {
u_int8_t *q = p;
u_int32_t lhalf, rhalf;
@@ -118,10 +133,117 @@ om_putchar(void *cookie, int row, int startcol, u_int uc, long attr)
glyph = (glyph << 8) | *fb++;
glyph <<= (4 - ri->ri_font->stride) * NBBY;
lhalf = (glyph >> align) ^ inverse;
- W(p) = (R(p) & ~lmask) | (lhalf & lmask);
+ *W(p) = (*R(p) & ~lmask) | (lhalf & lmask);
+
p += BYTESDONE;
+
rhalf = (glyph << (BLITWIDTH - align)) ^ inverse;
- W(p) = (rhalf & rmask) | (R(p) & ~rmask);
+ *W(p) = (rhalf & rmask) | (*R(p) & ~rmask);
+
+ p = (q += scanspan);
+ height--;
+ }
+ }
+
+ return 0;
+}
+
+/*
+ * Blit a character at the specified co-ordinates
+ * - 4bpp version -
+ */
+int
+om4_putchar(void *cookie, int row, int startcol, u_int uc, long attr)
+{
+ struct rasops_info *ri = cookie;
+ u_int8_t *p;
+ int scanspan, startx, height, width, align, y;
+ u_int32_t lmask, rmask, glyph, glyphbg, fgpat, bgpat;
+ int i, fg, bg;
+ u_int8_t *fb;
+
+ scanspan = ri->ri_stride;
+ y = ri->ri_font->fontheight * row;
+ startx = ri->ri_font->fontwidth * startcol;
+ height = ri->ri_font->fontheight;
+ fb = (u_int8_t *)ri->ri_font->data +
+ (uc - ri->ri_font->firstchar) * ri->ri_fontscale;
+ ri->ri_ops.unpack_attr(cookie, attr, &fg, &bg, NULL);
+
+ p = (u_int8_t *)ri->ri_bits + y * scanspan + ((startx / 32) * 4);
+ align = startx & ALIGNMASK;
+ width = ri->ri_font->fontwidth + align;
+ lmask = ALL1BITS >> align;
+ rmask = ALL1BITS << (-width & ALIGNMASK);
+ if (width <= BLITWIDTH) {
+ lmask &= rmask;
+ while (height > 0) {
+ glyph = 0;
+ for (i = ri->ri_font->stride; i != 0; i--)
+ glyph = (glyph << 8) | *fb++;
+ glyph <<= (4 - ri->ri_font->stride) * NBBY;
+ glyph = (glyph >> align);
+ glyphbg = glyph ^ ALL1BITS;
+
+ fgpat = (fg & 0x01) ? glyph : 0;
+ bgpat = (bg & 0x01) ? glyphbg : 0;
+ *P0(p) = (*P0(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+ fgpat = (fg & 0x02) ? glyph : 0;
+ bgpat = (bg & 0x02) ? glyphbg : 0;
+ *P1(p) = (*P1(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+ fgpat = (fg & 0x04) ? glyph : 0;
+ bgpat = (bg & 0x04) ? glyphbg : 0;
+ *P2(p) = (*P2(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+ fgpat = (fg & 0x08) ? glyph : 0;
+ bgpat = (bg & 0x08) ? glyphbg : 0;
+ *P3(p) = (*P3(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+
+ p += scanspan;
+ height--;
+ }
+ } else {
+ u_int8_t *q = p;
+ u_int32_t lhalf, rhalf;
+ u_int32_t lhalfbg, rhalfbg;
+
+ while (height > 0) {
+ glyph = 0;
+ for (i = ri->ri_font->stride; i != 0; i--)
+ glyph = (glyph << 8) | *fb++;
+ glyph <<= (4 - ri->ri_font->stride) * NBBY;
+ lhalf = (glyph >> align);
+ lhalfbg = lhalf ^ ALL1BITS;
+
+ fgpat = (fg & 0x01) ? lhalf : 0;
+ bgpat = (bg & 0x01) ? lhalfbg : 0;
+ *P0(p) = (*P0(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+ fgpat = (fg & 0x02) ? lhalf : 0;
+ bgpat = (bg & 0x02) ? lhalfbg : 0;
+ *P1(p) = (*P1(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+ fgpat = (fg & 0x04) ? lhalf : 0;
+ bgpat = (bg & 0x04) ? lhalfbg : 0;
+ *P2(p) = (*P2(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+ fgpat = (fg & 0x08) ? lhalf : 0;
+ bgpat = (bg & 0x08) ? lhalfbg : 0;
+ *P3(p) = (*P3(p) & ~lmask) | ((fgpat | bgpat) & lmask);
+
+ p += BYTESDONE;
+
+ rhalf = (glyph << (BLITWIDTH - align));
+ rhalfbg = rhalf ^ ALL1BITS;
+
+ fgpat = (fg & 0x01) ? rhalf : 0;
+ bgpat = (bg & 0x01) ? rhalfbg : 0;
+ *P0(p) = ((fgpat | bgpat) & rmask) | (*P0(p) & ~rmask);
+ fgpat = (fg & 0x02) ? rhalf : 0;
+ bgpat = (bg & 0x02) ? rhalfbg : 0;
+ *P1(p) = ((fgpat | bgpat) & rmask) | (*P1(p) & ~rmask);
+ fgpat = (fg & 0x04) ? rhalf : 0;
+ bgpat = (bg & 0x04) ? rhalfbg : 0;
+ *P2(p) = ((fgpat | bgpat) & rmask) | (*P2(p) & ~rmask);
+ fgpat = (fg & 0x08) ? rhalf : 0;
+ bgpat = (bg & 0x08) ? rhalfbg : 0;
+ *P3(p) = ((fgpat | bgpat) & rmask) | (*P3(p) & ~rmask);
p = (q += scanspan);
height--;
@@ -148,7 +270,7 @@ om_erasecols(void *cookie, int row, int col, int num, long attr)
* If this is too tricky for the simple raster ops engine,
* pass the fun to rasops.
*/
- if (om_windowmove1(ri, scol, srow, scol, srow, snum,
+ if ((*om_windowmove)(ri, scol, srow, scol, srow, snum,
ri->ri_font->fontheight, RR_CLEAR, 0xff ^ bg) != 0)
rasops_erasecols(cookie, row, col, num, attr);
@@ -167,12 +289,12 @@ om_eraserows(void *cookie, int row, int num, long attr)
bg ^= 0xff;
if (num == ri->ri_rows && (ri->ri_flg & RI_FULLCLEAR)) {
- rc = om_windowmove1(ri, 0, 0, 0, 0, ri->ri_width, ri->ri_height,
- RR_CLEAR, bg);
+ rc = (*om_windowmove)(ri, 0, 0, 0, 0, ri->ri_width,
+ ri->ri_height, RR_CLEAR, bg);
} else {
srow = row * ri->ri_font->fontheight + ri->ri_yorigin;
snum = num * ri->ri_font->fontheight;
- rc = om_windowmove1(ri, ri->ri_xorigin, srow, ri->ri_xorigin,
+ rc = (*om_windowmove)(ri, ri->ri_xorigin, srow, ri->ri_xorigin,
srow, ri->ri_emuwidth, snum, RR_CLEAR, bg);
}
if (rc != 0)
@@ -190,7 +312,7 @@ om_copyrows(void *cookie, int src, int dst, int n)
src *= ri->ri_font->fontheight;
dst *= ri->ri_font->fontheight;
- om_windowmove1(ri, ri->ri_xorigin, ri->ri_yorigin + src,
+ (*om_windowmove)(ri, ri->ri_xorigin, ri->ri_yorigin + src,
ri->ri_xorigin, ri->ri_yorigin + dst,
ri->ri_emuwidth, n, RR_COPY, 0xff);
@@ -207,7 +329,7 @@ om_copycols(void *cookie, int row, int src, int dst, int n)
dst *= ri->ri_font->fontwidth;
row *= ri->ri_font->fontheight;
- om_windowmove1(ri, ri->ri_xorigin + src, ri->ri_yorigin + row,
+ (*om_windowmove)(ri, ri->ri_xorigin + src, ri->ri_yorigin + row,
ri->ri_xorigin + dst, ri->ri_yorigin + row,
n, ri->ri_font->fontheight, RR_COPY, 0xff);
@@ -216,9 +338,10 @@ om_copycols(void *cookie, int row, int src, int dst, int n)
/*
* Position|{enable|disable} the cursor at the specified location.
+ * - 1bpp version -
*/
int
-om_cursor(void *cookie, int on, int row, int col)
+om1_cursor(void *cookie, int on, int row, int col)
{
struct rasops_info *ri = cookie;
u_int8_t *p;
@@ -251,21 +374,102 @@ om_cursor(void *cookie, int on, int row, int col)
if (width <= BLITWIDTH) {
lmask &= rmask;
while (height > 0) {
- image = R(p);
- W(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *R(p);
+ *W(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
p += scanspan;
height--;
}
+ } else {
+ u_int8_t *q = p;
+
+ while (height > 0) {
+ image = *R(p);
+ *W(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ p += BYTESDONE;
+
+ image = *R(p);
+ *W(p) = ((image ^ ALL1BITS) & rmask) | (image & ~rmask);
+ p = (q += scanspan);
+ height--;
+ }
+ }
+ ri->ri_flg ^= RI_CURSOR;
+
+ return 0;
+}
+
+/*
+ * Position|{enable|disable} the cursor at the specified location
+ * - 4bpp version -
+ */
+int
+om4_cursor(void *cookie, int on, int row, int col)
+{
+ struct rasops_info *ri = cookie;
+ u_int8_t *p;
+ int scanspan, startx, height, width, align, y;
+ u_int32_t lmask, rmask, image;
+
+ if (!on) {
+ /* make sure it's on */
+ if ((ri->ri_flg & RI_CURSOR) == 0)
+ return 0;
+
+ row = ri->ri_crow;
+ col = ri->ri_ccol;
+ } else {
+ /* unpaint the old copy. */
+ ri->ri_crow = row;
+ ri->ri_ccol = col;
}
- else {
+
+ scanspan = ri->ri_stride;
+ y = ri->ri_font->fontheight * row;
+ startx = ri->ri_font->fontwidth * col;
+ height = ri->ri_font->fontheight;
+
+ p = (u_int8_t *)ri->ri_bits + y * scanspan + ((startx / 32) * 4);
+ align = startx & ALIGNMASK;
+ width = ri->ri_font->fontwidth + align;
+ lmask = ALL1BITS >> align;
+ rmask = ALL1BITS << (-width & ALIGNMASK);
+ if (width <= BLITWIDTH) {
+ lmask &= rmask;
+ while (height > 0) {
+ image = *P0(p);
+ *P0(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P1(p);
+ *P1(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P2(p);
+ *P2(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P3(p);
+ *P3(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ p += scanspan;
+ height--;
+ }
+ } else {
u_int8_t *q = p;
while (height > 0) {
- image = R(p);
- W(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P0(p);
+ *P0(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P1(p);
+ *P1(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P2(p);
+ *P2(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+ image = *P3(p);
+ *P3(p) = (image & ~lmask) | ((image ^ ALL1BITS) & lmask);
+
p += BYTESDONE;
- image = R(p);
- W(p) = ((image ^ ALL1BITS) & rmask) | (image & ~rmask);
+
+ image = *P0(p);
+ *P0(p) = ((image ^ ALL1BITS) & rmask) | (image & ~rmask);
+ image = *P1(p);
+ *P1(p) = ((image ^ ALL1BITS) & rmask) | (image & ~rmask);
+ image = *P2(p);
+ *P2(p) = ((image ^ ALL1BITS) & rmask) | (image & ~rmask);
+ image = *P3(p);
+ *P3(p) = ((image ^ ALL1BITS) & rmask) | (image & ~rmask);
p = (q += scanspan);
height--;
@@ -275,3 +479,33 @@ om_cursor(void *cookie, int on, int row, int col)
return 0;
}
+
+/*
+ * After calling rasops_init(), set up our depth-depend emulops,
+ * block move function and capabilities.
+ */
+void
+setup_omrasops1(struct rasops_info *ri)
+{
+ om_windowmove = om1_windowmove;
+ ri->ri_ops.cursor = om1_cursor;
+ ri->ri_ops.putchar = om1_putchar;
+ omfb_stdscreen.capabilities
+ = ri->ri_caps & ~WSSCREEN_UNDERLINE;
+}
+
+void
+setup_omrasops4(struct rasops_info *ri)
+{
+ om_windowmove = om4_windowmove;
+ ri->ri_ops.cursor = om4_cursor;
+ ri->ri_ops.putchar = om4_putchar;
+ omfb_stdscreen.capabilities
+ = WSSCREEN_HILIT | WSSCREEN_WSCOLORS | WSSCREEN_REVERSE;
+ /*
+ * Since we set ri->ri_depth == 1, rasops_init() set
+ * rasops_alloc_mattr for us. But we use the color version,
+ * rasops_alloc_cattr, on 4bpp/8bpp frame buffer.
+ */
+ ri->ri_ops.alloc_attr = rasops_alloc_cattr;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 13:58:03 +0000