stdio/device: rework function naming convention

So far the console API uses the following naming convention:

	======Extract======
	typedef struct device_t;

	int	device_register (device_t * dev);
	int	devices_init (void);
	int	device_deregister(char *devname);
	struct list_head* device_get_list(void);
	device_t* device_get_by_name(char* name);
	device_t* device_clone(device_t *dev);
	=======

which is too generic and confusing.

Instead of using device_XX and device_t we change this
into stdio_XX and stdio_dev

This will also allow to add later a generic device mechanism in order
to have support for multiple devices and driver instances.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Edited commit message.

Signed-off-by: Wolfgang Denk <wd@denx.de>

1 files changed, 0 insertions, 251 deletions

diff --git a/common/devices.c b/common/devices.c
deleted file mode 100644
index ba53c9b..0000000
--- a/common/devices.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * (C) Copyright 2000
- * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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 the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <config.h>
-#include <common.h>
-#include <stdarg.h>
-#include <malloc.h>
-#include <devices.h>
-#include <serial.h>
-#ifdef CONFIG_LOGBUFFER
-#include <logbuff.h>
-#endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
-#include <i2c.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static device_t devs;
-device_t *stdio_devices[] = { NULL, NULL, NULL };
-char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
-
-#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
-#define	CONFIG_SYS_DEVICE_NULLDEV	1
-#endif
-
-
-#ifdef CONFIG_SYS_DEVICE_NULLDEV
-void nulldev_putc(const char c)
-{
-	/* nulldev is empty! */
-}
-
-void nulldev_puts(const char *s)
-{
-	/* nulldev is empty! */
-}
-
-int nulldev_input(void)
-{
-	/* nulldev is empty! */
-	return 0;
-}
-#endif
-
-/**************************************************************************
- * SYSTEM DRIVERS
- **************************************************************************
- */
-
-static void drv_system_init (void)
-{
-	device_t dev;
-
-	memset (&dev, 0, sizeof (dev));
-
-	strcpy (dev.name, "serial");
-	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-#ifdef CONFIG_SERIAL_SOFTWARE_FIFO
-	dev.putc = serial_buffered_putc;
-	dev.puts = serial_buffered_puts;
-	dev.getc = serial_buffered_getc;
-	dev.tstc = serial_buffered_tstc;
-#else
-	dev.putc = serial_putc;
-	dev.puts = serial_puts;
-	dev.getc = serial_getc;
-	dev.tstc = serial_tstc;
-#endif
-
-	device_register (&dev);
-
-#ifdef CONFIG_SYS_DEVICE_NULLDEV
-	memset (&dev, 0, sizeof (dev));
-
-	strcpy (dev.name, "nulldev");
-	dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-	dev.putc = nulldev_putc;
-	dev.puts = nulldev_puts;
-	dev.getc = nulldev_input;
-	dev.tstc = nulldev_input;
-
-	device_register (&dev);
-#endif
-}
-
-/**************************************************************************
- * DEVICES
- **************************************************************************
- */
-struct list_head* device_get_list(void)
-{
-	return &(devs.list);
-}
-
-device_t* device_get_by_name(char* name)
-{
-	struct list_head *pos;
-	device_t *dev;
-
-	if(!name)
-		return NULL;
-
-	list_for_each(pos, &(devs.list)) {
-		dev = list_entry(pos, device_t, list);
-		if(strcmp(dev->name, name) == 0)
-			return dev;
-	}
-
-	return NULL;
-}
-
-device_t* device_clone(device_t *dev)
-{
-	device_t *_dev;
-
-	if(!dev)
-		return NULL;
-
-	_dev = calloc(1, sizeof(device_t));
-
-	if(!_dev)
-		return NULL;
-
-	memcpy(_dev, dev, sizeof(device_t));
-	strncpy(_dev->name, dev->name, 16);
-
-	return _dev;
-}
-
-int device_register (device_t * dev)
-{
-	device_t *_dev;
-
-	_dev = device_clone(dev);
-	if(!_dev)
-		return -1;
-	list_add_tail(&(_dev->list), &(devs.list));
-	return 0;
-}
-
-/* deregister the device "devname".
- * returns 0 if success, -1 if device is assigned and 1 if devname not found
- */
-#ifdef	CONFIG_SYS_DEVICE_DEREGISTER
-int device_deregister(char *devname)
-{
-	int l;
-	struct list_head *pos;
-	device_t *dev;
-	char temp_names[3][8];
-
-	dev = device_get_by_name(devname);
-
-	if(!dev) /* device not found */
-		return -1;
-	/* get stdio devices (ListRemoveItem changes the dev list) */
-	for (l=0 ; l< MAX_FILES; l++) {
-		if (stdio_devices[l] == dev) {
-			/* Device is assigned -> report error */
-			return -1;
-		}
-		memcpy (&temp_names[l][0],
-			stdio_devices[l]->name,
-			sizeof(stdio_devices[l]->name));
-	}
-
-	list_del(&(dev->list));
-
-	/* reassign Device list */
-	list_for_each(pos, &(devs.list)) {
-		dev = list_entry(pos, device_t, list);
-		for (l=0 ; l< MAX_FILES; l++) {
-			if(strcmp(dev->name, temp_names[l]) == 0)
-				stdio_devices[l] = dev;
-		}
-	}
-	return 0;
-}
-#endif	/* CONFIG_SYS_DEVICE_DEREGISTER */
-
-int devices_init (void)
-{
-#ifndef CONFIG_ARM	/* already relocated for current ARM implementation */
-	ulong relocation_offset = gd->reloc_off;
-	int i;
-
-	/* relocate device name pointers */
-	for (i = 0; i < (sizeof (stdio_names) / sizeof (char *)); ++i) {
-		stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
-						relocation_offset);
-	}
-#endif
-
-	/* Initialize the list */
-	INIT_LIST_HEAD(&(devs.list));
-
-#ifdef CONFIG_ARM_DCC_MULTI
-	drv_arm_dcc_init ();
-#endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
-	i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
-#ifdef CONFIG_LCD
-	drv_lcd_init ();
-#endif
-#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
-	drv_video_init ();
-#endif
-#ifdef CONFIG_KEYBOARD
-	drv_keyboard_init ();
-#endif
-#ifdef CONFIG_LOGBUFFER
-	drv_logbuff_init ();
-#endif
-	drv_system_init ();
-#ifdef CONFIG_SERIAL_MULTI
-	serial_devices_init ();
-#endif
-#ifdef CONFIG_USB_TTY
-	drv_usbtty_init ();
-#endif
-#ifdef CONFIG_NETCONSOLE
-	drv_nc_init ();
-#endif
-#ifdef CONFIG_JTAG_CONSOLE
-	drv_jtag_console_init ();
-#endif
-
-	return (0);
-}