Import backup from 2005-05-12

kernel/display/display.c

@@ -3,7 +3,7 @@
 // Date: 08/07/04
 // Modified: 03/19/05
 
-#include "fs/devices.h"
+#include "devices.h"
 #include "char/vconsole.h"
 #include "display.h"
 #include "lang/lang.h"
@@ -17,7 +17,6 @@ display_t myDisplays[12];		// f1-f12 change displays
 // initialization routine for display subsystem
 int display_init()
 {
-	minor_t vc;
 	int width = 80;
 	int height = 25;
 	int displayType = DISPLAY_CONSOLE;
@@ -28,25 +27,9 @@ int display_init()
 		height = vesafb_getHeight();
 		displayType = DISPLAY_FB;
 	}
-	if (( vc = vconsole_new(width, height) ))
-	{
-		myDisplays[11].type = displayType;
-		myDisplays[11].id = vc;
-		display_activeConsole = vc;
-	}
-	else
-		return -1;
-	int i;
-	for (i = 0; i < 6; i++)
-	{
-		if ((vc = vconsole_new(width, height)))
-		{
-			myDisplays[i].type = displayType;
-			myDisplays[i].id = vc;
-		}
-		else
-			return -2 - i;
-	}
+	vconsole_setup(width, height);
+//	vconsole_activate(0);
+	
 	return 0;
 }
 
@@ -61,7 +44,7 @@ int display_activate(u32_t id)
 		case DISPLAY_CONSOLE:
 		case DISPLAY_FB:
 			display_activeConsole = myDisplays[id].id;
-			return vconsole_draw(display_activeConsole);
+//			return vconsole_draw(display_activeConsole);
 		case DISPLAY_GRAPHICAL:
 		default:
 			return -2;

kernel/display/display.h

@@ -7,7 +7,7 @@
 #define __HOS_CONSOLE__ __HOS_CONSOLE__
 
 #include "hos_defines.h"
-#include "fs/devices.h"
+#include "devices.h"
 
 #define DISPLAY_NULL	0
 #define DISPLAY_CONSOLE	1

kernel/display/kout.c

@@ -6,7 +6,8 @@
 #include "hos_defines.h"
 #include "kout.h"
 #include "lang/conv.h"
-#include "fs/devices.h"
+#include "devices.h"
+#include "char/misc_char.h"
 
 char	buffer[64];					// for hex/oct/dec/ascii conversion
 
@@ -14,9 +15,9 @@ char	buffer[64];					// for hex/oct/dec/ascii conversion
 void	putc(int c)
 {
 	#ifdef PARALLEL_DEBUG
-		char_write(MAJORC_PARALLEL, 0, c);
+		char_write(MAJOR_MISC_CHAR, MISC_CHAR_LP0, c);
 	#endif
-	char_write(MAJORC_VCONSOLE, 1, c);		// write to vconsole with minor 1, first allocated
+	char_write(MAJOR_VCONSOLE, 1, c);		// write to vconsole with minor 1, first allocated
 }