summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hp300/dev')
-rw-r--r--sys/arch/hp300/dev/diofbreg.h14
-rw-r--r--sys/arch/hp300/dev/gbox.c5
2 files changed, 4 insertions, 15 deletions
diff --git a/sys/arch/hp300/dev/diofbreg.h b/sys/arch/hp300/dev/diofbreg.h
index f4e258da270..386def50b2a 100644
--- a/sys/arch/hp300/dev/diofbreg.h
+++ b/sys/arch/hp300/dev/diofbreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: diofbreg.h,v 1.2 2005/01/24 21:36:39 miod Exp $ */
+/* $OpenBSD: diofbreg.h,v 1.3 2007/01/07 15:13:52 miod Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -90,15 +90,3 @@ struct diofbreg {
u_int8_t fbolsb; /* frame buffer offset LSB 0x5f */
};
#endif
-
-/*
- * Offsets into the display ROM that is part of the first 4K of each
- * DIO display device.
- */
-#define FONTROM 0x3b /* Offset of font information structure. */
-#define FONTADDR 0x4 /* Offset from FONTROM to font address. */
-#define FONTHEIGHT 0x0 /* Offset from font address to font height. */
-#define FONTWIDTH 0x2 /* Offset from font address to font width. */
-#define FONTDATA 0xA /* Offset from font address to font glyphs. */
-
-#define FBBASE(fb) ((volatile char *)(fb)->fbkva)
diff --git a/sys/arch/hp300/dev/gbox.c b/sys/arch/hp300/dev/gbox.c
index f6068d66a21..a4d701fd5d6 100644
--- a/sys/arch/hp300/dev/gbox.c
+++ b/sys/arch/hp300/dev/gbox.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gbox.c,v 1.14 2006/08/11 18:33:13 miod Exp $ */
+/* $OpenBSD: gbox.c,v 1.15 2007/01/07 15:13:52 miod Exp $ */
/*
* Copyright (c) 2005, Miodrag Vallat
@@ -433,7 +433,8 @@ gbox_windowmove(struct diofb *fb, u_int16_t sx, u_int16_t sy,
src = src + ((cy - 4) * 1024) + (cx - 4);
dest= dest + ((cy - 4) * 1024) + (cx - 4);
}
- FBBASE(fb)[dest] = FBBASE(fb)[src];
+ *(volatile u_int8_t *)(fb->fbkva + dest) =
+ *(volatile u_int8_t *)(fb->fbkva + src);
tile_mover_waitbusy(gb);