# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1588819213 0
# Node ID 36e6a1ff9608ed0968774bf6f4c2af06a88fa058
# Parent  39e7b30019462cb2fc33d01dec95338af032f01d
lunadrv: rd and wr commands added

diff -r 39e7b3001946 -r 36e6a1ff9608 target-utils/lunadrv/Makefile
--- a/target-utils/lunadrv/Makefile	Thu May 07 02:27:56 2020 +0000
+++ b/target-utils/lunadrv/Makefile	Thu May 07 02:40:13 2020 +0000
@@ -5,7 +5,7 @@
 OBJCOPY=arm-elf-objcopy
 
 PROG=	lunadrv
-OBJS=	crt0.o backlight.o cmdtab.o haoran.o lcdout.o main.o
+OBJS=	crt0.o backlight.o cmdtab.o haoran.o lcdout.o main.o regcmd.o
 LIBS=	../libcommon/libcommon.a ../libprintf/libprintf.a ../libbase/libbase.a \
 	../libc/libc.a
 LIBGCC=	`${CC} -print-file-name=libgcc.a`
diff -r 39e7b3001946 -r 36e6a1ff9608 target-utils/lunadrv/cmdtab.c
--- a/target-utils/lunadrv/cmdtab.c	Thu May 07 02:27:56 2020 +0000
+++ b/target-utils/lunadrv/cmdtab.c	Thu May 07 02:40:13 2020 +0000
@@ -10,10 +10,12 @@
 extern void cmd_r8();
 extern void cmd_r16();
 extern void cmd_r32();
+extern void cmd_rd();
 extern void cmd_rect();
 extern void cmd_w8();
 extern void cmd_w16();
 extern void cmd_w32();
+extern void cmd_wr();
 
 extern void abb_init();
 extern void abb_power_off();
@@ -38,9 +40,11 @@
 	{"r8", cmd_r8},
 	{"r16", cmd_r16},
 	{"r32", cmd_r32},
+	{"rd", cmd_rd},
 	{"rect", cmd_rect},
 	{"w8", cmd_w8},
 	{"w16", cmd_w16},
 	{"w32", cmd_w32},
+	{"wr", cmd_wr},
 	{0, 0}
 };
diff -r 39e7b3001946 -r 36e6a1ff9608 target-utils/lunadrv/regcmd.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/target-utils/lunadrv/regcmd.c	Thu May 07 02:40:13 2020 +0000
@@ -0,0 +1,45 @@
+/*
+ * Handy commands for reading and writing LCD controller registers.
+ */
+
+#include <sys/types.h>
+#include "types.h"
+#include "luna.h"
+
+void
+cmd_rd(argbulk)
+	char *argbulk;
+{
+	char *argv[2];
+	u_long regno;
+
+	if (parse_args(argbulk, 1, 1, argv, 0) < 0)
+		return;
+	if (parse_hexarg(argv[0], 4, &regno) < 0) {
+	    printf("ERROR: regno argument must be a valid 16-bit hex word\n");
+		return;
+	}
+	LCD_IR = regno;
+	printf("%04X\n", LCD_DR);
+}
+
+void
+cmd_wr(argbulk)
+	char *argbulk;
+{
+	char *argv[3];
+	u_long regno, value;
+
+	if (parse_args(argbulk, 2, 2, argv, 0) < 0)
+		return;
+	if (parse_hexarg(argv[0], 4, &regno) < 0) {
+	    printf("ERROR: regno argument must be a valid 16-bit hex word\n");
+		return;
+	}
+	if (parse_hexarg(argv[1], 4, &value) < 0) {
+	    printf("ERROR: value argument must be a valid 16-bit hex word\n");
+		return;
+	}
+	LCD_IR = regno;
+	LCD_DR = value;
+}