svn_rev_109

do not know anymore

1 files changed, 4 insertions, 335 deletions

diff --git a/common/console.c b/common/console.c
index 76b4ad071a..17c1edd7bb 100644
--- a/common/console.c
+++ b/common/console.c
@@ -48,51 +48,6 @@ extern int overwrite_console (void);
 
 #endif /* CFG_CONSOLE_IS_IN_ENV */
 
-static int console_setfile (int file, device_t * dev)
-{
-	int error = 0;
-
-	if (dev == NULL)
-		return -1;
-
-	switch (file) {
-	case stdin:
-	case stdout:
-	case stderr:
-		/* Start new device */
-		if (dev->start) {
-			error = dev->start ();
-			/* If it's not started dont use it */
-			if (error < 0)
-				break;
-		}
-
-		/* Assign the new device (leaving the existing one started) */
-		stdio_devices[file] = dev;
-
-		/*
-		 * Update monitor functions
-		 * (to use the console stuff by other applications)
-		 */
-		switch (file) {
-		case stdin:
-			gd->jt[XF_getc] = dev->getc;
-			gd->jt[XF_tstc] = dev->tstc;
-			break;
-		case stdout:
-			gd->jt[XF_putc] = dev->putc;
-			gd->jt[XF_puts] = dev->puts;
-			gd->jt[XF_printf] = printf;
-			break;
-		}
-		break;
-
-	default:		/* Invalid file ID */
-		error = -1;
-	}
-	return error;
-}
-
 /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/
 
 void serial_printf (const char *fmt, ...)
@@ -111,7 +66,7 @@ void serial_printf (const char *fmt, ...)
 
 	serial_puts (printbuffer);
 }
-
+#if 0
 int fgetc (int file)
 {
 	if (file < MAX_FILES)
@@ -157,28 +112,16 @@ void fprintf (int file, const char *fmt, ...)
 	/* Send to desired file */
 	fputs (file, printbuffer);
 }
-
+#endif
 /** U-Boot INITIAL CONSOLE-COMPATIBLE FUNCTION *****************************/
 
 int getc (void)
 {
-	if (gd->flags & GD_FLG_DEVINIT) {
-		/* Get from the standard input */
-		return fgetc (stdin);
-	}
-
-	/* Send directly to the handler */
 	return serial_getc ();
 }
 
 int tstc (void)
 {
-	if (gd->flags & GD_FLG_DEVINIT) {
-		/* Test the standard input */
-		return ftstc (stdin);
-	}
-
-	/* Send directly to the handler */
 	return serial_tstc ();
 }
 
@@ -189,13 +132,7 @@ void putc (const char c)
 		return;
 #endif
 
-	if (gd->flags & GD_FLG_DEVINIT) {
-		/* Send to the standard output */
-		fputc (stdout, c);
-	} else {
-		/* Send directly to the handler */
-		serial_putc (c);
-	}
+	serial_putc (c);
 }
 
 void puts (const char *s)
@@ -205,13 +142,7 @@ void puts (const char *s)
 		return;
 #endif
 
-	if (gd->flags & GD_FLG_DEVINIT) {
-		/* Send to the standard output */
-		fputs (stdout, s);
-	} else {
-		/* Send directly to the handler */
-		serial_puts (s);
-	}
+	serial_puts (s);
 }
 
 void printf (const char *fmt, ...)
@@ -286,78 +217,6 @@ void clear_ctrlc (void)
 	ctrlc_was_pressed = 0;
 }
 
-#ifdef CONFIG_MODEM_SUPPORT_DEBUG
-char	screen[1024];
-char *cursor = screen;
-int once = 0;
-inline void dbg(const char *fmt, ...)
-{
-	va_list	args;
-	uint	i;
-	char	printbuffer[CFG_PBSIZE];
-
-	if (!once) {
-		memset(screen, 0, sizeof(screen));
-		once++;
-	}
-
-	va_start(args, fmt);
-
-	/* For this to work, printbuffer must be larger than
-	 * anything we ever want to print.
-	 */
-	i = vsprintf(printbuffer, fmt, args);
-	va_end(args);
-
-	if ((screen + sizeof(screen) - 1 - cursor) < strlen(printbuffer)+1) {
-		memset(screen, 0, sizeof(screen));
-		cursor = screen;
-	}
-	sprintf(cursor, printbuffer);
-	cursor += strlen(printbuffer);
-
-}
-#else
-inline void dbg(const char *fmt, ...)
-{
-}
-#endif
-
-/** U-Boot INIT FUNCTIONS *************************************************/
-
-int console_assign (int file, char *devname)
-{
-	int flag, i;
-
-	/* Check for valid file */
-	switch (file) {
-	case stdin:
-		flag = DEV_FLAGS_INPUT;
-		break;
-	case stdout:
-	case stderr:
-		flag = DEV_FLAGS_OUTPUT;
-		break;
-	default:
-		return -1;
-	}
-
-	/* Check for valid device name */
-
-	for (i = 1; i <= ListNumItems (devlist); i++) {
-		device_t *dev = ListGetPtrToItem (devlist, i);
-
-		if (strcmp (devname, dev->name) == 0) {
-			if (dev->flags & flag)
-				return console_setfile (file, dev);
-
-			return -1;
-		}
-	}
-
-	return -1;
-}
-
 /* Called before relocation - use serial functions */
 int console_init_f (void)
 {
@@ -370,193 +229,3 @@ int console_init_f (void)
 
 	return (0);
 }
-
-#if defined(CFG_CONSOLE_IS_IN_ENV) || defined(CONFIG_SPLASH_SCREEN) || defined(CONFIG_SILENT_CONSOLE)
-/* search a device */
-device_t *search_device (int flags, char *name)
-{
-	int i, items;
-	device_t *dev = NULL;
-
-	items = ListNumItems (devlist);
-	if (name == NULL)
-		return dev;
-
-	for (i = 1; i <= items; i++) {
-		dev = ListGetPtrToItem (devlist, i);
-		if ((dev->flags & flags) && (strcmp (name, dev->name) == 0)) {
-			break;
-		}
-	}
-	return dev;
-}
-#endif /* CFG_CONSOLE_IS_IN_ENV || CONFIG_SPLASH_SCREEN */
-
-#ifdef CFG_CONSOLE_IS_IN_ENV
-/* Called after the relocation - use desired console functions */
-int console_init_r (void)
-{
-	char *stdinname, *stdoutname, *stderrname;
-	device_t *inputdev = NULL, *outputdev = NULL, *errdev = NULL;
-#ifdef CFG_CONSOLE_ENV_OVERWRITE
-	int i;
-#endif /* CFG_CONSOLE_ENV_OVERWRITE */
-
-	/* set default handlers at first */
-	gd->jt[XF_getc] = serial_getc;
-	gd->jt[XF_tstc] = serial_tstc;
-	gd->jt[XF_putc] = serial_putc;
-	gd->jt[XF_puts] = serial_puts;
-	gd->jt[XF_printf] = serial_printf;
-
-	/* stdin stdout and stderr are in environment */
-	/* scan for it */
-	stdinname  = getenv ("stdin");
-	stdoutname = getenv ("stdout");
-	stderrname = getenv ("stderr");
-
-	if (OVERWRITE_CONSOLE == 0) { 	/* if not overwritten by config switch */
-		inputdev  = search_device (DEV_FLAGS_INPUT,  stdinname);
-		outputdev = search_device (DEV_FLAGS_OUTPUT, stdoutname);
-		errdev    = search_device (DEV_FLAGS_OUTPUT, stderrname);
-	}
-	/* if the devices are overwritten or not found, use default device */
-	if (inputdev == NULL) {
-		inputdev  = search_device (DEV_FLAGS_INPUT,  "serial");
-	}
-	if (outputdev == NULL) {
-		outputdev = search_device (DEV_FLAGS_OUTPUT, "serial");
-	}
-	if (errdev == NULL) {
-		errdev    = search_device (DEV_FLAGS_OUTPUT, "serial");
-	}
-	/* Initializes output console first */
-	if (outputdev != NULL) {
-		console_setfile (stdout, outputdev);
-	}
-	if (errdev != NULL) {
-		console_setfile (stderr, errdev);
-	}
-	if (inputdev != NULL) {
-		console_setfile (stdin, inputdev);
-	}
-
-	gd->flags |= GD_FLG_DEVINIT;	/* device initialization completed */
-
-#ifndef CFG_CONSOLE_INFO_QUIET
-	/* Print information */
-	puts ("In:    ");
-	if (stdio_devices[stdin] == NULL) {
-		puts ("No input devices available!\n");
-	} else {
-		printf ("%s\n", stdio_devices[stdin]->name);
-	}
-
-	puts ("Out:   ");
-	if (stdio_devices[stdout] == NULL) {
-		puts ("No output devices available!\n");
-	} else {
-		printf ("%s\n", stdio_devices[stdout]->name);
-	}
-
-	puts ("Err:   ");
-	if (stdio_devices[stderr] == NULL) {
-		puts ("No error devices available!\n");
-	} else {
-		printf ("%s\n", stdio_devices[stderr]->name);
-	}
-#endif /* CFG_CONSOLE_INFO_QUIET */
-
-#ifdef CFG_CONSOLE_ENV_OVERWRITE
-	/* set the environment variables (will overwrite previous env settings) */
-	for (i = 0; i < 3; i++) {
-		setenv (stdio_names[i], stdio_devices[i]->name);
-	}
-#endif /* CFG_CONSOLE_ENV_OVERWRITE */
-
-	return (0);
-}
-
-#else /* CFG_CONSOLE_IS_IN_ENV */
-
-/* Called after the relocation - use desired console functions */
-int console_init_r (void)
-{
-	device_t *inputdev = NULL, *outputdev = NULL;
-	int i, items = ListNumItems (devlist);
-
-#ifdef CONFIG_SPLASH_SCREEN
-	/* suppress all output if splash screen is enabled and we have
-	   a bmp to display                                            */
-	if (getenv("splashimage") != NULL)
-		outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev");
-#endif
-
-#ifdef CONFIG_SILENT_CONSOLE
-	/* Suppress all output if "silent" mode requested		*/
-	if (gd->flags & GD_FLG_SILENT)
-		outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev");
-#endif
-
-	/* Scan devices looking for input and output devices */
-	for (i = 1;
-	     (i <= items) && ((inputdev == NULL) || (outputdev == NULL));
-	     i++
-	    ) {
-		device_t *dev = ListGetPtrToItem (devlist, i);
-
-		if ((dev->flags & DEV_FLAGS_INPUT) && (inputdev == NULL)) {
-			inputdev = dev;
-		}
-		if ((dev->flags & DEV_FLAGS_OUTPUT) && (outputdev == NULL)) {
-			outputdev = dev;
-		}
-	}
-
-	/* Initializes output console first */
-	if (outputdev != NULL) {
-		console_setfile (stdout, outputdev);
-		console_setfile (stderr, outputdev);
-	}
-
-	/* Initializes input console */
-	if (inputdev != NULL) {
-		console_setfile (stdin, inputdev);
-	}
-
-	gd->flags |= GD_FLG_DEVINIT;	/* device initialization completed */
-
-#ifndef CFG_CONSOLE_INFO_QUIET
-	/* Print information */
-	puts ("In:    ");
-	if (stdio_devices[stdin] == NULL) {
-		puts ("No input devices available!\n");
-	} else {
-		printf ("%s\n", stdio_devices[stdin]->name);
-	}
-
-	puts ("Out:   ");
-	if (stdio_devices[stdout] == NULL) {
-		puts ("No output devices available!\n");
-	} else {
-		printf ("%s\n", stdio_devices[stdout]->name);
-	}
-
-	puts ("Err:   ");
-	if (stdio_devices[stderr] == NULL) {
-		puts ("No error devices available!\n");
-	} else {
-		printf ("%s\n", stdio_devices[stderr]->name);
-	}
-#endif /* CFG_CONSOLE_INFO_QUIET */
-
-	/* Setting environment variables */
-	for (i = 0; i < 3; i++) {
-		setenv (stdio_names[i], stdio_devices[i]->name);
-	}
-
-
-	return (0);
-}
-
-#endif /* CFG_CONSOLE_IS_IN_ENV */