diff --git a/sys/arch/pmax/dev/fbreg.h b/sys/arch/pmax/dev/fbreg.h
index 0176db07ed7b..3d60490f464a 100644
--- a/sys/arch/pmax/dev/fbreg.h
+++ b/sys/arch/pmax/dev/fbreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: fbreg.h,v 1.4 1994/10/26 21:09:03 cgd Exp $	*/
+/*	$NetBSD: fbreg.h,v 1.5 1995/09/12 07:51:35 jonathan Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -48,98 +48,13 @@ struct fbuaccess {
 	pmTimeCoord	tcs[MOTION_BUFFER_SIZE];
 };
 
-struct pmax_fb {
-	int	GraphicsOpen;		/* Open yet? */
-	int	initialized;		/* Set up yet? */
-	int	isMono;			/* Monochrome fb? */
+struct pmax_fbtty {
+	/*int	initialized;		/* Set up yet? */
 	int	row, col;		/* Screen pos for glass tty */
-	struct	fbuaccess *fbu;		/* X event stuff */
-	char	*fr_addr;		/* Frame buffer address */
-	size_t	fr_size;		/* Frame buffer size */
-	char	*fr_chipaddr;		/* Base address for chips */
-	void	(*posCursor)();		/* Position cursor func */
 	void	(*KBDPutc)();		/* Send char to keyboard func */
 	dev_t	kbddev;			/* Device for KBDPutc */
-	struct	selinfo selp;		/* Select structure */
 };
 
-/*
- * Definitions for the Keyboard and mouse.
- */
-/*
- * Special key values.
- */
-#define	KEY_R_SHIFT	0xab
-#define KEY_SHIFT	0xae
-#define KEY_CONTROL	0xaf
-#define	KEY_R_ALT	0xb2
-#define KEY_UP		0xb3
-#define KEY_REPEAT	0xb4
-#define KEY_F1		0x56
-#define KEY_COMMAND	KEY_F1
-
-/*
- * Lk201/301 keyboard
- */
-#define LK_UPDOWN	0x86		/* bits for setting lk201 modes */
-#define LK_AUTODOWN	0x82
-#define LK_DOWN		0x80
-#define LK_DEFAULTS	0xd3		/* reset mode settings          */
-#define LK_AR_ENABLE	0xe3		/* global auto repeat enable	*/
-#define LK_CL_ENABLE	0x1b		/* keyclick enable		*/
-#define LK_KBD_ENABLE	0x8b		/* keyboard enable		*/
-#define LK_BELL_ENABLE	0x23		/* the bell			*/
-#define LK_LED_ENABLE	0x13		/* light led			*/
-#define LK_LED_DISABLE	0x11		/* turn off led			*/
-#define LK_RING_BELL	0xa7		/* ring keyboard bell		*/
-#define LED_1		0x81		/* led bits			*/
-#define LED_2		0x82
-#define LED_3		0x84
-#define LED_4		0x88
-#define LED_ALL		0x8f
-#define LK_HELP		0x7c		/* help key			*/
-#define LK_DO		0x7d		/* do key			*/
-#define LK_KDOWN_ERROR	0x3d		/* key down on powerup error	*/
-#define LK_POWER_ERROR	0x3e		/* keyboard failure on pwrup tst*/
-#define LK_OUTPUT_ERROR 0xb5		/* keystrokes lost during inhbt */
-#define LK_INPUT_ERROR	0xb6		/* garbage command to keyboard	*/
-#define LK_LOWEST	0x56		/* lowest significant keycode	*/
-
-/* max volume is 0, lowest is 0x7 */
-#define	LK_PARAM_VOLUME(v)		(0x80|((v)&0x7))
-
-/* mode command details */
-#define	LK_CMD_MODE(m,div)		((m)|((div)<<3))
-
-/*
- * Command characters for the mouse.
- */
-#define MOUSE_SELF_TEST		'T'
-#define MOUSE_INCREMENTAL	'R'
-
-/*
- * Mouse output bits.
- *
- *     	MOUSE_START_FRAME	Start of report frame bit.
- *	MOUSE_X_SIGN		Sign bit for X.
- *	MOUSE_Y_SIGN		Sign bit for Y.
- *	MOUSE_X_OFFSET		X offset to start cursor at.
- *	MOUSE_Y_OFFSET		Y offset to start cursor at.
- */
-#define MOUSE_START_FRAME	0x80
-#define MOUSE_X_SIGN		0x10
-#define MOUSE_Y_SIGN		0x08
-
-/*
- * Definitions for mouse buttons
- */
-#define EVENT_LEFT_BUTTON	0x01
-#define EVENT_MIDDLE_BUTTON	0x02
-#define EVENT_RIGHT_BUTTON	0x03
-#define RIGHT_BUTTON		0x01
-#define MIDDLE_BUTTON		0x02
-#define LEFT_BUTTON		0x04
-
 /*
  * Mouse report structure definition
  */
@@ -155,16 +70,15 @@ typedef struct {
  */
 #define TO_MS(tv) ((tv.tv_sec * 1000) + (tv.tv_usec / 1000))
 
-extern void fbKbdEvent __P((int, struct pmax_fb *));
-extern void fbMouseEvent __P((MouseReport *, struct pmax_fb *));
-extern void fbMouseButtons __P((MouseReport *, struct pmax_fb *));
-extern void fbScroll __P((struct pmax_fb *));
+extern void fbKbdEvent __P((int, struct fbinfo *));
+extern void fbMouseEvent __P((MouseReport *, struct fbinfo *));
+extern void fbMouseButtons __P((MouseReport *, struct fbinfo *));
+extern void fbScroll __P((struct fbinfo *));
 extern void fbPutc __P((dev_t, int));
-extern void fbBlitc __P((int, struct pmax_fb *));
-extern void fbBlitc __P((int, struct pmax_fb *));
+extern void fbBlitc __P((int, struct fbinfo *));
 extern int kbdMapChar __P((int));
 extern void KBDReset __P((dev_t, void (*)(dev_t, int)));
 extern void MouseInit __P((dev_t, void (*)(dev_t, int), int (*)(dev_t)));
 extern int KBDGetc __P((void));
-extern int tb_kbdmouseconfig __P((struct pmax_fb *));
-extern int fbmmap __P((struct pmax_fb *, dev_t, caddr_t, struct proc *));
+extern int tb_kbdmouseconfig __P((struct fbinfo *fi));
+extern int fbmmap_fb __P((struct fbinfo *, dev_t, caddr_t, struct proc *));