GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 21:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

stdio/device: rework function naming convention

Browse source 
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>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2009-05-16 12:14:54 +02:00 • committed by Wolfgang Denk
parent f732a7598f
commit 52cb4d4fb3
63 changed files with 198 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
board/MAI/AmigaOneG3SE/ps2kbd.c
View file

@ -34,7 +34,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <devices.h> #include <stdio_dev.h>
#include "ps2kbd.h" #include "ps2kbd.h"
@ -226,7 +226,7 @@ int overwrite_console (void)
int drv_isa_kbd_init (void) int drv_isa_kbd_init (void)
{ {
int error; int error;
device_t kbddev ; struct stdio_dev kbddev ;
char *stdinname = getenv ("stdin"); char *stdinname = getenv ("stdin");
if(isa_kbd_init() == -1) if(isa_kbd_init() == -1)
@ -239,7 +239,7 @@ int drv_isa_kbd_init (void)
kbddev.getc = kbd_getc ; kbddev.getc = kbd_getc ;
kbddev.tstc = kbd_testc ; kbddev.tstc = kbd_testc ;
error = device_register (&kbddev); error = stdio_register (&kbddev);
if(error==0) { if(error==0) {
/* check if this is the standard input device */ /* check if this is the standard input device */
if(strcmp(stdinname,DEVNAME)==0) { if(strcmp(stdinname,DEVNAME)==0) {

6
board/MAI/AmigaOneG3SE/video.c
View file

@ -22,7 +22,7 @@
*/ */
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#include "memio.h" #include "memio.h"
#include <part.h> #include <part.h>
@ -98,7 +98,7 @@ int video_inited = 0;
int drv_video_init(void) int drv_video_init(void)
{ {
int error, devices = 1 ; int error, devices = 1 ;
device_t vgadev ; struct stdio_dev vgadev ;
if (video_inited) return 1; if (video_inited) return 1;
video_inited = 1; video_inited = 1;
video_init(); video_init();
@ -112,7 +112,7 @@ int drv_video_init(void)
vgadev.tstc = NULL; vgadev.tstc = NULL;
vgadev.start = video_start; vgadev.start = video_start;
error = device_register (&vgadev); error = stdio_register (&vgadev);
if (error == 0) if (error == 0)
{ {

6
board/bf527-ezkit/video.c
View file

@ -14,7 +14,7 @@
#include <asm/mach-common/bits/dma.h> #include <asm/mach-common/bits/dma.h>
#include <i2c.h> #include <i2c.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
int gunzip(void *, int, unsigned char *, unsigned long *); int gunzip(void *, int, unsigned char *, unsigned long *);
@ -272,7 +272,7 @@ void video_puts(const char *s)
int drv_video_init(void) int drv_video_init(void)
{ {
int error, devices = 1; int error, devices = 1;
device_t videodev; struct stdio_dev videodev;
u8 *dst; u8 *dst;
u32 fbmem_size = LCD_X_RES * LCD_Y_RES * LCD_PIXEL_SIZE + ACTIVE_VIDEO_MEM_OFFSET; u32 fbmem_size = LCD_X_RES * LCD_Y_RES * LCD_PIXEL_SIZE + ACTIVE_VIDEO_MEM_OFFSET;
@ -311,7 +311,7 @@ int drv_video_init(void)
videodev.putc = video_putc; /* 'putc' function */ videodev.putc = video_putc; /* 'putc' function */
videodev.puts = video_puts; /* 'puts' function */ videodev.puts = video_puts; /* 'puts' function */
error = device_register(&videodev); error = stdio_register(&videodev);
return (error == 0) ? devices : error; return (error == 0) ? devices : error;
} }

6
board/bf533-stamp/video.c
View file

@ -18,7 +18,7 @@
#include <asm/mach-common/bits/dma.h> #include <asm/mach-common/bits/dma.h>
#include <i2c.h> #include <i2c.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
int gunzip(void *, int, unsigned char *, unsigned long *); int gunzip(void *, int, unsigned char *, unsigned long *);
@ -154,7 +154,7 @@ static void video_init(char *NTSCFrame)
int drv_video_init(void) int drv_video_init(void)
{ {
device_t videodev; struct stdio_dev videodev;
video_init((void *)NTSC_FRAME_ADDR); video_init((void *)NTSC_FRAME_ADDR);
@ -163,5 +163,5 @@ int drv_video_init(void)
videodev.ext = DEV_EXT_VIDEO; videodev.ext = DEV_EXT_VIDEO;
videodev.flags = DEV_FLAGS_SYSTEM; videodev.flags = DEV_FLAGS_SYSTEM;
return device_register(&videodev); return stdio_register(&videodev);
} }

6
board/bf548-ezkit/video.c
View file

@ -14,7 +14,7 @@
#include <asm/mach-common/bits/dma.h> #include <asm/mach-common/bits/dma.h>
#include <i2c.h> #include <i2c.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
int gunzip(void *, int, unsigned char *, unsigned long *); int gunzip(void *, int, unsigned char *, unsigned long *);
@ -282,7 +282,7 @@ void video_puts(const char *s)
int drv_video_init(void) int drv_video_init(void)
{ {
int error, devices = 1; int error, devices = 1;
device_t videodev; struct stdio_dev videodev;
u8 *dst; u8 *dst;
u32 fbmem_size = LCD_X_RES * LCD_Y_RES * LCD_PIXEL_SIZE + ACTIVE_VIDEO_MEM_OFFSET; u32 fbmem_size = LCD_X_RES * LCD_Y_RES * LCD_PIXEL_SIZE + ACTIVE_VIDEO_MEM_OFFSET;
@ -321,7 +321,7 @@ int drv_video_init(void)
videodev.putc = video_putc; /* 'putc' function */ videodev.putc = video_putc; /* 'putc' function */
videodev.puts = video_puts; /* 'puts' function */ videodev.puts = video_puts; /* 'puts' function */
error = device_register(&videodev); error = stdio_register(&videodev);
return (error == 0) ? devices : error; return (error == 0) ? devices : error;
} }

2
board/bmw/bmw.c
View file

@ -26,7 +26,7 @@
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <net.h> #include <net.h>
#include <timestamp.h> #include <timestamp.h>
#include <dtt.h> #include <dtt.h>

2
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
View file

@ -33,7 +33,7 @@
#include "../common/fsl_diu_fb.h" #include "../common/fsl_diu_fb.h"
#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
#include <devices.h> #include <stdio_dev.h>
#include <video_fb.h> #include <video_fb.h>
#endif #endif

2
board/linkstation/avr.c
View file

@ -22,7 +22,7 @@
*/ */
#include <common.h> #include <common.h>
#include <ns16550.h> #include <ns16550.h>
#include <console.h> #include <stdio_dev.h>
/* Button codes from the AVR */ /* Button codes from the AVR */
#define PWRR 0x20 /* Power button release */ #define PWRR 0x20 /* Power button release */

2
board/mpl/common/common_util.c
View file

@ -29,7 +29,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <i2c.h> #include <i2c.h>
#include <devices.h> #include <stdio_dev.h>
#include <pci.h> #include <pci.h>
#include <malloc.h> #include <malloc.h>
#include <bzlib.h> #include <bzlib.h>

2
board/mpl/common/isa.c
View file

@ -26,7 +26,7 @@
#include <common.h> #include <common.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <devices.h> #include <stdio_dev.h>
#include "isa.h" #include "isa.h"
#include "piix4_pci.h" #include "piix4_pci.h"
#include "kbd.h" #include "kbd.h"

6
board/mpl/common/kbd.c
View file

@ -28,7 +28,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <devices.h> #include <stdio_dev.h>
#include "isa.h" #include "isa.h"
#include "kbd.h" #include "kbd.h"
@ -215,7 +215,7 @@ int overwrite_console (void)
int drv_isa_kbd_init (void) int drv_isa_kbd_init (void)
{ {
int error; int error;
device_t kbddev ; struct stdio_dev kbddev ;
char *stdinname = getenv ("stdin"); char *stdinname = getenv ("stdin");
if(isa_kbd_init()==-1) if(isa_kbd_init()==-1)
@ -228,7 +228,7 @@ int drv_isa_kbd_init (void)
kbddev.getc = kbd_getc ; kbddev.getc = kbd_getc ;
kbddev.tstc = kbd_testc ; kbddev.tstc = kbd_testc ;
error = device_register (&kbddev); error = stdio_register (&kbddev);
if(error==0) { if(error==0) {
/* check if this is the standard input device */ /* check if this is the standard input device */
if(strcmp(stdinname,DEVNAME)==0) { if(strcmp(stdinname,DEVNAME)==0) {

6
board/mpl/pati/pati.c
View file

@ -46,7 +46,7 @@
#include <common.h> #include <common.h>
#include <mpc5xx.h> #include <mpc5xx.h>
#include <devices.h> #include <stdio_dev.h>
#include <pci_ids.h> #include <pci_ids.h>
#define PLX9056_LOC #define PLX9056_LOC
#include "plx9056.h" #include "plx9056.h"
@ -447,7 +447,7 @@ int checkboard (void)
int recbuf[REC_BUFFER_SIZE]; int recbuf[REC_BUFFER_SIZE];
static int r_ptr = 0; static int r_ptr = 0;
int w_ptr; int w_ptr;
device_t pci_con_dev; struct stdio_dev pci_con_dev;
int conn=0; int conn=0;
int buff_full=0; int buff_full=0;
@ -584,7 +584,7 @@ void pci_con_connect(void)
pci_con_dev.puts = pci_con_puts; pci_con_dev.puts = pci_con_puts;
pci_con_dev.getc = pci_con_getc; pci_con_dev.getc = pci_con_getc;
pci_con_dev.tstc = pci_con_tstc; pci_con_dev.tstc = pci_con_tstc;
device_register (&pci_con_dev); stdio_register (&pci_con_dev);
printf("PATI ready for PCI connection, type ctrl-c for exit\n"); printf("PATI ready for PCI connection, type ctrl-c for exit\n");
do { do {
udelay(10); udelay(10);

6
board/netphone/phone_console.c
View file

@ -37,7 +37,7 @@
#include <version.h> #include <version.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#include <sed156x.h> #include <sed156x.h>
@ -325,7 +325,7 @@ int phone_getc(void)
int drv_phone_init(void) int drv_phone_init(void)
{ {
device_t console_dev; struct stdio_dev console_dev;
console_init(); console_init();
@ -340,7 +340,7 @@ int drv_phone_init(void)
console_dev.tstc = phone_tstc; /* 'tstc' function */ console_dev.tstc = phone_tstc; /* 'tstc' function */
console_dev.getc = phone_getc; /* 'getc' function */ console_dev.getc = phone_getc; /* 'getc' function */
if (device_register(&console_dev) == 0) if (stdio_register(&console_dev) == 0)
return 1; return 1;
return 0; return 0;

8
board/rbc823/kbd.c
View file

@ -30,7 +30,7 @@
#include <common.h> #include <common.h>
#include <watchdog.h> #include <watchdog.h>
#include <commproc.h> #include <commproc.h>
#include <devices.h> #include <stdio_dev.h>
#include <lcd.h> #include <lcd.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -249,18 +249,18 @@ int smc1_tstc(void)
int drv_keyboard_init(void) int drv_keyboard_init(void)
{ {
int error = 0; int error = 0;
device_t kbd_dev; struct stdio_dev kbd_dev;
if (0) { if (0) {
/* register the keyboard */ /* register the keyboard */
memset (&kbd_dev, 0, sizeof(device_t)); memset (&kbd_dev, 0, sizeof(struct stdio_dev));
strcpy(kbd_dev.name, "kbd"); strcpy(kbd_dev.name, "kbd");
kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
kbd_dev.putc = NULL; kbd_dev.putc = NULL;
kbd_dev.puts = NULL; kbd_dev.puts = NULL;
kbd_dev.getc = smc1_getc; kbd_dev.getc = smc1_getc;
kbd_dev.tstc = smc1_tstc; kbd_dev.tstc = smc1_tstc;
error = device_register (&kbd_dev); error = stdio_register (&kbd_dev);
} else { } else {
lcd_is_enabled = 0; lcd_is_enabled = 0;
lcd_disable(); lcd_disable();

2
board/trab/vfd.c
View file

@ -36,7 +36,7 @@
#include <version.h> #include <version.h>
#include <stdarg.h> #include <stdarg.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#include <s3c2400.h> #include <s3c2400.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;

2
common/Makefile
View file

@ -32,7 +32,6 @@ COBJS-y += main.o
COBJS-y += circbuf.o COBJS-y += circbuf.o
COBJS-y += console.o COBJS-y += console.o
COBJS-y += command.o COBJS-y += command.o
COBJS-y += devices.o
COBJS-y += dlmalloc.o COBJS-y += dlmalloc.o
COBJS-y += exports.o COBJS-y += exports.o
COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
@ -40,6 +39,7 @@ COBJS-y += image.o
COBJS-y += memsize.o COBJS-y += memsize.o
COBJS-y += s_record.o COBJS-y += s_record.o
COBJS-$(CONFIG_SERIAL_MULTI) += serial.o COBJS-$(CONFIG_SERIAL_MULTI) += serial.o
COBJS-y += stdio.o
COBJS-y += xyzModem.o COBJS-y += xyzModem.o
# core command # core command

8
common/cmd_console.c
View file

@ -26,22 +26,22 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <devices.h> #include <stdio_dev.h>
extern void _do_coninfo (void); extern void _do_coninfo (void);
int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[]) int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
{ {
int l; int l;
struct list_head *list = device_get_list(); struct list_head *list = stdio_get_list();
struct list_head *pos; struct list_head *pos;
device_t *dev; struct stdio_dev *dev;
/* Scan for valid output and input devices */ /* Scan for valid output and input devices */
puts ("List of available devices:\n"); puts ("List of available devices:\n");
list_for_each(pos, list) { list_for_each(pos, list) {
dev = list_entry(pos, device_t, list); dev = list_entry(pos, struct stdio_dev, list);
printf ("%-8s %08x %c%c%c ", printf ("%-8s %08x %c%c%c ",
dev->name, dev->name,

6
common/cmd_log.c
View file

@ -42,7 +42,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <devices.h> #include <stdio_dev.h>
#include <post.h> #include <post.h>
#include <logbuff.h> #include <logbuff.h>
@ -142,7 +142,7 @@ void logbuff_reset (void)
int drv_logbuff_init (void) int drv_logbuff_init (void)
{ {
device_t logdev; struct stdio_dev logdev;
int rc; int rc;
/* Device initialization */ /* Device initialization */
@ -154,7 +154,7 @@ int drv_logbuff_init (void)
logdev.putc = logbuff_putc; /* 'putc' function */ logdev.putc = logbuff_putc; /* 'putc' function */
logdev.puts = logbuff_puts; /* 'puts' function */ logdev.puts = logbuff_puts; /* 'puts' function */
rc = device_register (&logdev); rc = stdio_register (&logdev);
return (rc == 0) ? 1 : rc; return (rc == 0) ? 1 : rc;
} }

6
common/cmd_terminal.c
View file

@ -26,19 +26,19 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <devices.h> #include <stdio_dev.h>
#include <serial.h> #include <serial.h>
int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char *argv[]) int do_terminal(cmd_tbl_t * cmd, int flag, int argc, char *argv[])
{ {
int last_tilde = 0; int last_tilde = 0;
device_t *dev = NULL; struct stdio_dev *dev = NULL;
if (argc < 1) if (argc < 1)
return -1; return -1;
/* Scan for selected output/input device */ /* Scan for selected output/input device */
dev = device_get_by_name(argv[1]); dev = stdio_get_by_name(argv[1]);
if (!dev) if (!dev)
return -1; return -1;

36
common/console.c
View file

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <stdarg.h> #include <stdarg.h>
#include <malloc.h> #include <malloc.h>
#include <console.h> #include <stdio_dev.h>
#include <exports.h> #include <exports.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -48,7 +48,7 @@ extern int overwrite_console(void);
#endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */ #endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */
static int console_setfile(int file, device_t * dev) static int console_setfile(int file, struct stdio_dev * dev)
{ {
int error = 0; int error = 0;
@ -96,8 +96,8 @@ static int console_setfile(int file, device_t * dev)
#if defined(CONFIG_CONSOLE_MUX) #if defined(CONFIG_CONSOLE_MUX)
/** Console I/O multiplexing *******************************************/ /** Console I/O multiplexing *******************************************/
static device_t *tstcdev; static struct stdio_dev *tstcdev;
device_t **console_devices[MAX_FILES]; struct stdio_dev **console_devices[MAX_FILES];
int cd_count[MAX_FILES]; int cd_count[MAX_FILES];
/* /*
@ -119,7 +119,7 @@ static int console_getc(int file)
static int console_tstc(int file) static int console_tstc(int file)
{ {
int i, ret; int i, ret;
device_t *dev; struct stdio_dev *dev;
disable_ctrlc(1); disable_ctrlc(1);
for (i = 0; i < cd_count[file]; i++) { for (i = 0; i < cd_count[file]; i++) {
@ -141,7 +141,7 @@ static int console_tstc(int file)
static void console_putc(int file, const char c) static void console_putc(int file, const char c)
{ {
int i; int i;
device_t *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[file]; i++) { for (i = 0; i < cd_count[file]; i++) {
dev = console_devices[file][i]; dev = console_devices[file][i];
@ -153,7 +153,7 @@ static void console_putc(int file, const char c)
static void console_puts(int file, const char *s) static void console_puts(int file, const char *s)
{ {
int i; int i;
device_t *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[file]; i++) { for (i = 0; i < cd_count[file]; i++) {
dev = console_devices[file][i]; dev = console_devices[file][i];
@ -167,7 +167,7 @@ static inline void console_printdevs(int file)
iomux_printdevs(file); iomux_printdevs(file);
} }
static inline void console_doenv(int file, device_t *dev) static inline void console_doenv(int file, struct stdio_dev *dev)
{ {
iomux_doenv(file, dev->name); iomux_doenv(file, dev->name);
} }
@ -197,7 +197,7 @@ static inline void console_printdevs(int file)
printf("%s\n", stdio_devices[file]->name); printf("%s\n", stdio_devices[file]->name);
} }
static inline void console_doenv(int file, device_t *dev) static inline void console_doenv(int file, struct stdio_dev *dev)
{ {
console_setfile(file, dev); console_setfile(file, dev);
} }
@ -479,11 +479,11 @@ inline void dbg(const char *fmt, ...)
/** U-Boot INIT FUNCTIONS *************************************************/ /** U-Boot INIT FUNCTIONS *************************************************/
device_t *search_device(int flags, char *name) struct stdio_dev *search_device(int flags, char *name)
{ {
device_t *dev; struct stdio_dev *dev;
dev = device_get_by_name(name); dev = stdio_get_by_name(name);
if (dev && (dev->flags & flags)) if (dev && (dev->flags & flags))
return dev; return dev;
@ -494,7 +494,7 @@ device_t *search_device(int flags, char *name)
int console_assign(int file, char *devname) int console_assign(int file, char *devname)
{ {
int flag; int flag;
device_t *dev; struct stdio_dev *dev;
/* Check for valid file */ /* Check for valid file */
switch (file) { switch (file) {
@ -537,7 +537,7 @@ int console_init_f(void)
int console_init_r(void) int console_init_r(void)
{ {
char *stdinname, *stdoutname, *stderrname; char *stdinname, *stdoutname, *stderrname;
device_t *inputdev = NULL, *outputdev = NULL, *errdev = NULL; struct stdio_dev *inputdev = NULL, *outputdev = NULL, *errdev = NULL;
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE #ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE
int i; int i;
#endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */ #endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */
@ -645,11 +645,11 @@ done:
/* Called after the relocation - use desired console functions */ /* Called after the relocation - use desired console functions */
int console_init_r(void) int console_init_r(void)
{ {
device_t *inputdev = NULL, *outputdev = NULL; struct stdio_dev *inputdev = NULL, *outputdev = NULL;
int i; int i;
struct list_head *list = device_get_list(); struct list_head *list = stdio_get_list();
struct list_head *pos; struct list_head *pos;
device_t *dev; struct stdio_dev *dev;
#ifdef CONFIG_SPLASH_SCREEN #ifdef CONFIG_SPLASH_SCREEN
/* /*
@ -662,7 +662,7 @@ int console_init_r(void)
/* Scan devices looking for input and output devices */ /* Scan devices looking for input and output devices */
list_for_each(pos, list) { list_for_each(pos, list) {
dev = list_entry(pos, device_t, list); dev = list_entry(pos, struct stdio_dev, list);
if ((dev->flags & DEV_FLAGS_INPUT) && (inputdev == NULL)) { if ((dev->flags & DEV_FLAGS_INPUT) && (inputdev == NULL)) {
inputdev = dev; inputdev = dev;

14
common/iomux.c
View file

@ -29,7 +29,7 @@
void iomux_printdevs(const int console) void iomux_printdevs(const int console)
{ {
int i; int i;
device_t *dev; struct stdio_dev *dev;
for (i = 0; i < cd_count[console]; i++) { for (i = 0; i < cd_count[console]; i++) {
dev = console_devices[console][i]; dev = console_devices[console][i];
@ -43,8 +43,8 @@ int iomux_doenv(const int console, const char *arg)
{ {
char *console_args, *temp, **start; char *console_args, *temp, **start;
int i, j, k, io_flag, cs_idx, repeat; int i, j, k, io_flag, cs_idx, repeat;
device_t *dev; struct stdio_dev *dev;
device_t **cons_set; struct stdio_dev **cons_set;
console_args = strdup(arg); console_args = strdup(arg);
if (console_args == NULL) if (console_args == NULL)
@ -85,7 +85,7 @@ int iomux_doenv(const int console, const char *arg)
*temp = '\0'; *temp = '\0';
start[i] = temp + 1; start[i] = temp + 1;
} }
cons_set = (device_t **)calloc(i, sizeof(device_t *)); cons_set = (struct stdio_dev **)calloc(i, sizeof(struct stdio_dev *));
if (cons_set == NULL) { if (cons_set == NULL) {
free(start); free(start);
free(console_args); free(console_args);
@ -158,14 +158,14 @@ int iomux_doenv(const int console, const char *arg)
} else { } else {
/* Works even if console_devices[console] is NULL. */ /* Works even if console_devices[console] is NULL. */
console_devices[console] = console_devices[console] =
(device_t **)realloc(console_devices[console], (struct stdio_dev **)realloc(console_devices[console],
cs_idx * sizeof(device_t *)); cs_idx * sizeof(struct stdio_dev *));
if (console_devices[console] == NULL) { if (console_devices[console] == NULL) {
free(cons_set); free(cons_set);
return 1; return 1;
} }
memcpy(console_devices[console], cons_set, cs_idx * memcpy(console_devices[console], cons_set, cs_idx *
sizeof(device_t *)); sizeof(struct stdio_dev *));
cd_count[console] = cs_idx; cd_count[console] = cs_idx;
} }

6
common/lcd.c
View file

@ -34,7 +34,7 @@
#include <command.h> #include <command.h>
#include <stdarg.h> #include <stdarg.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#if defined(CONFIG_POST) #if defined(CONFIG_POST)
#include <post.h> #include <post.h>
#endif #endif
@ -355,7 +355,7 @@ static void test_pattern (void)
int drv_lcd_init (void) int drv_lcd_init (void)
{ {
device_t lcddev; struct stdio_dev lcddev;
int rc; int rc;
lcd_base = (void *)(gd->fb_base); lcd_base = (void *)(gd->fb_base);
@ -373,7 +373,7 @@ int drv_lcd_init (void)
lcddev.putc = lcd_putc; /* 'putc' function */ lcddev.putc = lcd_putc; /* 'putc' function */
lcddev.puts = lcd_puts; /* 'puts' function */ lcddev.puts = lcd_puts; /* 'puts' function */
rc = device_register (&lcddev); rc = stdio_register (&lcddev);
return (rc == 0) ? 1 : rc; return (rc == 0) ? 1 : rc;
} }

8
common/serial.c
View file

@ -23,7 +23,7 @@
#include <common.h> #include <common.h>
#include <serial.h> #include <serial.h>
#include <devices.h> #include <stdio_dev.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -142,9 +142,9 @@ void serial_initialize (void)
serial_assign (default_serial_console ()->name); serial_assign (default_serial_console ()->name);
} }
void serial_devices_init (void) void serial_stdio_init (void)
{ {
device_t dev; struct stdio_dev dev;
struct serial_device *s = serial_devices; struct serial_device *s = serial_devices;
while (s) { while (s) {
@ -159,7 +159,7 @@ void serial_devices_init (void)
dev.getc = s->getc; dev.getc = s->getc;
dev.tstc = s->tstc; dev.tstc = s->tstc;
device_register (&dev); stdio_register (&dev);
s = s->next; s = s->next;
} }

50
common/devices.c → common/stdio.c
View file

@ -25,7 +25,7 @@
#include <common.h> #include <common.h>
#include <stdarg.h> #include <stdarg.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <serial.h> #include <serial.h>
#ifdef CONFIG_LOGBUFFER #ifdef CONFIG_LOGBUFFER
#include <logbuff.h> #include <logbuff.h>
@ -36,8 +36,8 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static device_t devs; static struct stdio_dev devs;
device_t *stdio_devices[] = { NULL, NULL, NULL }; struct stdio_dev *stdio_devices[] = { NULL, NULL, NULL };
char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" }; char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV) #if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
@ -70,7 +70,7 @@ int nulldev_input(void)
static void drv_system_init (void) static void drv_system_init (void)
{ {
device_t dev; struct stdio_dev dev;
memset (&dev, 0, sizeof (dev)); memset (&dev, 0, sizeof (dev));
@ -88,7 +88,7 @@ static void drv_system_init (void)
dev.tstc = serial_tstc; dev.tstc = serial_tstc;
#endif #endif
device_register (&dev); stdio_register (&dev);
#ifdef CONFIG_SYS_DEVICE_NULLDEV #ifdef CONFIG_SYS_DEVICE_NULLDEV
memset (&dev, 0, sizeof (dev)); memset (&dev, 0, sizeof (dev));
@ -100,7 +100,7 @@ static void drv_system_init (void)
dev.getc = nulldev_input; dev.getc = nulldev_input;
dev.tstc = nulldev_input; dev.tstc = nulldev_input;
device_register (&dev); stdio_register (&dev);
#endif #endif
} }
@ -108,21 +108,21 @@ static void drv_system_init (void)
* DEVICES * DEVICES
************************************************************************** **************************************************************************
*/ */
struct list_head* device_get_list(void) struct list_head* stdio_get_list(void)
{ {
return &(devs.list); return &(devs.list);
} }
device_t* device_get_by_name(char* name) struct stdio_dev* stdio_get_by_name(char* name)
{ {
struct list_head *pos; struct list_head *pos;
device_t *dev; struct stdio_dev *dev;
if(!name) if(!name)
return NULL; return NULL;
list_for_each(pos, &(devs.list)) { list_for_each(pos, &(devs.list)) {
dev = list_entry(pos, device_t, list); dev = list_entry(pos, struct stdio_dev, list);
if(strcmp(dev->name, name) == 0) if(strcmp(dev->name, name) == 0)
return dev; return dev;
} }
@ -130,29 +130,29 @@ device_t* device_get_by_name(char* name)
return NULL; return NULL;
} }
device_t* device_clone(device_t *dev) struct stdio_dev* stdio_clone(struct stdio_dev *dev)
{ {
device_t *_dev; struct stdio_dev *_dev;
if(!dev) if(!dev)
return NULL; return NULL;
_dev = calloc(1, sizeof(device_t)); _dev = calloc(1, sizeof(struct stdio_dev));
if(!_dev) if(!_dev)
return NULL; return NULL;
memcpy(_dev, dev, sizeof(device_t)); memcpy(_dev, dev, sizeof(struct stdio_dev));
strncpy(_dev->name, dev->name, 16); strncpy(_dev->name, dev->name, 16);
return _dev; return _dev;
} }
int device_register (device_t * dev) int stdio_register (struct stdio_dev * dev)
{ {
device_t *_dev; struct stdio_dev *_dev;
_dev = device_clone(dev); _dev = stdio_clone(dev);
if(!_dev) if(!_dev)
return -1; return -1;
list_add_tail(&(_dev->list), &(devs.list)); list_add_tail(&(_dev->list), &(devs.list));
@ -162,15 +162,15 @@ int device_register (device_t * dev)
/* deregister the device "devname". /* deregister the device "devname".
* returns 0 if success, -1 if device is assigned and 1 if devname not found * returns 0 if success, -1 if device is assigned and 1 if devname not found
*/ */
#ifdef CONFIG_SYS_DEVICE_DEREGISTER #ifdef CONFIG_SYS_STDIO_DEREGISTER
int device_deregister(char *devname) int stdio_deregister(char *devname)
{ {
int l; int l;
struct list_head *pos; struct list_head *pos;
device_t *dev; struct stdio_dev *dev;
char temp_names[3][8]; char temp_names[3][8];
dev = device_get_by_name(devname); dev = stdio_get_by_name(devname);
if(!dev) /* device not found */ if(!dev) /* device not found */
return -1; return -1;
@ -189,7 +189,7 @@ int device_deregister(char *devname)
/* reassign Device list */ /* reassign Device list */
list_for_each(pos, &(devs.list)) { list_for_each(pos, &(devs.list)) {
dev = list_entry(pos, device_t, list); dev = list_entry(pos, struct stdio_dev, list);
for (l=0 ; l< MAX_FILES; l++) { for (l=0 ; l< MAX_FILES; l++) {
if(strcmp(dev->name, temp_names[l]) == 0) if(strcmp(dev->name, temp_names[l]) == 0)
stdio_devices[l] = dev; stdio_devices[l] = dev;
@ -197,9 +197,9 @@ int device_deregister(char *devname)
} }
return 0; return 0;
} }
#endif /* CONFIG_SYS_DEVICE_DEREGISTER */ #endif /* CONFIG_SYS_STDIO_DEREGISTER */
int devices_init (void) int stdio_init (void)
{ {
#ifndef CONFIG_ARM /* already relocated for current ARM implementation */ #ifndef CONFIG_ARM /* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off; ulong relocation_offset = gd->reloc_off;
@ -235,7 +235,7 @@ int devices_init (void)
#endif #endif
drv_system_init (); drv_system_init ();
#ifdef CONFIG_SERIAL_MULTI #ifdef CONFIG_SERIAL_MULTI
serial_devices_init (); serial_stdio_init ();
#endif #endif
#ifdef CONFIG_USB_TTY #ifdef CONFIG_USB_TTY
drv_usbtty_init (); drv_usbtty_init ();

14
common/usb_kbd.c
View file

@ -25,7 +25,7 @@
* *
*/ */
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <usb.h> #include <usb.h>
@ -153,7 +153,7 @@ static int usb_kbd_probe(struct usb_device *dev, unsigned int ifnum);
int drv_usb_kbd_init(void) int drv_usb_kbd_init(void)
{ {
int error,i; int error,i;
device_t usb_kbd_dev,*old_dev; struct stdio_dev usb_kbd_dev,*old_dev;
struct usb_device *dev; struct usb_device *dev;
char *stdinname = getenv ("stdin"); char *stdinname = getenv ("stdin");
@ -168,7 +168,7 @@ int drv_usb_kbd_init(void)
if(usb_kbd_probe(dev,0)==1) { /* Ok, we found a keyboard */ if(usb_kbd_probe(dev,0)==1) { /* Ok, we found a keyboard */
/* check, if it is already registered */ /* check, if it is already registered */
USB_KBD_PRINTF("USB KBD found set up device.\n"); USB_KBD_PRINTF("USB KBD found set up device.\n");
old_dev = device_get_by_name(DEVNAME); old_dev = stdio_get_by_name(DEVNAME);
if(old_dev) { if(old_dev) {
/* ok, already registered, just return ok */ /* ok, already registered, just return ok */
USB_KBD_PRINTF("USB KBD is already registered.\n"); USB_KBD_PRINTF("USB KBD is already registered.\n");
@ -176,7 +176,7 @@ int drv_usb_kbd_init(void)
} }
/* register the keyboard */ /* register the keyboard */
USB_KBD_PRINTF("USB KBD register.\n"); USB_KBD_PRINTF("USB KBD register.\n");
memset (&usb_kbd_dev, 0, sizeof(device_t)); memset (&usb_kbd_dev, 0, sizeof(struct stdio_dev));
strcpy(usb_kbd_dev.name, DEVNAME); strcpy(usb_kbd_dev.name, DEVNAME);
usb_kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; usb_kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
usb_kbd_dev.putc = NULL; usb_kbd_dev.putc = NULL;
@ -184,7 +184,7 @@ int drv_usb_kbd_init(void)
usb_kbd_dev.getc = usb_kbd_getc; usb_kbd_dev.getc = usb_kbd_getc;
usb_kbd_dev.tstc = usb_kbd_testc; usb_kbd_dev.tstc = usb_kbd_testc;
usb_kbd_dev.priv = (void *)dev; usb_kbd_dev.priv = (void *)dev;
error = device_register (&usb_kbd_dev); error = stdio_register (&usb_kbd_dev);
if(error==0) { if(error==0) {
/* check if this is the standard input device */ /* check if this is the standard input device */
if(strcmp(stdinname,DEVNAME)==0) { if(strcmp(stdinname,DEVNAME)==0) {
@ -212,8 +212,8 @@ int drv_usb_kbd_init(void)
/* deregistering the keyboard */ /* deregistering the keyboard */
int usb_kbd_deregister(void) int usb_kbd_deregister(void)
{ {
#ifdef CONFIG_SYS_DEVICE_DEREGISTER #ifdef CONFIG_SYS_STDIO_DEREGISTER
return device_deregister(DEVNAME); return stdio_deregister(DEVNAME);
#else #else
return 1; return 1;
#endif #endif

6
cpu/blackfin/jtag-console.c
View file

@ -7,7 +7,7 @@
*/ */
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#include <asm/blackfin.h> #include <asm/blackfin.h>
#ifndef CONFIG_JTAG_CONSOLE_TIMEOUT #ifndef CONFIG_JTAG_CONSOLE_TIMEOUT
@ -105,7 +105,7 @@ static int jtag_getc(void)
int drv_jtag_console_init(void) int drv_jtag_console_init(void)
{ {
device_t dev; struct stdio_dev dev;
int ret; int ret;
memset(&dev, 0x00, sizeof(dev)); memset(&dev, 0x00, sizeof(dev));
@ -116,7 +116,7 @@ int drv_jtag_console_init(void)
dev.tstc = jtag_tstc; dev.tstc = jtag_tstc;
dev.getc = jtag_getc; dev.getc = jtag_getc;
ret = device_register(&dev); ret = stdio_register(&dev);
return (ret == 0 ? 1 : ret); return (ret == 0 ? 1 : ret);
} }

2
cpu/mpc512x/diu.c
View file

@ -31,7 +31,7 @@
#include "../../board/freescale/common/fsl_diu_fb.h" #include "../../board/freescale/common/fsl_diu_fb.h"
#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
#include <devices.h> #include <stdio_dev.h>
#include <video_fb.h> #include <video_fb.h>
#endif #endif

2
cpu/mpc8xx/lcd.c
View file

@ -35,7 +35,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <lcdvideo.h> #include <lcdvideo.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#if defined(CONFIG_POST) #if defined(CONFIG_POST)
#include <post.h> #include <post.h>
#endif #endif

6
cpu/mpc8xx/video.c
View file

@ -36,7 +36,7 @@
#include <timestamp.h> #include <timestamp.h>
#include <i2c.h> #include <i2c.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#ifdef CONFIG_VIDEO #ifdef CONFIG_VIDEO
@ -1287,7 +1287,7 @@ int drv_video_init (void)
{ {
int error, devices = 1; int error, devices = 1;
device_t videodev; struct stdio_dev videodev;
video_init ((void *)(gd->fb_base)); /* Video initialization */ video_init ((void *)(gd->fb_base)); /* Video initialization */
@ -1301,7 +1301,7 @@ int drv_video_init (void)
videodev.putc = video_putc; /* 'putc' function */ videodev.putc = video_putc; /* 'putc' function */
videodev.puts = video_puts; /* 'puts' function */ videodev.puts = video_puts; /* 'puts' function */
error = device_register (&videodev); error = stdio_register (&videodev);
return (error == 0) ? devices : error; return (error == 0) ? devices : error;
} }

2
cpu/pxa/pxafb.c
View file

@ -32,7 +32,7 @@
#include <version.h> #include <version.h>
#include <stdarg.h> #include <stdarg.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#include <lcd.h> #include <lcd.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>

6
drivers/input/keyboard.c
View file

@ -11,7 +11,7 @@
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#include <keyboard.h> #include <keyboard.h>
#undef KBG_DEBUG #undef KBG_DEBUG
@ -268,7 +268,7 @@ extern int overwrite_console (void);
int kbd_init (void) int kbd_init (void)
{ {
int error; int error;
device_t kbddev ; struct stdio_dev kbddev ;
char *stdinname = getenv ("stdin"); char *stdinname = getenv ("stdin");
if(kbd_init_hw()==-1) if(kbd_init_hw()==-1)
@ -281,7 +281,7 @@ int kbd_init (void)
kbddev.getc = kbd_getc ; kbddev.getc = kbd_getc ;
kbddev.tstc = kbd_testc ; kbddev.tstc = kbd_testc ;
error = device_register (&kbddev); error = stdio_register (&kbddev);
if(error==0) { if(error==0) {
/* check if this is the standard input device */ /* check if this is the standard input device */
if(strcmp(stdinname,DEVNAME)==0) { if(strcmp(stdinname,DEVNAME)==0) {

6
drivers/net/netconsole.c
View file

@ -23,7 +23,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <devices.h> #include <stdio_dev.h>
#include <net.h> #include <net.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -243,7 +243,7 @@ int nc_tstc (void)
int drv_nc_init (void) int drv_nc_init (void)
{ {
device_t dev; struct stdio_dev dev;
int rc; int rc;
memset (&dev, 0, sizeof (dev)); memset (&dev, 0, sizeof (dev));
@ -256,7 +256,7 @@ int drv_nc_init (void)
dev.getc = nc_getc; dev.getc = nc_getc;
dev.tstc = nc_tstc; dev.tstc = nc_tstc;
rc = device_register (&dev); rc = stdio_register (&dev);
return (rc == 0) ? 1 : rc; return (rc == 0) ? 1 : rc;
} }

6
drivers/serial/arm_dcc.c
View file

@ -27,7 +27,7 @@
*/ */
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#if defined(CONFIG_CPU_V6) #if defined(CONFIG_CPU_V6)
/* /*
@ -148,7 +148,7 @@ int arm_dcc_tstc(void)
} }
#ifdef CONFIG_ARM_DCC_MULTI #ifdef CONFIG_ARM_DCC_MULTI
static device_t arm_dcc_dev; static struct stdio_dev arm_dcc_dev;
int drv_arm_dcc_init(void) int drv_arm_dcc_init(void)
{ {
@ -165,6 +165,6 @@ int drv_arm_dcc_init(void)
arm_dcc_dev.putc = arm_dcc_putc; /* 'putc' function */ arm_dcc_dev.putc = arm_dcc_putc; /* 'putc' function */
arm_dcc_dev.puts = arm_dcc_puts; /* 'puts' function */ arm_dcc_dev.puts = arm_dcc_puts; /* 'puts' function */
return device_register(&arm_dcc_dev); return stdio_register(&arm_dcc_dev);
} }
#endif #endif

6
drivers/serial/usbtty.c
View file

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <config.h> #include <config.h>
#include <circbuf.h> #include <circbuf.h>
#include <devices.h> #include <stdio_dev.h>
#include "usbtty.h" #include "usbtty.h"
#include "usb_cdc_acm.h" #include "usb_cdc_acm.h"
#include "usbdescriptors.h" #include "usbdescriptors.h"
@ -70,7 +70,7 @@ static circbuf_t usbtty_output;
/* /*
* Instance variables * Instance variables
*/ */
static device_t usbttydev; static struct stdio_dev usbttydev;
static struct usb_device_instance device_instance[1]; static struct usb_device_instance device_instance[1];
static struct usb_bus_instance bus_instance[1]; static struct usb_bus_instance bus_instance[1];
static struct usb_configuration_instance config_instance[NUM_CONFIGS]; static struct usb_configuration_instance config_instance[NUM_CONFIGS];
@ -570,7 +570,7 @@ int drv_usbtty_init (void)
usbttydev.putc = usbtty_putc; /* 'putc' function */ usbttydev.putc = usbtty_putc; /* 'putc' function */
usbttydev.puts = usbtty_puts; /* 'puts' function */ usbttydev.puts = usbtty_puts; /* 'puts' function */
rc = device_register (&usbttydev); rc = stdio_register (&usbttydev);
return (rc == 0) ? 1 : rc; return (rc == 0) ? 1 : rc;
} }

4
drivers/usb/musb/musb_hcd.c
View file

@ -801,7 +801,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe,
*/ */
void usb_event_poll() void usb_event_poll()
{ {
device_t *dev; struct stdio_dev *dev;
struct usb_device *usb_kbd_dev; struct usb_device *usb_kbd_dev;
struct usb_interface_descriptor *iface; struct usb_interface_descriptor *iface;
struct usb_endpoint_descriptor *ep; struct usb_endpoint_descriptor *ep;
@ -809,7 +809,7 @@ void usb_event_poll()
int maxp; int maxp;
/* Get the pointer to USB Keyboard device pointer */ /* Get the pointer to USB Keyboard device pointer */
dev = device_get_by_name("usbkbd"); dev = stdio_get_by_name("usbkbd");
usb_kbd_dev = (struct usb_device *)dev->priv; usb_kbd_dev = (struct usb_device *)dev->priv;
iface = &usb_kbd_dev->config.if_desc[0]; iface = &usb_kbd_dev->config.if_desc[0];
ep = &iface->ep_desc[0]; ep = &iface->ep_desc[0];

2
drivers/usb/musb/musb_hcd.h
View file

@ -26,7 +26,7 @@
#include "musb_core.h" #include "musb_core.h"
#ifdef CONFIG_USB_KEYBOARD #ifdef CONFIG_USB_KEYBOARD
#include <devices.h> #include <stdio_dev.h>
extern unsigned char new[]; extern unsigned char new[];
#endif #endif

6
drivers/video/cfb_console.c
View file

@ -183,7 +183,7 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the
#include <version.h> #include <version.h>
#include <linux/types.h> #include <linux/types.h>
#include <devices.h> #include <stdio_dev.h>
#include <video_font.h> #include <video_font.h>
#if defined(CONFIG_CMD_DATE) #if defined(CONFIG_CMD_DATE)
@ -1378,7 +1378,7 @@ int board_video_skip(void) __attribute__((weak, alias("__board_video_skip")));
int drv_video_init (void) int drv_video_init (void)
{ {
int skip_dev_init; int skip_dev_init;
device_t console_dev; struct stdio_dev console_dev;
/* Check if video initialization should be skipped */ /* Check if video initialization should be skipped */
if (board_video_skip()) if (board_video_skip())
@ -1412,7 +1412,7 @@ int drv_video_init (void)
console_dev.getc = VIDEO_GETC_FCT; /* 'getc' function */ console_dev.getc = VIDEO_GETC_FCT; /* 'getc' function */
#endif /* CONFIG_VGA_AS_SINGLE_DEVICE */ #endif /* CONFIG_VGA_AS_SINGLE_DEVICE */
if (device_register (&console_dev) != 0) if (stdio_register (&console_dev) != 0)
return 0; return 0;
/* Return success */ /* Return success */

2
include/configs/AmigaOneG3SE.h
View file

@ -363,7 +363,7 @@
#define CONFIG_USB_UHCI 1 #define CONFIG_USB_UHCI 1
#define CONFIG_USB_STORAGE 1 #define CONFIG_USB_STORAGE 1
#define CONFIG_USB_KEYBOARD 1 #define CONFIG_USB_KEYBOARD 1
#define CONFIG_SYS_DEVICE_DEREGISTER 1 /* needed by CONFIG_USB_KEYBOARD */ #define CONFIG_SYS_STDIO_DEREGISTER 1 /* needed by CONFIG_USB_KEYBOARD */
/* /*
* Autoboot stuff * Autoboot stuff

2
include/configs/MIP405.h
View file

@ -415,7 +415,7 @@
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
/* Enable needed helper functions */ /* Enable needed helper functions */
#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
#endif #endif
/************************************************************ /************************************************************
* Debug support * Debug support

2
include/configs/MPC8610HPCD.h
View file

@ -317,7 +317,7 @@
#define CONFIG_PCI_OHCI 1 #define CONFIG_PCI_OHCI 1
#define CONFIG_USB_OHCI_NEW 1 #define CONFIG_USB_OHCI_NEW 1
#define CONFIG_USB_KEYBOARD 1 #define CONFIG_USB_KEYBOARD 1
#define CONFIG_SYS_DEVICE_DEREGISTER #define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL 1 #define CONFIG_SYS_USB_EVENT_POLL 1
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15

2
include/configs/MPC8641HPCN.h
View file

@ -391,7 +391,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CONFIG_PCI_OHCI 1 #define CONFIG_PCI_OHCI 1
#define CONFIG_USB_OHCI_NEW 1 #define CONFIG_USB_OHCI_NEW 1
#define CONFIG_USB_KEYBOARD 1 #define CONFIG_USB_KEYBOARD 1
#define CONFIG_SYS_DEVICE_DEREGISTER #define CONFIG_SYS_STDIO_DEREGISTER
#define CONFIG_SYS_USB_EVENT_POLL 1 #define CONFIG_SYS_USB_EVENT_POLL 1
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15

2
include/configs/PIP405.h
View file

@ -361,7 +361,7 @@
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
/* Enable needed helper functions */ /* Enable needed helper functions */
#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
/************************************************************ /************************************************************
* Debug support * Debug support

2
include/configs/VCMA9.h
View file

@ -129,7 +129,7 @@
#define CONFIG_DOS_PARTITION 1 #define CONFIG_DOS_PARTITION 1
/* Enable needed helper functions */ /* Enable needed helper functions */
#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
/************************************************************ /************************************************************
* RTC * RTC

2
include/configs/gr_ep2s60.h
View file

@ -87,7 +87,7 @@
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
/* Enable needed helper functions */ /* Enable needed helper functions */
#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
#endif #endif
/* /*

2
include/configs/mp2usb.h
View file

@ -216,7 +216,7 @@
#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ #define CONFIG_SYS_MAXARGS 32 /* max number of command args */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ #define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK/2) /* AT91C_TC0_CMR is implicitly set to */ #define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK/2) /* AT91C_TC0_CMR is implicitly set to */

36
include/console.h
View file

@ -1,36 +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
*/
#ifndef _CONSOLE_H_
#define _CONSOLE_H_
#include <devices.h>
/*
** VARIABLES
*/
extern device_t *stdio_devices[] ;
extern char *stdio_names[MAX_FILES] ;
#endif

6
include/iomux.h
View file

@ -24,7 +24,7 @@
#ifndef _IO_MUX_H #ifndef _IO_MUX_H
#define _IO_MUX_H #define _IO_MUX_H
#include <devices.h> #include <stdio_dev.h>
/* /*
* Stuff required to support console multiplexing. * Stuff required to support console multiplexing.
@ -34,7 +34,7 @@
* Pointers to devices used for each file type. Defined in console.c * Pointers to devices used for each file type. Defined in console.c
* but storage is allocated in iomux.c. * but storage is allocated in iomux.c.
*/ */
extern device_t **console_devices[MAX_FILES]; extern struct stdio_dev **console_devices[MAX_FILES];
/* /*
* The count of devices assigned to each FILE. Defined in console.c * The count of devices assigned to each FILE. Defined in console.c
* and populated in iomux.c. * and populated in iomux.c.
@ -43,6 +43,6 @@ extern int cd_count[MAX_FILES];
int iomux_doenv(const int, const char *); int iomux_doenv(const int, const char *);
void iomux_printdevs(const int); void iomux_printdevs(const int);
device_t *search_device(int, char *); struct stdio_dev *search_device(int, char *);
#endif /* _IO_MUX_H */ #endif /* _IO_MUX_H */

2
include/serial.h
View file

@ -55,7 +55,7 @@ extern struct serial_device serial_btuart_device;
extern struct serial_device serial_stuart_device; extern struct serial_device serial_stuart_device;
extern void serial_initialize(void); extern void serial_initialize(void);
extern void serial_devices_init(void); extern void serial_stdio_init(void);
extern int serial_assign(char * name); extern int serial_assign(char * name);
extern void serial_reinit_all(void); extern void serial_reinit_all(void);

30
include/devices.h → include/stdio_dev.h
View file

@ -21,13 +21,13 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef _STDIO_DEV_H_
#define _STDIO_DEV_H_
#include <linux/list.h> #include <linux/list.h>
#ifndef _DEVICES_H_
#define _DEVICES_H_
/* /*
* CONSOLE DEVICES * STDIO DEVICES
*/ */
#define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */ #define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */
@ -36,7 +36,7 @@
#define DEV_EXT_VIDEO 0x00000001 /* Video extensions supported */ #define DEV_EXT_VIDEO 0x00000001 /* Video extensions supported */
/* Device information */ /* Device information */
typedef struct { struct stdio_dev {
int flags; /* Device flags: input/output/system */ int flags; /* Device flags: input/output/system */
int ext; /* Supported extensions */ int ext; /* Supported extensions */
char name[16]; /* Device name */ char name[16]; /* Device name */
@ -60,7 +60,7 @@ typedef struct {
void *priv; /* Private extensions */ void *priv; /* Private extensions */
struct list_head list; struct list_head list;
} device_t; };
/* /*
* VIDEO EXTENSIONS * VIDEO EXTENSIONS
@ -83,20 +83,20 @@ typedef struct {
/* /*
* VARIABLES * VARIABLES
*/ */
extern device_t *stdio_devices[]; extern struct stdio_dev *stdio_devices[];
extern char *stdio_names[MAX_FILES]; extern char *stdio_names[MAX_FILES];
/* /*
* PROTOTYPES * PROTOTYPES
*/ */
int device_register (device_t * dev); int stdio_register (struct stdio_dev * dev);
int devices_init (void); int stdio_init (void);
#ifdef CONFIG_SYS_DEVICE_DEREGISTER #ifdef CONFIG_SYS_STDIO_DEREGISTER
int device_deregister(char *devname); int stdio_deregister(char *devname);
#endif #endif
struct list_head* device_get_list(void); struct list_head* stdio_get_list(void);
device_t* device_get_by_name(char* name); struct stdio_dev* stdio_get_by_name(char* name);
device_t* device_clone(device_t *dev); struct stdio_dev* stdio_clone(struct stdio_dev *dev);
#ifdef CONFIG_ARM_DCC_MULTI #ifdef CONFIG_ARM_DCC_MULTI
int drv_arm_dcc_init(void); int drv_arm_dcc_init(void);
@ -123,4 +123,4 @@ int drv_nc_init (void);
int drv_jtag_console_init (void); int drv_jtag_console_init (void);
#endif #endif
#endif /* _DEVICES_H_ */ #endif

4
lib_arm/board.c
View file

@ -41,7 +41,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <timestamp.h> #include <timestamp.h>
#include <version.h> #include <version.h>
#include <net.h> #include <net.h>
@ -389,7 +389,7 @@ void start_armboot (void)
/* IP Address */ /* IP Address */
gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); gd->bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
devices_init (); /* get the devices list going. */ stdio_init (); /* get the devices list going. */
jumptable_init (); jumptable_init ();

4
lib_avr32/board.c
View file

@ -22,7 +22,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <timestamp.h> #include <timestamp.h>
#include <version.h> #include <version.h>
#include <net.h> #include <net.h>
@ -350,7 +350,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
devices_init(); stdio_init();
jumptable_init(); jumptable_init();
console_init_r(); console_init_r();

6
lib_blackfin/board.c
View file

@ -11,7 +11,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <devices.h> #include <stdio_dev.h>
#include <environment.h> #include <environment.h>
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
@ -354,8 +354,8 @@ void board_init_r(gd_t * id, ulong dest_addr)
/* relocate environment function pointers etc. */ /* relocate environment function pointers etc. */
env_relocate(); env_relocate();
/* Initialize devices */ /* Initialize stdio devices */
devices_init(); stdio_init();
jumptable_init(); jumptable_init();
/* Initialize the console (after the relocation and devices init) */ /* Initialize the console (after the relocation and devices init) */

2
lib_blackfin/post.c
View file

@ -22,7 +22,7 @@
*/ */
#include <common.h> #include <common.h>
#include <console.h> #include <stdio_dev.h>
#include <watchdog.h> #include <watchdog.h>
#include <post.h> #include <post.h>

4
lib_i386/board.c
View file

@ -31,7 +31,7 @@
#include <common.h> #include <common.h>
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
#include <devices.h> #include <stdio_dev.h>
#include <timestamp.h> #include <timestamp.h>
#include <version.h> #include <version.h>
#include <malloc.h> #include <malloc.h>
@ -299,7 +299,7 @@ void start_i386boot (void)
show_boot_progress(0x27); show_boot_progress(0x27);
devices_init (); stdio_init ();
jumptable_init (); jumptable_init ();

10
lib_i386/video.c
View file

@ -23,7 +23,7 @@
#include <common.h> #include <common.h>
#include <pci.h> #include <pci.h>
#include <devices.h> #include <stdio_dev.h>
#include <i8042.h> #include <i8042.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/realmode.h> #include <asm/realmode.h>
@ -168,8 +168,8 @@ int video_init(void)
{ {
u16 pos; u16 pos;
static device_t vga_dev; static struct stdio_dev vga_dev;
static device_t kbd_dev; static struct stdio_dev kbd_dev;
vidmem = (char *) 0xb8000; vidmem = (char *) 0xb8000;
vidport = 0x3d4; vidport = 0x3d4;
@ -203,7 +203,7 @@ int video_init(void)
vga_dev.tstc = NULL; /* 'tstc' function */ vga_dev.tstc = NULL; /* 'tstc' function */
vga_dev.getc = NULL; /* 'getc' function */ vga_dev.getc = NULL; /* 'getc' function */
if (device_register(&vga_dev) == 0) { if (stdio_register(&vga_dev) == 0) {
return 1; return 1;
} }
@ -220,7 +220,7 @@ int video_init(void)
kbd_dev.tstc = i8042_tstc; /* 'tstc' function */ kbd_dev.tstc = i8042_tstc; /* 'tstc' function */
kbd_dev.getc = i8042_getc; /* 'getc' function */ kbd_dev.getc = i8042_getc; /* 'getc' function */
if (device_register(&kbd_dev) == 0) { if (stdio_register(&kbd_dev) == 0) {
return 1; return 1;
} }
return 0; return 0;

6
lib_m68k/board.c
View file

@ -28,7 +28,7 @@
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <asm/immap.h> #include <asm/immap.h>
@ -595,8 +595,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif #endif
/** leave this here (after malloc(), environment and PCI are working) **/ /** leave this here (after malloc(), environment and PCI are working) **/
/* Initialize devices */ /* Initialize stdio devices */
devices_init (); stdio_init ();
/* Initialize the jump table for applications */ /* Initialize the jump table for applications */
jumptable_init (); jumptable_init ();

6
lib_mips/board.c
View file

@ -24,7 +24,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <timestamp.h> #include <timestamp.h>
#include <version.h> #include <version.h>
#include <net.h> #include <net.h>
@ -411,8 +411,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif #endif
/** leave this here (after malloc(), environment and PCI are working) **/ /** leave this here (after malloc(), environment and PCI are working) **/
/* Initialize devices */ /* Initialize stdio devices */
devices_init (); stdio_init ();
jumptable_init (); jumptable_init ();

4
lib_nios/board.c
View file

@ -25,7 +25,7 @@
*/ */
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#include <watchdog.h> #include <watchdog.h>
#include <net.h> #include <net.h>
#ifdef CONFIG_STATUS_LED #ifdef CONFIG_STATUS_LED
@ -155,7 +155,7 @@ void board_init (void)
bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
WATCHDOG_RESET (); WATCHDOG_RESET ();
devices_init(); stdio_init();
jumptable_init(); jumptable_init();
console_init_r(); console_init_r();
/* /*

4
lib_nios2/board.c
View file

@ -25,7 +25,7 @@
*/ */
#include <common.h> #include <common.h>
#include <devices.h> #include <stdio_dev.h>
#include <watchdog.h> #include <watchdog.h>
#include <net.h> #include <net.h>
#ifdef CONFIG_STATUS_LED #ifdef CONFIG_STATUS_LED
@ -161,7 +161,7 @@ void board_init (void)
bd->bi_ip_addr = getenv_IPaddr ("ipaddr"); bd->bi_ip_addr = getenv_IPaddr ("ipaddr");
WATCHDOG_RESET (); WATCHDOG_RESET ();
devices_init(); stdio_init();
jumptable_init(); jumptable_init();
console_init_r(); console_init_r();

6
lib_ppc/board.c
View file

@ -25,7 +25,7 @@
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#ifdef CONFIG_8xx #ifdef CONFIG_8xx
#include <mpc8xx.h> #include <mpc8xx.h>
#endif #endif
@ -932,8 +932,8 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif #endif
/** leave this here (after malloc(), environment and PCI are working) **/ /** leave this here (after malloc(), environment and PCI are working) **/
/* Initialize devices */ /* Initialize stdio devices */
devices_init (); stdio_init ();
/* Initialize the jump table for applications */ /* Initialize the jump table for applications */
jumptable_init (); jumptable_init ();

4
lib_sh/board.c
View file

@ -21,7 +21,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <timestamp.h> #include <timestamp.h>
#include <version.h> #include <version.h>
#include <watchdog.h> #include <watchdog.h>
@ -150,7 +150,7 @@ init_fnc_t *init_sequence[] =
sh_flash_init, /* Flash memory(NOR) init*/ sh_flash_init, /* Flash memory(NOR) init*/
INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */ INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */
INIT_FUNC_PCI_INIT /* PCI init */ INIT_FUNC_PCI_INIT /* PCI init */
devices_init, stdio_init,
console_init_r, console_init_r,
interrupt_init, interrupt_init,
#ifdef BOARD_LATE_INIT #ifdef BOARD_LATE_INIT

6
lib_sparc/board.c
View file

@ -28,7 +28,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <malloc.h> #include <malloc.h>
#include <devices.h> #include <stdio_dev.h>
#include <config.h> #include <config.h>
#if defined(CONFIG_CMD_IDE) #if defined(CONFIG_CMD_IDE)
#include <ide.h> #include <ide.h>
@ -402,8 +402,8 @@ void board_init_f(ulong bootflag)
pci_init(); pci_init();
#endif #endif
/* Initialize devices */ /* Initialize stdio devices */
devices_init(); stdio_init();
/* Initialize the jump table for applications */ /* Initialize the jump table for applications */
jumptable_init(); jumptable_init();

2
post/post.c
View file

@ -22,7 +22,7 @@
*/ */
#include <common.h> #include <common.h>
#include <console.h> #include <stdio_dev.h>
#include <watchdog.h> #include <watchdog.h>
#include <post.h> #include <post.h>