add hardware cursor support
This commit is contained in:
macallan
parent
9abba19570
commit
1e54ba9802
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cgfourteen.c,v 1.49 2007/07/30 18:20:09 macallan Exp $ */
|
||||
/* $NetBSD: cgfourteen.c,v 1.50 2007/07/30 23:28:13 macallan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996
|
||||
|
|
@ -149,6 +149,9 @@ static void cg14_init_cmap(struct cgfourteen_softc *);
|
|||
static int cg14_putcmap(struct cgfourteen_softc *, struct wsdisplay_cmap *);
|
||||
static int cg14_getcmap(struct cgfourteen_softc *, struct wsdisplay_cmap *);
|
||||
static void cg14_set_depth(struct cgfourteen_softc *, int);
|
||||
static void cg14_move_cursor(struct cgfourteen_softc *, int, int);
|
||||
static int cg14_do_cursor(struct cgfourteen_softc *,
|
||||
struct wsdisplay_cursor *);
|
||||
#endif
|
||||
|
||||
#if defined(RASTERCONSOLE) && (NWSDISPLAY > 0)
|
||||
|
|
@ -493,8 +496,17 @@ cgfourteenioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
|
|||
static void
|
||||
cgfourteenunblank(struct device *dev)
|
||||
{
|
||||
struct cgfourteen_softc *sc = (struct cgfourteen_softc *)dev;
|
||||
|
||||
cg14_set_video((struct cgfourteen_softc *)dev, 1);
|
||||
cg14_set_video(sc, 1);
|
||||
#if NWSDISPLAY > 0
|
||||
if (sc->sc_mode != WSDISPLAYIO_MODE_EMUL) {
|
||||
cg14_set_depth(sc, 8);
|
||||
cg14_init_cmap(sc);
|
||||
vcons_redraw_screen(sc->sc_vd.active);
|
||||
sc->sc_mode = WSDISPLAYIO_MODE_EMUL;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -938,6 +950,9 @@ cg14_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
|
|||
if (new_mode != sc->sc_mode) {
|
||||
sc->sc_mode = new_mode;
|
||||
if(new_mode == WSDISPLAYIO_MODE_EMUL) {
|
||||
bus_space_write_1(sc->sc_bustag,
|
||||
sc->sc_regh,
|
||||
CG14_CURSOR_CONTROL, 0);
|
||||
cg14_set_depth(sc, 8);
|
||||
cg14_init_cmap(sc);
|
||||
vcons_redraw_screen(ms);
|
||||
|
|
@ -946,6 +961,41 @@ cg14_ioctl(void *v, void *vs, u_long cmd, void *data, int flag,
|
|||
}
|
||||
}
|
||||
return 0;
|
||||
case WSDISPLAYIO_SVIDEO:
|
||||
cg14_set_video(sc, *(int *)data);
|
||||
return 0;
|
||||
case WSDISPLAYIO_GVIDEO:
|
||||
return cg14_get_video(sc) ?
|
||||
WSDISPLAYIO_VIDEO_ON : WSDISPLAYIO_VIDEO_OFF;
|
||||
case WSDISPLAYIO_GCURPOS:
|
||||
{
|
||||
struct wsdisplay_curpos *cp = (void *)data;
|
||||
|
||||
cp->x = sc->sc_cursor.cc_pos.x;
|
||||
cp->y = sc->sc_cursor.cc_pos.y;
|
||||
}
|
||||
return 0;
|
||||
case WSDISPLAYIO_SCURPOS:
|
||||
{
|
||||
struct wsdisplay_curpos *cp = (void *)data;
|
||||
|
||||
cg14_move_cursor(sc, cp->x, cp->y);
|
||||
}
|
||||
return 0;
|
||||
case WSDISPLAYIO_GCURMAX:
|
||||
{
|
||||
struct wsdisplay_curpos *cp = (void *)data;
|
||||
|
||||
cp->x = 32;
|
||||
cp->y = 32;
|
||||
}
|
||||
return 0;
|
||||
case WSDISPLAYIO_SCURSOR:
|
||||
{
|
||||
struct wsdisplay_cursor *cursor = (void *)data;
|
||||
|
||||
return cg14_do_cursor(sc, cursor);
|
||||
}
|
||||
}
|
||||
return EPASSTHROUGH;
|
||||
}
|
||||
|
|
@ -1026,4 +1076,99 @@ cg14_set_depth(struct cgfourteen_softc *sc, int depth)
|
|||
sc->sc_dev.dv_xname, depth);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
cg14_move_cursor(struct cgfourteen_softc *sc, int x, int y)
|
||||
{
|
||||
uint32_t pos;
|
||||
|
||||
sc->sc_cursor.cc_pos.x = x;
|
||||
sc->sc_cursor.cc_pos.y = y;
|
||||
pos = ((sc->sc_cursor.cc_pos.x - sc->sc_cursor.cc_hot.x ) << 16) |
|
||||
((sc->sc_cursor.cc_pos.y - sc->sc_cursor.cc_hot.y ) & 0xffff);
|
||||
bus_space_write_4(sc->sc_bustag, sc->sc_regh, CG14_CURSOR_X, pos);
|
||||
}
|
||||
|
||||
static int
|
||||
cg14_do_cursor(struct cgfourteen_softc *sc, struct wsdisplay_cursor *cur)
|
||||
{
|
||||
if (cur->which & WSDISPLAY_CURSOR_DOCUR) {
|
||||
|
||||
bus_space_write_1(sc->sc_bustag, sc->sc_regh,
|
||||
CG14_CURSOR_CONTROL, cur->enable ? CG14_CRSR_ENABLE : 0);
|
||||
}
|
||||
if (cur->which & WSDISPLAY_CURSOR_DOHOT) {
|
||||
|
||||
sc->sc_cursor.cc_hot.x = cur->hot.x;
|
||||
sc->sc_cursor.cc_hot.y = cur->hot.y;
|
||||
cur->which |= WSDISPLAY_CURSOR_DOPOS;
|
||||
}
|
||||
if (cur->which & WSDISPLAY_CURSOR_DOPOS) {
|
||||
|
||||
cg14_move_cursor(sc, cur->pos.x, cur->pos.y);
|
||||
}
|
||||
if (cur->which & WSDISPLAY_CURSOR_DOCMAP) {
|
||||
int i;
|
||||
uint32_t val;
|
||||
|
||||
for (i = 0; i < cur->cmap.count; i++) {
|
||||
val = (cur->cmap.red[i] ) |
|
||||
(cur->cmap.green[i] << 8) |
|
||||
(cur->cmap.blue[i] << 16);
|
||||
bus_space_write_4(sc->sc_bustag, sc->sc_regh,
|
||||
CG14_CURSOR_COLOR1 + ((i + cur->cmap.index) << 2),
|
||||
val);
|
||||
}
|
||||
}
|
||||
if (cur->which & WSDISPLAY_CURSOR_DOSHAPE) {
|
||||
uint32_t buffer[32], latch, tmp;
|
||||
int i;
|
||||
|
||||
memcpy(buffer, cur->mask, 128);
|
||||
for (i = 0; i < 32; i++) {
|
||||
latch = 0;
|
||||
tmp = buffer[i] & 0x80808080;
|
||||
latch |= tmp >> 7;
|
||||
tmp = buffer[i] & 0x40404040;
|
||||
latch |= tmp >> 5;
|
||||
tmp = buffer[i] & 0x20202020;
|
||||
latch |= tmp >> 3;
|
||||
tmp = buffer[i] & 0x10101010;
|
||||
latch |= tmp >> 1;
|
||||
tmp = buffer[i] & 0x08080808;
|
||||
latch |= tmp << 1;
|
||||
tmp = buffer[i] & 0x04040404;
|
||||
latch |= tmp << 3;
|
||||
tmp = buffer[i] & 0x02020202;
|
||||
latch |= tmp << 5;
|
||||
tmp = buffer[i] & 0x01010101;
|
||||
latch |= tmp << 7;
|
||||
bus_space_write_4(sc->sc_bustag, sc->sc_regh,
|
||||
CG14_CURSOR_PLANE0 + (i << 2), latch);
|
||||
}
|
||||
memcpy(buffer, cur->image, 128);
|
||||
for (i = 0; i < 32; i++) {
|
||||
latch = 0;
|
||||
tmp = buffer[i] & 0x80808080;
|
||||
latch |= tmp >> 7;
|
||||
tmp = buffer[i] & 0x40404040;
|
||||
latch |= tmp >> 5;
|
||||
tmp = buffer[i] & 0x20202020;
|
||||
latch |= tmp >> 3;
|
||||
tmp = buffer[i] & 0x10101010;
|
||||
latch |= tmp >> 1;
|
||||
tmp = buffer[i] & 0x08080808;
|
||||
latch |= tmp << 1;
|
||||
tmp = buffer[i] & 0x04040404;
|
||||
latch |= tmp << 3;
|
||||
tmp = buffer[i] & 0x02020202;
|
||||
latch |= tmp << 5;
|
||||
tmp = buffer[i] & 0x01010101;
|
||||
latch |= tmp << 7;
|
||||
bus_space_write_4(sc->sc_bustag, sc->sc_regh,
|
||||
CG14_CURSOR_PLANE1 + (i << 2), latch);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cgfourteenreg.h,v 1.4 2007/07/30 18:20:09 macallan Exp $ */
|
||||
/* $NetBSD: cgfourteenreg.h,v 1.5 2007/07/30 23:28:13 macallan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996
|
||||
|
|
@ -46,6 +46,18 @@
|
|||
#define CG14_OFFSET_CLUT3 0x6000
|
||||
#define CG14_OFFSET_CLUTINCR 0xf000
|
||||
|
||||
/* cursor registers */
|
||||
#define CG14_CURSOR_PLANE0 0x1000
|
||||
#define CG14_CURSOR_PLANE1 0x1080
|
||||
#define CG14_CURSOR_CONTROL 0x1100
|
||||
#define CG14_CRSR_ENABLE 0x04
|
||||
#define CG14_CRSR_DBLBUFFER 0x02
|
||||
#define CG14_CURSOR_X 0x1104
|
||||
#define CG14_CURSOR_Y 0x1106
|
||||
#define CG14_CURSOR_COLOR1 0x1108
|
||||
#define CG14_CURSOR_COLOR2 0x110c
|
||||
#define CG14_CURSOR_COLOR3 0x1110
|
||||
|
||||
/* ranges in framebuffer space */
|
||||
#define CG14_FB_VRAM 0x00000000
|
||||
#define CG14_FB_CBGR 0x01000000
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cgfourteenvar.h,v 1.7 2007/07/30 18:20:09 macallan Exp $ */
|
||||
/* $NetBSD: cgfourteenvar.h,v 1.8 2007/07/30 23:28:14 macallan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996
|
||||
|
|
@ -57,7 +57,7 @@ union cg14cursor_cmap { /* colormap, like bt_cmap, but tiny */
|
|||
* cg14 hardware cursor status
|
||||
*/
|
||||
struct cg14_cursor { /* cg14 hardware cursor status */
|
||||
short cc_enable; /* cursor is enabled */
|
||||
int cc_enable; /* cursor is enabled */
|
||||
struct fbcurpos cc_pos; /* position */
|
||||
struct fbcurpos cc_hot; /* hot-spot */
|
||||
struct fbcurpos cc_size; /* size of mask & image fields */
|
||||
|
|
|
|||
Loading…
Reference in New Issue