kernel/ti/kbd.asm

@@ -5,24 +5,8 @@
 ; *** Constants ***
 .equ	KBD_PORT	0x01
 
-; Keys that have a special meaning in GetC. All >= 0x80. They are interpreted
-; by GetC directly and are never returned as-is.
-.equ	KBD_KEY_ALPHA	0x80
-.equ	KBD_KEY_2ND	0x81
-
-; *** Variables ***
-; active long-term modifiers, such as a-lock
-; bit 0: A-Lock
-.equ	KBD_MODS	KBD_RAMSTART
-.equ	KBD_RAMEND	@+1
-
 ; *** Code ***
 
-kbdInit:
-	xor	a
-	ld	(KBD_MODS), a
-	ret
-
 ; Wait for a digit to be pressed and sets the A register ASCII value
 ; corresponding to that key press.
 ;
@@ -40,14 +24,8 @@ kbdGetC:
 	push	bc
 	push	hl
 
-	; During this GetC loop, register C holds the modificators
-	; bit 0: Alpha
-	; bit 1: 2nd
-	; Initial value should be zero, but if A-Lock is on, it's 1
-	ld	a, (KBD_MODS)
-	and	1
-	ld	c, a
-
+	; During this GetC loop, register C holds the modificators (Alpha, 2nd)
+	ld	c, 0
 	; loop until a digit is pressed
 .loop:
 	ld	hl, .dtbl
@@ -82,29 +60,22 @@ kbdGetC:
 	ld	a, (hl)
 	or	a		; is char 0?
 	jr	z, .loop	; yes? unsupported. loop.
-	call	.debounce
-	cp	KBD_KEY_ALPHA
-	jr	c, .end	; A < 0x80? valid char, return it.
-	jr	z, .handleAlpha
-	cp	KBD_KEY_2ND
-	jr	z, .handle2nd
-	jp	.loop
-.handleAlpha:
+	cp	0x80		; is it alpha?
+	jr	nz, .notalpha
 	set	0, c
-	bit	1, c		; 2nd set?
-	jp	z, .loop	; unset? loop
-	; we've just hit Alpha with 2nd set. Toggle A-Lock and set Alpha to
-	; the value A-Lock has.
-	ld	a, (KBD_MODS)
-	xor	1
-	ld	(KBD_MODS), a
-	ld	c, a
-	jp	.loop
-.handle2nd:
-	set	1, c
-	jp	.loop
+	jr	.loop
+.notalpha:
+	
+	; wait until all keys are de-pressed
+	push	af		; --> lvl 1
+.wait:
+	xor	a
+	call	.get
+	inc	a		; if a was 0xff, will become 0 (nz test)
+	jr	nz, .wait	; non-zero? something is pressed
+
+	pop	af		; <-- lvl 1
 
-.end:
 	pop	hl
 	pop	bc
 	ret
@@ -118,28 +89,18 @@ kbdGetC:
 	in	a, (KBD_PORT)
 	ei
 	ret
-.debounce:
-	; wait until all keys are de-pressed
-	push	af		; --> lvl 1
-.wait:
-	xor	a
-	call	.get
-	inc	a		; if a was 0xff, will become 0 (nz test)
-	jr	nz, .wait	; non-zero? something is pressed
-
-	pop	af		; <-- lvl 1
-	ret
 
 ; digits table. each row represents a group. first item is group mask.
 ; 0 means unsupported. no group 7 because it has no keys.
+; 0x80 is a special value for ALPHA key which is never returned directly.
 .dtbl:
 	.db	0xfe, 0, 0, 0, 0, 0, 0, 0, 0
 	.db	0xfd, 0x0d, '+' ,'-' ,'*', '/', '^', 0, 0
 	.db	0xfb, 0, '3', '6', '9', ')', 0, 0, 0
 	.db	0xf7, '.', '2', '5', '8', '(', 0, 0, 0
 	.db	0xef, '0', '1', '4', '7', ',', 0, 0, 0
-	.db	0xdf, 0, 0, 0, 0, 0, 0, 0, KBD_KEY_ALPHA
-	.db	0xbf, 0, 0, 0, 0, 0, KBD_KEY_2ND, 0, 0x7f
+	.db	0xdf, 0, 0, 0, 0, 0, 0, 0, 0x80
+	.db	0xbf, 0, 0, 0, 0, 0, 0, 0, 0x7f
 
 ; alpha table. same as .dtbl, for when we're in alpha mode.
 .atbl:
@@ -148,5 +109,5 @@ kbdGetC:
 	.db	0xfb, '?', 0, 'V', 'Q', 'L', 'G', 0, 0
 	.db	0xf7, ':', 'Z', 'U', 'P', 'K', 'F', 'C', 0
 	.db	0xef, '_', 'Y', 'T', 'O', 'J', 'E', 'B', 0
-	.db	0xdf, 0, 'X', 'S', 'N', 'I', 'D', 'A', KBD_KEY_ALPHA
-	.db	0xbf, 0, 0, 0, 0, 0, KBD_KEY_2ND, 0, 0x7f
+	.db	0xdf, 0, 'X', 'S', 'N', 'I', 'D', 'A', 0x80
+	.db	0xbf, 0, 0, 0, 0, 0, 0, 0, 0x7f

kernel/ti/lcd.asm

@@ -27,8 +27,6 @@
 ; Current row being written on. In terms of pixels, not of glyphs. During a
 ; linefeed, this increases by FNT_HEIGHT+1.
 .equ	LCD_CURROW	LCD_RAMSTART
-; Current column
-.equ	LCD_CURCOL	@+1
 .equ	LCD_RAMEND	@+1
 
 ; *** Code ***
@@ -36,34 +34,36 @@ lcdInit:
 	; Initialize variables
 	xor	a
 	ld	(LCD_CURROW), a
-	ld	(LCD_CURCOL), a
-
-	; Clear screen
-	call	lcdClrScr
 
 	; Enable the LCD
 	ld	a, LCD_CMD_ENABLE
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 
 	; Hack to get LCD to work. According to WikiTI, we're to sure why TIOS
 	; sends these, but it sends it, and it is required to make the LCD
 	; work. So...
 	ld	a, 0x17
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 	ld	a, 0x0b
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 
 	; Set some usable contrast
 	ld	a, LCD_CMD_CONTRAST+0x34
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 
 	; Enable 6-bit mode.
 	ld	a, LCD_CMD_6BIT
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 
 	; Enable X-increment mode
 	ld	a, LCD_CMD_XINC
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 
 	ret
 
@@ -78,23 +78,11 @@ lcdWait:
 	pop	af
 	ret
 
-; Send cmd A to LCD
-lcdCmd:
-	out	(LCD_PORT_CMD), a
-	jr	lcdWait
-	
-; Send data A to LCD
-lcdData:
-	out	(LCD_PORT_DATA), a
-	jr	lcdWait
-
 ; Turn LCD off
 lcdOff:
-	push	af
 	ld	a, LCD_CMD_DISABLE
-	call	lcdCmd
+	call	lcdWait
 	out	(LCD_PORT_CMD), a
-	pop	af
 	ret
 
 ; Set LCD's current column to A
@@ -102,7 +90,8 @@ lcdSetCol:
 	push	af
 	; The col index specified in A is compounded with LCD_CMD_COL
 	add	a, LCD_CMD_COL
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 	pop	af
 	ret
 
@@ -111,7 +100,8 @@ lcdSetRow:
 	push	af
 	; The col index specified in A is compounded with LCD_CMD_COL
 	add	a, LCD_CMD_ROW
-	call	lcdCmd
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
 	pop	af
 	ret
 
@@ -125,23 +115,32 @@ lcdSendGlyph:
 
 	ld	a, (LCD_CURROW)
 	call	lcdSetRow
-	ld	a, (LCD_CURCOL)
-	call	lcdSetCol
 
-	; let's increase (and wrap) col now
-	inc	a
-	ld	(LCD_CURCOL), a
-	cp	16
-	jr	nz, .skip
-	call	lcdLinefeed
-.skip:
-	ld	b, FNT_HEIGHT
+	ld	b, 7
 .loop:
 	ld	a, (hl)
 	inc	hl
-	call	lcdData
+	call	lcdWait
+	out	(LCD_PORT_DATA), a
 	djnz	.loop
 
+	; Now that we've sent our 7 rows of pixels, let's go in "Y-increment"
+	; mode to let the LCD increase by one column after we've sent our 8th
+	; line, which is blank (padding).
+	ld	a, LCD_CMD_YINC
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
+
+	; send blank line
+	xor	a
+	call	lcdWait
+	out	(LCD_PORT_DATA), a
+
+	; go back in X-increment mode
+	ld	a, LCD_CMD_XINC
+	call	lcdWait
+	out	(LCD_PORT_CMD), a
+
 	pop	hl
 	pop	bc
 	pop	af
@@ -154,53 +153,10 @@ lcdLinefeed:
 	add	a, FNT_HEIGHT+1
 	ld	(LCD_CURROW), a
 	xor	a
-	ld	(LCD_CURCOL), a
-	pop	af
-	ret
-
-; Clears B rows starting at row A
-; The LCD will then be set back at row A, column 0
-; B is not preserved by this routine
-lcdClrX:
-	push	af
-	call	lcdSetRow
-	ld	a, LCD_CMD_8BIT
-	call	lcdCmd
-.outer:
-	push	bc		; --> lvl 1
-	ld	b, 11
-	ld	a, LCD_CMD_YINC
-	call	lcdCmd
-	xor	a
 	call	lcdSetCol
-.inner:
-	call	lcdData
-	djnz	.inner
-	ld	a, LCD_CMD_XINC
-	call	lcdCmd
-	xor	a
-	call	lcdData
-	pop	bc		; <-- lvl 1
-	djnz	.outer
-	ld	a, LCD_CMD_6BIT
-	call	lcdCmd
 	pop	af
 	ret
 
-lcdClrLn:
-	push	bc
-	ld	b, FNT_HEIGHT+1
-	call	lcdClrX
-	pop	bc
-	ret
-
-lcdClrScr:
-	push	bc
-	ld	b, 64
-	call	lcdClrX
-	pop	bc
-	ret
-
 lcdPutC:
 	cp	ASCII_LF
 	jp	z, lcdLinefeed

recipes/ti84/glue.asm

@@ -28,9 +28,8 @@
 .inc "fnt/mgm.asm"
 .equ	LCD_RAMSTART	RAMSTART
 .inc "ti/lcd.asm"
-.equ	KBD_RAMSTART	LCD_RAMEND
 .inc "ti/kbd.asm"
-.equ	STDIO_RAMSTART	KBD_RAMEND
+.equ	STDIO_RAMSTART	LCD_RAMEND
 .equ	STDIO_GETC	kbdGetC
 .equ	STDIO_PUTC	lcdPutC
 .inc "stdio.asm"
@@ -61,7 +60,6 @@ boot:
 	halt
 
 main:
-	call	kbdInit
 	call	lcdInit
 	xor	a
 	call	lcdSetCol