kernel: move arrow cursor definition to port/devmouse.c

8 files changed, 14 insertions, 77 deletions

diff --git a/sys/src/9/bcm/screen.c b/sys/src/9/bcm/screen.c
index fe7ed6c93..a892a811d 100644
--- a/sys/src/9/bcm/screen.c
+++ b/sys/src/9/bcm/screen.c
@@ -22,20 +22,6 @@ enum {
 	Depth		= 16,
 };
 
-Cursor	arrow = {
-	{ -1, -1 },
-	{ 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,
-	  0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,
-	  0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,
-	  0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,
-	},
-	{ 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,
-	  0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,
-	  0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,
-	  0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,
-	},
-};
-
 Memimage *gscreen;
 
 static Memdata xgdata;
diff --git a/sys/src/9/bitsy/screen.c b/sys/src/9/bitsy/screen.c
index 9946a8b31..14e9ee39c 100644
--- a/sys/src/9/bitsy/screen.c
+++ b/sys/src/9/bitsy/screen.c
@@ -110,8 +110,6 @@ struct sa1110regs {
 	ulong	lccr3;
 } *lcd;
 
-Point	ZP = {0, 0};
-
 static Memdata xgdata;
 
 static Memimage xgscreen =
@@ -142,12 +140,10 @@ Memsubfont	*memdefont;
 
 Lock		screenlock;
 
-Point		ZP = {0, 0};
 ushort		*vscreen;	/* virtual screen */
 Rectangle	window;
 Point		curpos;
 int			h, w;
-int			drawdebug;
 
 static	ulong	rep(ulong, int);
 static	void	screenwin(void);
diff --git a/sys/src/9/omap/screen.c b/sys/src/9/omap/screen.c
index f2ec47054..d4fe4a696 100644
--- a/sys/src/9/omap/screen.c
+++ b/sys/src/9/omap/screen.c
@@ -141,22 +141,6 @@ struct Dispcregs {			/* display ctlr at 0x48050400 */
 	ulong	preload;
 };
 
-int	drawdebug;
-Point	ZP = {0, 0};
-Cursor	arrow = {
-	{ -1, -1 },
-	{ 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,
-	  0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,
-	  0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,
-	  0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,
-	},
-	{ 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,
-	  0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,
-	  0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,
-	  0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,
-	},
-};
-
 OScreen oscreen;
 Settings settings[] = {
 [Res800x600]   {  800,  600, 60, RGB16,  40000,	 88, 40, 128,	23, 1, 5, },
diff --git a/sys/src/9/pc/screen.c b/sys/src/9/pc/screen.c
index d5cab912a..c7317dd0a 100644
--- a/sys/src/9/pc/screen.c
+++ b/sys/src/9/pc/screen.c
@@ -19,20 +19,6 @@ Memimage *gscreen;
 
 VGAscr vgascreen[1];
 
-Cursor arrow = {
-	{ -1, -1 },
-	{ 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C, 
-	  0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04, 
-	  0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04, 
-	  0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40, 
-	},
-	{ 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0, 
-	  0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8, 
-	  0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8, 
-	  0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00, 
-	},
-};
-
 int
 screensize(int x, int y, int, ulong chan)
 {
diff --git a/sys/src/9/pc/vga.c b/sys/src/9/pc/vga.c
index c325fd4e2..9043d544d 100644
--- a/sys/src/9/pc/vga.c
+++ b/sys/src/9/pc/vga.c
@@ -20,7 +20,6 @@ static Rectangle window;
 static int *xp;
 static int xbuf[256];
 Lock vgascreenlock;
-int drawdebug;
 
 void
 vgaimageinit(ulong)
diff --git a/sys/src/9/port/devmouse.c b/sys/src/9/port/devmouse.c
index 14db40ecf..90b8e76c6 100644
--- a/sys/src/9/port/devmouse.c
+++ b/sys/src/9/port/devmouse.c
@@ -102,6 +102,20 @@ static ulong mousetime;
 
 extern Memimage* gscreen;
 
+Cursor	arrow = {
+	{ -1, -1 },
+	{ 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,
+	  0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,
+	  0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,
+	  0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,
+	},
+	{ 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,
+	  0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,
+	  0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,
+	  0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,
+	},
+};
+
 static void
 mousereset(void)
 {
diff --git a/sys/src/9/sgi/screen.c b/sys/src/9/sgi/screen.c
index d98aec78e..6d1829315 100644
--- a/sys/src/9/sgi/screen.c
+++ b/sys/src/9/sgi/screen.c
@@ -430,20 +430,6 @@ struct Newport
 static Newport *regs = IO(Newport, GIO_NEWPORT);
 static Newport *regsgo = IO(Newport, GIO_NEWPORT|0x800);
 
-Cursor	arrow = {
-	{ -1, -1 },
-	{ 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,
-	  0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,
-	  0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,
-	  0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,
-	},
-	{ 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,
-	  0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,
-	  0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,
-	  0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,
-	},
-};
-
 Memimage *gscreen;
 static Point curoff;
 
diff --git a/sys/src/9/zynq/screen.c b/sys/src/9/zynq/screen.c
index 872ab88f8..e4a6ab948 100644
--- a/sys/src/9/zynq/screen.c
+++ b/sys/src/9/zynq/screen.c
@@ -12,20 +12,6 @@
 #include <cursor.h>
 #include "screen.h"
 
-Cursor	arrow = {
-	{ -1, -1 },
-	{ 0xFF, 0xFF, 0x80, 0x01, 0x80, 0x02, 0x80, 0x0C,
-	  0x80, 0x10, 0x80, 0x10, 0x80, 0x08, 0x80, 0x04,
-	  0x80, 0x02, 0x80, 0x01, 0x80, 0x02, 0x8C, 0x04,
-	  0x92, 0x08, 0x91, 0x10, 0xA0, 0xA0, 0xC0, 0x40,
-	},
-	{ 0x00, 0x00, 0x7F, 0xFE, 0x7F, 0xFC, 0x7F, 0xF0,
-	  0x7F, 0xE0, 0x7F, 0xE0, 0x7F, 0xF0, 0x7F, 0xF8,
-	  0x7F, 0xFC, 0x7F, 0xFE, 0x7F, 0xFC, 0x73, 0xF8,
-	  0x61, 0xF0, 0x60, 0xE0, 0x40, 0x40, 0x00, 0x00,
-	},
-};
-
 Memimage *gscreen;
 static Memdata xgdata;