backported fixes from 256boss

Author: jtsiomb

src/boot.h

@@ -0,0 +1,7 @@
+#ifndef BOOT_H_
+#define BOOT_H_
+
+extern unsigned char low_mem_buffer[];
+extern int boot_drive_number;
+
+#endif	/* BOOT_H_ */

src/boot/boot.s

@@ -1,5 +1,5 @@
 # pcboot - bootable PC demo/game kernel
-# Copyright (C) 2018-2019  John Tsiombikas <[email protected]>
+# Copyright (C) 2018  John Tsiombikas <[email protected]>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/boot/boot2.s

@@ -1,5 +1,5 @@
-# pcboot - bootable PC demo/game kernel
-# Copyright (C) 2018-2019  John Tsiombikas <[email protected]>
+# 256boss - bootable launcher for 256byte intros
+# Copyright (C) 2018  John Tsiombikas <[email protected]>
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/contty.c

@@ -40,18 +40,20 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #define CRTC_REG_CURLOC_L	0x0f
 
 #define VMEM_CHAR(c, attr) \
-	((uint16_t)(c) | ((uint16_t)(attr) << 8))
+	(((uint16_t)(c) & 0xff) | ((uint16_t)(attr) << 8))
 
 static void scroll(void);
 static void crtc_cursor(int x, int y);
 static void crtc_setstart(int y);
 static inline unsigned char crtc_read(int reg);
 static inline void crtc_write(int reg, unsigned char val);
-static inline void crtc_write_bits(int reg, unsigned char val, unsigned char mask);
 
 extern int cursor_x, cursor_y;
 static unsigned char txattr = 0x07;
 static int start_line;
+static unsigned char cy0, cy1;
+static int curvis;
+static int scr_on = 1;
 
 int con_init(void)
 {
@@ -60,26 +62,39 @@ int con_init(void)
 #endif
 
 #ifdef CON_TEXTMODE
+	cy0 = crtc_read(CRTC_REG_CURSTART);
+	curvis = cy0 & 0x20 ? 1 : 0;
+	cy0 &= 0x1f;
+	cy1 = crtc_read(CRTC_REG_CUREND) & 0x1f;
+
 	con_show_cursor(1);
 	crtc_setstart(0);
 	crtc_cursor(cursor_x, cursor_y);
-	/*
-	printf("curloc: %x %x\n", (unsigned int)crtc_read(CRTC_REG_CURLOC_H),
-			(unsigned int)crtc_read(CRTC_REG_CURLOC_L));
-	printf("curstart: %x\n", (unsigned int)crtc_read(CRTC_REG_CURSTART));
-	printf("curend: %x\n", (unsigned int)crtc_read(CRTC_REG_CUREND));
-	*/
+	scr_on = 1;
 #endif
 
 	return 0;
 }
 
+void con_scr_enable(void)
+{
+	scr_on = 1;
+}
+
+void con_scr_disable(void)
+{
+	scr_on = 0;
+}
+
 void con_show_cursor(int show)
 {
 #ifdef CON_TEXTMODE
-	unsigned char val = show ? 0 : 0x20;
-
-	crtc_write_bits(CRTC_REG_CURSTART, val, 0x20);
+	unsigned char val = cy0 & 0x1f;
+	if(!show) {
+		val |= 0x20;
+	}
+	crtc_write(CRTC_REG_CURSTART, val);
+	curvis = show;
 #endif
 }
 
@@ -92,6 +107,23 @@ void con_cursor(int x, int y)
 #endif
 }
 
+void con_curattr(int shape, int blink)
+{
+#ifdef CON_TEXTMODE
+	unsigned char start;
+	cy0 = (shape == CON_CURSOR_LINE) ? 0xd : 0;
+	cy1 = 0xe;
+
+	start = cy0;
+	if(curvis) {
+		start |= 0x20;
+	}
+
+	crtc_write(CRTC_REG_CURSTART, start);
+	crtc_write(CRTC_REG_CUREND, cy0);
+#endif
+}
+
 void con_fgcolor(int c)
 {
 	txattr = (txattr & 0xf0) | c;
@@ -102,10 +134,20 @@ void con_bgcolor(int c)
 	txattr = (txattr & 0x0f) | (c << 4);
 }
 
+void con_setattr(unsigned char attr)
+{
+	txattr = attr;
+}
+
+unsigned char con_getattr(void)
+{
+	return txattr;
+}
+
 void con_clear(void)
 {
 #ifdef CON_TEXTMODE
-	memset(TEXT_ADDR, 0, NCOLS * NROWS * 2);
+	memset16(TEXT_ADDR, VMEM_CHAR(' ', txattr), NCOLS * NROWS);
 
 	start_line = 0;
 	crtc_setstart(0);
@@ -126,33 +168,39 @@ static inline void linefeed(void)
 void con_putchar(int c)
 {
 #ifdef CON_TEXTMODE
-	uint16_t *ptr;
-
-	switch(c) {
-	case '\n':
-		linefeed();
-	case '\r':
-		cursor_x = 0;
-		crtc_cursor(cursor_x, cursor_y);
-		break;
-
-	case '\t':
-		cursor_x = (cursor_x & 0x7) + 8;
-		if(cursor_x >= NCOLS) {
-			linefeed();
-			cursor_x = 0;
-		}
-		crtc_cursor(cursor_x, cursor_y);
-		break;
-
-	default:
-		con_putchar_scr(cursor_x, cursor_y, c);
-
-		if(++cursor_x >= NCOLS) {
+	if(scr_on) {
+		switch(c) {
+		case '\n':
 			linefeed();
+		case '\r':
 			cursor_x = 0;
+			crtc_cursor(cursor_x, cursor_y);
+			break;
+
+		case '\t':
+			cursor_x = (cursor_x & 0x7) + 8;
+			if(cursor_x >= NCOLS) {
+				linefeed();
+				cursor_x = 0;
+			}
+			crtc_cursor(cursor_x, cursor_y);
+			break;
+
+		case '\b':
+			if(cursor_x > 0) cursor_x--;
+			con_putchar_scr(cursor_x, cursor_y, ' ');
+			crtc_cursor(cursor_x, cursor_y);
+			break;
+
+		default:
+			con_putchar_scr(cursor_x, cursor_y, c);
+
+			if(++cursor_x >= NCOLS) {
+				linefeed();
+				cursor_x = 0;
+			}
+			crtc_cursor(cursor_x, cursor_y);
 		}
-		crtc_cursor(cursor_x, cursor_y);
 	}
 #endif
 
@@ -163,12 +211,15 @@ void con_putchar(int c)
 
 void con_putchar_scr(int x, int y, int c)
 {
+#ifdef CON_TEXTMODE
 	uint16_t *ptr = (uint16_t*)TEXT_ADDR;
 	ptr[(y + start_line) * NCOLS + x] = VMEM_CHAR(c, txattr);
+#endif
 }
 
-void con_printf(int x, int y, const char *fmt, ...)
+int con_printf(int x, int y, const char *fmt, ...)
 {
+#ifdef CON_TEXTMODE
 	va_list ap;
 	char buf[81];
 	char *ptr = buf;
@@ -180,6 +231,10 @@ void con_printf(int x, int y, const char *fmt, ...)
 	while(*ptr && x < 80) {
 		con_putchar_scr(x++, y, *ptr++);
 	}
+	return ptr - buf;
+#else
+	return 0;
+#endif
 }
 
 static void scroll(void)
@@ -229,12 +284,3 @@ static inline void crtc_write(int reg, unsigned char val)
 	outb(reg, CRTC_ADDR);
 	outb(val, CRTC_DATA);
 }
-
-static inline void crtc_write_bits(int reg, unsigned char val, unsigned char mask)
-{
-	unsigned char prev;
-	outb(reg, CRTC_ADDR);
-	prev = inb(CRTC_DATA);
-	val = (prev & ~mask) | (val & mask);
-	outb(val, CRTC_DATA);
-}

src/contty.h

@@ -18,15 +18,70 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #ifndef CONTTY_H_
 #define CONTTY_H_
 
+enum {
+	CON_CURSOR_LINE,
+	CON_CURSOR_BLOCK
+};
+
+enum {
+	BLACK,
+	BLUE,
+	GREEN,
+	CYAN,
+	RED,
+	MAGENTA,
+	BROWN,
+	LTGREY,
+	GREY,
+	LTBLUE,
+	LTGREEN,
+	LTCYAN,
+	LTRED,
+	LTMAGENTA,
+	YELLOW,
+	WHITE
+};
+#define BRIGHT		8
+#define FG_BRIGHT	0x08
+#define BG_BRIGHT	0x80
+
+enum {
+	G_DIAMOND	= 0x04,
+	G_CHECKER	= 0xb1,
+	G_LR_CORNER	= 0xd9,
+	G_UR_CORNER	= 0xbf,
+	G_UL_CORNER	= 0xda,
+	G_LL_CORNER	= 0xc0,
+	G_CROSS		= 0xc5,
+	G_HLINE		= 0xc4,
+	G_L_TEE		= 0xc3,
+	G_R_TEE		= 0xb4,
+	G_B_TEE		= 0xc1,
+	G_T_TEE		= 0xc2,
+	G_VLINE		= 0xb3,
+	G_CDOT		= 0xf8,
+
+	G_HDBL		= 0xcd,
+	G_UL_HDBL	= 0xd5,
+	G_UR_HDBL	= 0xb8,
+	G_T_HDBL_TEE = 0xd1
+};
+
+
 int con_init(void);
+void con_scr_enable(void);
+void con_scr_disable(void);
 void con_show_cursor(int show);
 void con_cursor(int x, int y);
+void con_curattr(int shape, int blink);
 void con_fgcolor(int c);
 void con_bgcolor(int c);
+void con_setattr(unsigned char attr);
+unsigned char con_getattr(void);
 void con_clear(void);
 void con_putchar(int c);
 
 void con_putchar_scr(int x, int y, int c);
-void con_printf(int x, int y, const char *fmt, ...);
+int con_printf(int x, int y, const char *fmt, ...);
 
 #endif	/* CONTTY_H_ */

src/intr.c

@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <stdio.h>
+#include "config.h"
 #include "intr.h"
 #include "desc.h"
 #include "segm.h"
@@ -150,13 +151,18 @@ void dispatch_intr(struct intr_frame frm)
 }
 
 void init_pic(void)
+{
+	prog_pic(IRQ_OFFSET);
+}
+
+void prog_pic(int offs)
 {
 	/* send ICW1 saying we'll follow with ICW4 later on */
 	outb(ICW1_INIT | ICW1_ICW4_NEEDED, PIC1_CMD);
 	outb(ICW1_INIT | ICW1_ICW4_NEEDED, PIC2_CMD);
 	/* send ICW2 with IRQ remapping */
-	outb(IRQ_OFFSET, PIC1_DATA);
-	outb(IRQ_OFFSET + 8, PIC2_DATA);
+	outb(offs, PIC1_DATA);
+	outb(offs + 8, PIC2_DATA);
 	/* send ICW3 to setup the master/slave relationship */
 	/* ... set bit3 = 3rd interrupt input has a slave */
 	outb(4, PIC1_DATA);
@@ -257,3 +263,10 @@ void end_of_irq(int irq)
 
 	set_intr_flag(intr_state);
 }
+
+#ifdef ENABLE_GDB_STUB
+void exceptionHandler(int id, void (*func)())
+{
+	set_intr_entry(id, func);
+}
+#endif

src/intr.h

@@ -72,6 +72,7 @@ void interrupt(int intr_num, intr_func_t func);
  */
 void set_intr_entry(int num, void (*handler)(void));
 
+void prog_pic(int offs);
 void set_pic_mask(int pic, unsigned char mask);
 unsigned char get_pic_mask(int pic);
 void mask_irq(int irq);

src/kbregs.h

@@ -27,6 +27,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #define KB_ACK			0xfa
 #define KB_NACK			0xfe
+#define KB_TEST_PASSED	0x55
+#define KB_TEST_FAILED	0xfc
 
 #define KB_STAT_OUTBUF_FULL	0x01
 #define KB_STAT_INBUF_FULL	0x02
@@ -37,6 +39,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #define KB_STAT_TIMEOUT		0x40
 #define KB_STAT_PAR_ERROR	0x80
 
+#define KB_CMD_TEST				0xaa
+
 /* keyboard commands */
 #define KB_CMD_GET_CMDBYTE		0x20
 #define KB_CMD_SET_CMDBYTE		0x60