console.h: remove non implement function : console_realloc
Subsystems (6)
PATCH 1/3 console.h: remove non implement function : console_realloc
--- include/console.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
include/console.h +0 -2
@@ -33,6 +33,4 @@extern device_t *stdio_devices[] ;extern char *stdio_names[MAX_FILES ] ; -int console_realloc (int top); -#endif
Signature · 1 line
1.6.1.3
PATCH 2/3 console: unify printing current devices
actually the mpl's boards duplicate the printing current devices from common/console.c
create stdio_print_current_devices() for this purpose
--- board/mpl/common/common_util.c | 30 ----------------------- board/mpl/common/common_util.h | 1 - board/mpl/mip405/mip405.c | 3 +- board/mpl/pip405/pip405.c | 3 +- board/mpl/vcma9/vcma9.c | 3 +- common/console.c | 51 ++++++++++++++++++++++------------------ include/console.h | 2 + 7 files changed, 36 insertions(+), 57 deletions(-)
board/mpl/common/common_util.c +0 -30
@@ -29,7 +29,6 @@#include <asm/processor.h> #include <asm/byteorder.h> #include <i2c.h> -#include <devices.h> #include <pci.h> #include <malloc.h> #include <bzlib.h>
@@ -428,35 +427,6 @@ void check_env(void) } } - -extern device_t *stdio_devices[]; -extern char *stdio_names[]; - -void show_stdio_dev (void ) -{ -/* 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 /* #if !defined(CONFIG_PATI) */ int do_mplcommon (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[])
board/mpl/common/common_util.h +0 -1
@@ -37,7 +37,6 @@ void get_backup_values(backup_t *buf);#define BOOT_PCI 0x02#endif -void show_stdio_dev (void );void check_env (void );#if defined(CONFIG_CMD_DOC )void doc_init (void );
board/mpl/mip405/mip405.c +2 -1
@@ -68,6 +68,7 @@#include <4xx_i2c.h> #include <miiphy.h> #include "../common/common_util.h" +#include <console.h> #include <i2c.h> #include <rtc.h>
@@ -735,7 +736,7 @@ int last_stage_init (void)printf ("Error writing to the PHY\n" ); }print_mip405_rev (); -show_stdio_dev (); +stdio_print_current_devices ();check_env ();/* check if RTC time is valid */ stop=get_timer (start);
board/mpl/pip405/pip405.c +2 -1
@@ -28,6 +28,7 @@#include "pip405.h" #include <asm/processor.h> #include <i2c.h> +#include <console.h> #include "../common/isa.h" #include "../common/common_util.h"
@@ -705,7 +706,7 @@ int last_stage_init (void) {print_pip405_rev ();isa_init (); -show_stdio_dev (); +stdio_print_current_devices ();check_env ();return 0 ; }
board/mpl/vcma9/vcma9.c +2 -1
@@ -27,6 +27,7 @@#include <common.h> #include <s3c2410.h> +#include <console.h> #include <i2c.h> #include "vcma9.h"
@@ -316,7 +317,7 @@ int last_stage_init(void) {mem_test_reloc ();checkboard (); -show_stdio_dev (); +stdio_print_current_devices ();check_env ();return 0 ; }
common/console.c +28 -23
63 lines not on this page · raw message
include/console.h +2 -0
@@ -33,4 +33,6 @@extern device_t *stdio_devices[] ;extern char *stdio_names[MAX_FILES ] ; +void stdio_print_current_devices (void ); +#endif
Signature · 1 line
1.6.1.3
RFC PATCH v2 3/3 stdio/device: rework function naming convention
actually the console API use 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 not console dependent and is confusing
instead of using device_XX and device_t
we now switch to stdio_XX and stdio_device_t
this will also allow to add later a generic device mecanism in order to have multi generic device support and driver instance
---
v2:
use stdio_ instead of console_
check all ubifs update
Best Regards,
J.
board/MAI/AmigaOneG3SE/ps2kbd.c | 6 +-
board/MAI/AmigaOneG3SE/video.c | 6 +-
board/ads5121/ads5121_diu.c | 2 +-
board/bf527-ezkit/video.c | 6 +-
board/bf533-stamp/video.c | 6 +-
board/bf548-ezkit/video.c | 6 +-
board/bmw/bmw.c | 2 +-
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c | 2 +-
board/linkstation/avr.c | 2 +-
board/mpl/common/isa.c | 2 +-
board/mpl/common/kbd.c | 6 +-
board/mpl/mip405/mip405.c | 2 +-
board/mpl/pati/pati.c | 6 +-
board/mpl/pip405/pip405.c | 2 +-
board/mpl/vcma9/vcma9.c | 2 +-
board/netphone/phone_console.c | 6 +-
board/rbc823/kbd.c | 8 ++--
board/trab/vfd.c | 2 +-
common/Makefile | 2 +-
common/cmd_console.c | 8 ++--
common/cmd_log.c | 6 +-
common/cmd_terminal.c | 6 +-
common/console.c | 36 ++++++++--------
common/iomux.c | 14 +++---
common/lcd.c | 6 +-
common/serial.c | 8 ++--
common/{devices.c => stdio.c} | 58 ++++++++++++------------
common/usb_kbd.c | 14 +++---
cpu/blackfin/jtag-console.c | 6 +-
cpu/mpc8xx/lcd.c | 2 +-
cpu/mpc8xx/video.c | 6 +-
cpu/pxa/pxafb.c | 2 +-
doc/README.silent | 2 +-
drivers/input/keyboard.c | 6 +-
drivers/net/netconsole.c | 6 +-
drivers/serial/arm_dcc.c | 6 +-
drivers/serial/usbtty.c | 6 +-
drivers/usb/musb/musb_hcd.c | 4 +-
drivers/usb/musb/musb_hcd.h | 2 +-
drivers/video/cfb_console.c | 8 ++--
include/configs/APC405.h | 2 +-
include/configs/AR405.h | 2 +-
include/configs/ASH405.h | 2 +-
include/configs/AmigaOneG3SE.h | 2 +-
include/configs/CATcenter.h | 2 +-
include/configs/CMS700.h | 2 +-
include/configs/CPCI2DP.h | 2 +-
include/configs/CPCI405.h | 2 +-
include/configs/CPCI4052.h | 2 +-
include/configs/CPCI405AB.h | 2 +-
include/configs/CPCI405DT.h | 2 +-
include/configs/DP405.h | 2 +-
include/configs/G2000.h | 2 +-
include/configs/HH405.h | 2 +-
include/configs/HUB405.h | 2 +-
include/configs/M5249EVB.h | 2 +-
include/configs/MIP405.h | 2 +-
include/configs/MPC8610HPCD.h | 2 +-
include/configs/MPC8641HPCN.h | 2 +-
include/configs/PCI405.h | 2 +-
include/configs/PIP405.h | 2 +-
include/configs/PLU405.h | 2 +-
include/configs/PMC405.h | 2 +-
include/configs/PPChameleonEVB.h | 2 +-
include/configs/QS823.h | 2 +-
include/configs/QS850.h | 2 +-
include/configs/QS860T.h | 2 +-
include/configs/R360MPI.h | 2 +-
include/configs/TASREG.h | 2 +-
include/configs/TQM5200.h | 2 +-
include/configs/VCMA9.h | 2 +-
include/configs/VOH405.h | 2 +-
include/configs/VOM405.h | 2 +-
include/configs/WUH405.h | 2 +-
include/configs/cerf250.h | 2 +-
include/configs/delta.h | 2 +-
include/configs/gr_ep2s60.h | 2 +-
include/configs/lubbock.h | 2 +-
include/configs/mimc200.h | 2 +-
include/configs/mp2usb.h | 4 +-
include/configs/pleb2.h | 2 +-
include/configs/pxa255_idp.h | 2 +-
include/configs/sc3.h | 2 +-
include/configs/trab.h | 2 +-
include/configs/trizepsiv.h | 2 +-
include/configs/xaeniax.h | 2 +-
include/configs/zylonite.h | 2 +-
include/console.h | 38 ----------------
include/iomux.h | 6 +-
include/serial.h | 2 +-
include/{devices.h => stdio.h} | 33 +++++++-------
lib_arm/board.c | 4 +-
lib_avr32/board.c | 4 +-
lib_blackfin/board.c | 6 +-
lib_blackfin/post.c | 2 +-
lib_i386/board.c | 4 +-
lib_i386/video.c | 10 ++--
lib_m68k/board.c | 6 +-
lib_mips/board.c | 6 +-
lib_nios/board.c | 4 +-
lib_nios2/board.c | 4 +-
lib_ppc/board.c | 6 +-
lib_sh/board.c | 4 +-
lib_sparc/board.c | 6 +-
post/post.c | 2 +-
105 files changed, 247 insertions(+), 284 deletions(-)
rename common/{devices.c => stdio.c} (82%)
delete mode 100644 include/console.h
rename include/{devices.h => stdio.h} (84%)board/MAI/AmigaOneG3SE/ps2kbd.c +3 -3
@@ -34,7 +34,7 @@*/ #include <common.h> #include <asm/processor.h> -#include <devices.h> +#include <stdio.h> #include "ps2kbd.h"
@@ -226,7 +226,7 @@ int overwrite_console (void)int drv_isa_kbd_init (void ) {int error; -device_t kbddev ; +stdio_device_t kbddev ;char *stdinname =getenv ("stdin" );if (isa_kbd_init () ==-1 )
@@ -239,7 +239,7 @@ int drv_isa_kbd_init (void) kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ; - error =device_register (&kbddev); + error =stdio_register (&kbddev);if (error==0 ) {/* check if this is the standard input device */ if (strcmp (stdinname,DEVNAME )==0 ) {
board/MAI/AmigaOneG3SE/video.c +3 -3
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <devices.h> +#include <stdio.h> #include "memio.h" #include <part.h>
@@ -98,7 +98,7 @@ int video_inited = 0;int drv_video_init (void ) {int error, devices =1 ; -device_t vgadev ; +stdio_device_t vgadev ;if (video_inited)return 1 ; video_inited =1 ;video_init ();
@@ -112,7 +112,7 @@ int drv_video_init(void) vgadev.tstc =NULL ; vgadev.start = video_start; - error =device_register (&vgadev); + error =stdio_register (&vgadev);if (error ==0 ) {
board/ads5121/ads5121_diu.c +1 -1
@@ -33,7 +33,7 @@#include "../freescale/common/fsl_diu_fb.h" #if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) -#include <devices.h> +#include <stdio.h> #include <video_fb.h> #endif
board/bf527-ezkit/video.c +3 -3
@@ -14,7 +14,7 @@#include <asm/mach-common/bits/dma.h> #include <i2c.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> int gunzip (void *,int ,unsigned char *,unsigned long *);
@@ -272,7 +272,7 @@ void video_puts(const char *s)int drv_video_init (void ) {int error, devices =1 ; -device_t videodev; +stdio_device_t videodev;u8 *dst;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.puts = video_puts;/* 'puts' function */ - error =device_register (&videodev); + error =stdio_register (&videodev);return (error ==0 ) ? devices : error; }
board/bf533-stamp/video.c +3 -3
@@ -18,7 +18,7 @@#include <asm/mach-common/bits/dma.h> #include <i2c.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> int gunzip (void *,int ,unsigned char *,unsigned long *);
@@ -154,7 +154,7 @@ static void video_init(char *NTSCFrame)int drv_video_init (void ) { -device_t videodev; +stdio_device_t videodev;video_init ((void *)NTSC_FRAME_ADDR );
@@ -163,5 +163,5 @@ int drv_video_init(void) videodev.ext =DEV_EXT_VIDEO ; videodev.flags =DEV_FLAGS_SYSTEM ; -return device_register (&videodev); +return stdio_register (&videodev); }
board/bf548-ezkit/video.c +3 -3
@@ -14,7 +14,7 @@#include <asm/mach-common/bits/dma.h> #include <i2c.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> int gunzip (void *,int ,unsigned char *,unsigned long *);
@@ -282,7 +282,7 @@ void video_puts(const char *s)int drv_video_init (void ) {int error, devices =1 ; -device_t videodev; +stdio_device_t videodev;u8 *dst;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.puts = video_puts;/* 'puts' function */ - error =device_register (&videodev); + error =stdio_register (&videodev);return (error ==0 ) ? devices : error; }
board/bmw/bmw.c +1 -1
@@ -26,7 +26,7 @@#include <watchdog.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <net.h> #include <timestamp.h> #include <dtt.h>
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c +1 -1
@@ -33,7 +33,7 @@#include "../common/fsl_diu_fb.h" #if defined(CONFIG_VIDEO ) || defined(CONFIG_CFB_CONSOLE ) -#include <devices.h> +#include <stdio.h> #include <video_fb.h> #endif
board/linkstation/avr.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> #include <ns16550.h> -#include <console.h> +#include <stdio.h> /* Button codes from the AVR */ #define PWRR 0x20/* Power button release */
board/mpl/common/isa.c +1 -1
@@ -26,7 +26,7 @@#include <common.h> #include <asm/processor.h> -#include <devices.h> +#include <stdio.h> #include "isa.h" #include "piix4_pci.h" #include "kbd.h"
board/mpl/common/kbd.c +3 -3
@@ -28,7 +28,7 @@*/ #include <common.h> #include <asm/processor.h> -#include <devices.h> +#include <stdio.h> #include "isa.h" #include "kbd.h"
@@ -215,7 +215,7 @@ int overwrite_console (void)int drv_isa_kbd_init (void ) {int error; -device_t kbddev ; +stdio_device_t kbddev ;char *stdinname =getenv ("stdin" );if (isa_kbd_init ()==-1 )
@@ -228,7 +228,7 @@ int drv_isa_kbd_init (void) kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ; - error =device_register (&kbddev); + error =stdio_register (&kbddev);if (error==0 ) {/* check if this is the standard input device */ if (strcmp (stdinname,DEVNAME )==0 ) {
board/mpl/mip405/mip405.c +1 -1
@@ -68,7 +68,7 @@#include <4xx_i2c.h> #include <miiphy.h> #include "../common/common_util.h" -#include <console.h> +#include <stdio.h> #include <i2c.h> #include <rtc.h>
board/mpl/pati/pati.c +3 -3
@@ -46,7 +46,7 @@#include <common.h> #include <mpc5xx.h> -#include <devices.h> +#include <stdio.h> #include <pci_ids.h> #define PLX9056_LOC #include "plx9056.h"
@@ -447,7 +447,7 @@ int checkboard (void)int recbuf[REC_BUFFER_SIZE ];static int r_ptr =0 ;int w_ptr; -device_t pci_con_dev; +stdio_device_t pci_con_dev;int conn=0 ;int buff_full=0 ;
@@ -584,7 +584,7 @@ void pci_con_connect(void) pci_con_dev.puts = pci_con_puts; pci_con_dev.getc = pci_con_getc; 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" ); do { udelay(10);
board/mpl/pip405/pip405.c +1 -1
@@ -28,7 +28,7 @@#include "pip405.h" #include <asm/processor.h> #include <i2c.h> -#include <console.h> +#include <stdio.h> #include "../common/isa.h" #include "../common/common_util.h"
board/mpl/vcma9/vcma9.c +1 -1
@@ -27,7 +27,7 @@#include <common.h> #include <s3c2410.h> -#include <console.h> +#include <stdio.h> #include <i2c.h> #include "vcma9.h"
board/netphone/phone_console.c +3 -3
@@ -37,7 +37,7 @@#include <version.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #include <sed156x.h>
@@ -325,7 +325,7 @@ int phone_getc(void)int drv_phone_init (void ) { -device_t console_dev; +stdio_device_t console_dev;console_init ();
@@ -340,7 +340,7 @@ int drv_phone_init(void) console_dev.tstc = phone_tstc;/* 'tstc' function */ console_dev.getc = phone_getc;/* 'getc' function */ -if (device_register (&console_dev) ==0 ) +if (stdio_register (&console_dev) ==0 )return 1 ;return 0 ;
board/rbc823/kbd.c +4 -4
@@ -30,7 +30,7 @@#include <common.h> #include <watchdog.h> #include <commproc.h> -#include <devices.h> +#include <stdio.h> #include <lcd.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -249,18 +249,18 @@ int smc1_tstc(void)int drv_keyboard_init (void ) {int error =0 ; -device_t kbd_dev; +stdio_device_t kbd_dev;if (0 ) {/* register the keyboard */ -memset (&kbd_dev,0 ,sizeof (device_t)); +memset (&kbd_dev,0 ,sizeof (stdio_device_t));strcpy (kbd_dev.name,"kbd" ); kbd_dev.flags =DEV_FLAGS_INPUT |DEV_FLAGS_SYSTEM ; kbd_dev.putc =NULL ; kbd_dev.puts =NULL ; kbd_dev.getc = smc1_getc; kbd_dev.tstc = smc1_tstc; - error =device_register (&kbd_dev); + error =stdio_register (&kbd_dev); }else { lcd_is_enabled =0 ;lcd_disable ();
board/trab/vfd.c +1 -1
@@ -36,7 +36,7 @@#include <version.h> #include <stdarg.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #include <s3c2400.h> DECLARE_GLOBAL_DATA_PTR ;
common/Makefile +1 -1
@@ -32,7 +32,6 @@ COBJS-y += main.o COBJS-y += circbuf.o COBJS-y += console.o COBJS-y += command.o -COBJS-y += devices.o COBJS-y += dlmalloc.o COBJS-y += exports.o COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
@@ -40,6 +39,7 @@ COBJS-y += image.o COBJS-y += memsize.o COBJS-y += s_record.o COBJS-$(CONFIG_SERIAL_MULTI) += serial.o +COBJS-y += stdio.o COBJS-y += xyzModem.o # core command
common/cmd_console.c +4 -4
@@ -26,22 +26,22 @@*/ #include <common.h> #include <command.h> -#include <devices.h> +#include <stdio.h> extern void _do_coninfo (void );int do_coninfo (cmd_tbl_t * cmd,int flag,int argc,char *argv[]) {int l; -struct list_head *list =device_get_list (); +struct list_head *list =stdio_get_list ();struct list_head *pos; -device_t *dev; +stdio_device_t *dev;/* Scan for valid output and input devices */ puts ("List of available devices:\n" );list_for_each (pos, list) { - dev =list_entry (pos, device_t, list); + dev =list_entry (pos, stdio_device_t, list); printf ("%-8s %08x %c%c%c ", dev->name,
common/cmd_log.c +3 -3
@@ -42,7 +42,7 @@#include <common.h> #include <command.h> -#include <devices.h> +#include <stdio.h> #include <post.h> #include <logbuff.h>
@@ -142,7 +142,7 @@ void logbuff_reset (void)int drv_logbuff_init (void ) { -device_t logdev; +stdio_device_t logdev;int rc;/* Device initialization */
@@ -154,7 +154,7 @@ int drv_logbuff_init (void) logdev.putc = logbuff_putc;/* 'putc' function */ logdev.puts = logbuff_puts;/* 'puts' function */ - rc =device_register (&logdev); + rc =stdio_register (&logdev);return (rc ==0 ) ?1 : rc; }
common/cmd_terminal.c +3 -3
@@ -26,19 +26,19 @@*/ #include <common.h> #include <command.h> -#include <devices.h> +#include <stdio.h> #include <serial.h> int do_terminal (cmd_tbl_t * cmd,int flag,int argc,char *argv[]) {int last_tilde =0 ; -device_t *dev =NULL ; +stdio_device_t *dev =NULL ;if (argc <1 )return -1 ;/* Scan for selected output/input device */ - dev =device_get_by_name (argv[1 ]); + dev =stdio_get_by_name (argv[1 ]);if (!dev)return -1 ;
common/console.c +18 -18
@@ -24,7 +24,7 @@#include <common.h> #include <stdarg.h> #include <malloc.h> -#include <console.h> +#include <stdio.h> #include <exports.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -48,7 +48,7 @@ extern int overwrite_console(void);#endif /* CONFIG_SYS_CONSOLE_IS_IN_ENV */ -static int console_setfile (int file,device_t * dev) +static int console_setfile (int file,stdio_device_t * dev) {int error =0 ;
@@ -96,8 +96,8 @@ static int console_setfile(int file, device_t * dev)#if defined(CONFIG_CONSOLE_MUX )/** Console I/O multiplexing *******************************************/ -static device_t *tstcdev; -device_t **console_devices[MAX_FILES ]; +static stdio_device_t *tstcdev; +stdio_device_t **console_devices[MAX_FILES ];int cd_count[MAX_FILES ];/*
@@ -119,7 +119,7 @@ static int console_getc(int file)static int console_tstc (int file) {int i, ret; -device_t *dev; +stdio_device_t *dev;disable_ctrlc (1 );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) {int i; -device_t *dev; +stdio_device_t *dev;for (i =0 ; i < cd_count[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) {int i; -device_t *dev; +stdio_device_t *dev;for (i =0 ; i < cd_count[file]; i++) { dev = console_devices[file][i];
@@ -167,7 +167,7 @@ static inline void console_printdevs(int file)iomux_printdevs (file); } -static inline void console_doenv (int file,device_t *dev) +static inline void console_doenv (int file,stdio_device_t *dev) {iomux_doenv (file, dev->name); }
@@ -197,7 +197,7 @@ static inline void console_printdevs(int file)printf ("%s\n" , stdio_devices[file]->name); } -static inline void console_doenv (int file,device_t *dev) +static inline void console_doenv (int file,stdio_device_t *dev) {console_setfile (file, dev); }
@@ -479,11 +479,11 @@ inline void dbg(const char *fmt, ...)/** U-Boot INIT FUNCTIONS *************************************************/ -device_t *search_device (int flags,char *name) +stdio_device_t *search_device (int flags,char *name) { -device_t *dev; +stdio_device_t *dev; - dev =device_get_by_name (name); + dev =stdio_get_by_name (name);if (dev && (dev->flags & flags))return dev;
@@ -494,7 +494,7 @@ device_t *search_device(int flags, char *name)int console_assign (int file,char *devname) {int flag; -device_t *dev; +stdio_device_t *dev;/* Check for valid file */ switch (file) {
@@ -564,7 +564,7 @@ void stdio_print_current_devices(void)int console_init_r (void ) {char *stdinname, *stdoutname, *stderrname; -device_t *inputdev =NULL , *outputdev =NULL , *errdev =NULL ; +stdio_device_t *inputdev =NULL , *outputdev =NULL , *errdev =NULL ;#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE int i;#endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */
@@ -650,11 +650,11 @@ done:/* Called after the relocation - use desired console functions */ int console_init_r (void ) { -device_t *inputdev =NULL , *outputdev =NULL ; +stdio_device_t *inputdev =NULL , *outputdev =NULL ;int i; -struct list_head *list =device_get_list (); +struct list_head *list =stdio_get_list ();struct list_head *pos; -device_t *dev; +stdio_device_t *dev;#ifdef CONFIG_SPLASH_SCREEN /*
@@ -667,7 +667,7 @@ int console_init_r(void)/* Scan devices looking for input and output devices */ list_for_each (pos, list) { - dev =list_entry (pos, device_t, list); + dev =list_entry (pos, stdio_device_t, list);if ((dev->flags &DEV_FLAGS_INPUT ) && (inputdev ==NULL )) { inputdev = dev;
common/iomux.c +7 -7
@@ -29,7 +29,7 @@void iomux_printdevs (const int console) {int i; -device_t *dev; +stdio_device_t *dev;for (i =0 ; i < cd_count[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;int i, j, k, io_flag, cs_idx, repeat; -device_t *dev; -device_t **cons_set; +stdio_device_t *dev; +stdio_device_t **cons_set; console_args =strdup (arg);if (console_args ==NULL )
@@ -85,7 +85,7 @@ int iomux_doenv(const int console, const char *arg) *temp ='\0' ; start[i] = temp +1 ; } - cons_set = (device_t **)calloc (i,sizeof (device_t *)); + cons_set = (stdio_device_t **)calloc (i,sizeof (stdio_device_t *));if (cons_set ==NULL ) {free (start);free (console_args);
@@ -158,14 +158,14 @@ int iomux_doenv(const int console, const char *arg) }else {/* Works even if console_devices[console] is NULL. */ console_devices[console] = - (device_t **)realloc (console_devices[console], - cs_idx *sizeof (device_t *)); + (stdio_device_t **)realloc (console_devices[console], + cs_idx *sizeof (stdio_device_t *));if (console_devices[console] ==NULL ) {free (cons_set);return 1 ; }memcpy (console_devices[console], cons_set, cs_idx * -sizeof (device_t *)); +sizeof (stdio_device_t *)); cd_count[console] = cs_idx; }
common/lcd.c +3 -3
@@ -34,7 +34,7 @@#include <command.h> #include <stdarg.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #if defined(CONFIG_POST )#include <post.h> #endif
@@ -355,7 +355,7 @@ static void test_pattern (void)int drv_lcd_init (void ) { -device_t lcddev; +stdio_device_t lcddev;int rc; lcd_base = (void *)(gd->fb_base);
@@ -373,7 +373,7 @@ int drv_lcd_init (void) lcddev.putc = lcd_putc;/* 'putc' function */ lcddev.puts = lcd_puts;/* 'puts' function */ - rc =device_register (&lcddev); + rc =stdio_register (&lcddev);return (rc ==0 ) ?1 : rc; }
common/serial.c +4 -4
@@ -23,7 +23,7 @@#include <common.h> #include <serial.h> -#include <devices.h> +#include <stdio.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -139,9 +139,9 @@ void serial_initialize (void)serial_assign (default_serial_console ()->name); } -void serial_devices_init (void ) +void serial_stdio_init (void ) { -device_t dev; +stdio_device_t dev;struct serial_device *s = serial_devices;while (s) {
@@ -156,7 +156,7 @@ void serial_devices_init (void) dev.getc = s->getc; dev.tstc = s->tstc; -device_register (&dev); +stdio_register (&dev); s = s->next; }
common/stdio.c renamed from common/devices.c +29 -29
163 lines not on this page · raw message
common/usb_kbd.c +7 -7
@@ -25,7 +25,7 @@* */ #include <common.h> -#include <devices.h> +#include <stdio.h> #include <asm/byteorder.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 error,i; -device_t usb_kbd_dev,*old_dev; +stdio_device_t usb_kbd_dev,*old_dev;struct usb_device *dev;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 */ /* check, if it is already registered */ 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) {/* ok, already registered, just return ok */ USB_KBD_PRINTF ("USB KBD is already registered.\n" );
@@ -176,7 +176,7 @@ int drv_usb_kbd_init(void) }/* register the keyboard */ USB_KBD_PRINTF ("USB KBD register.\n" ); -memset (&usb_kbd_dev,0 ,sizeof (device_t)); +memset (&usb_kbd_dev,0 ,sizeof (stdio_device_t));strcpy (usb_kbd_dev.name,DEVNAME ); usb_kbd_dev.flags =DEV_FLAGS_INPUT |DEV_FLAGS_SYSTEM ; 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.tstc = usb_kbd_testc; usb_kbd_dev.priv = (void *)dev; - error =device_register (&usb_kbd_dev); + error =stdio_register (&usb_kbd_dev);if (error==0 ) {/* check if this is the standard input device */ if (strcmp (stdinname,DEVNAME )==0 ) {
@@ -212,8 +212,8 @@ int drv_usb_kbd_init(void)/* deregistering the keyboard */ int usb_kbd_deregister (void ) { -#ifdef CONFIG_SYS_DEVICE_DEREGISTER -return device_deregister (DEVNAME ); +#ifdef CONFIG_SYS_STDIO_DEREGISTER +return stdio_deregister (DEVNAME );#else return 1 ;#endif
cpu/blackfin/jtag-console.c +3 -3
@@ -7,7 +7,7 @@*/ #include <common.h> -#include <devices.h> +#include <stdio.h> #include <asm/blackfin.h> #ifndef CONFIG_JTAG_CONSOLE_TIMEOUT
@@ -105,7 +105,7 @@ static int jtag_getc(void)int drv_jtag_console_init (void ) { -device_t dev; +stdio_device_t dev;int ret;memset (&dev,0x00 ,sizeof (dev));
@@ -116,7 +116,7 @@ int drv_jtag_console_init(void) dev.tstc = jtag_tstc; dev.getc = jtag_getc; - ret =device_register (&dev); + ret =stdio_register (&dev);return (ret ==0 ?1 : ret); }
cpu/mpc8xx/lcd.c +1 -1
@@ -35,7 +35,7 @@#include <stdarg.h> #include <lcdvideo.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #if defined(CONFIG_POST )#include <post.h> #endif
cpu/mpc8xx/video.c +3 -3
@@ -36,7 +36,7 @@#include <timestamp.h> #include <i2c.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #ifdef CONFIG_VIDEO
@@ -1287,7 +1287,7 @@ int drv_video_init (void) {int error, devices =1 ; -device_t videodev; +stdio_device_t videodev;video_init ((void *)(gd->fb_base));/* Video initialization */
@@ -1301,7 +1301,7 @@ int drv_video_init (void) videodev.putc = video_putc;/* 'putc' function */ videodev.puts = video_puts;/* 'puts' function */ - error =device_register (&videodev); + error =stdio_register (&videodev);return (error ==0 ) ? devices : error; }
cpu/pxa/pxafb.c +1 -1
@@ -32,7 +32,7 @@#include <version.h> #include <stdarg.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #include <lcd.h> #include <asm/arch/pxa-regs.h>
doc/README.silent +1 -1
@@ -13,7 +13,7 @@ The following actions are taken if "silent" is set at boot time: - When the console devices have been initialized, "stdout" and "stderr" are set to "nulldev", so subsequent messages are suppressed automatically. Make sure to enable "nulldev" by - #defining CONFIG_SYS_DEVICE_NULLDEV in your board config file. + #defining CONFIG_SYS_STDIO_NULLDEV in your board config file. - When booting a linux kernel, the "bootargs" are fixed up so that the argument "console=" will be in the command line, no matter how
drivers/input/keyboard.c +3 -3
@@ -11,7 +11,7 @@#include <common.h> -#include <devices.h> +#include <stdio.h> #include <keyboard.h> #undef KBG_DEBUG
@@ -268,7 +268,7 @@ extern int overwrite_console (void);int kbd_init (void ) {int error; -device_t kbddev ; +stdio_device_t kbddev ;char *stdinname =getenv ("stdin" );if (kbd_init_hw ()==-1 )
@@ -281,7 +281,7 @@ int kbd_init (void) kbddev.getc = kbd_getc ; kbddev.tstc = kbd_testc ; - error =device_register (&kbddev); + error =stdio_register (&kbddev);if (error==0 ) {/* check if this is the standard input device */ if (strcmp (stdinname,DEVNAME )==0 ) {
drivers/net/netconsole.c +3 -3
@@ -23,7 +23,7 @@#include <common.h> #include <command.h> -#include <devices.h> +#include <stdio.h> #include <net.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -243,7 +243,7 @@ int nc_tstc (void)int drv_nc_init (void ) { -device_t dev; +stdio_device_t dev;int rc;memset (&dev,0 ,sizeof (dev));
@@ -256,7 +256,7 @@ int drv_nc_init (void) dev.getc = nc_getc; dev.tstc = nc_tstc; - rc =device_register (&dev); + rc =stdio_register (&dev);return (rc ==0 ) ?1 : rc; }
drivers/serial/arm_dcc.c +3 -3
@@ -27,7 +27,7 @@*/ #include <common.h> -#include <devices.h> +#include <stdio.h> #if defined(CONFIG_CPU_V6 )/*
@@ -148,7 +148,7 @@ int arm_dcc_tstc(void) }#ifdef CONFIG_ARM_DCC_MULTI -static device_t arm_dcc_dev; +static stdio_device_t arm_dcc_dev;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.puts = arm_dcc_puts;/* 'puts' function */ - return device_register(&arm_dcc_dev); + return stdio_register(&arm_dcc_dev); }#endif
drivers/serial/usbtty.c +3 -3
@@ -24,7 +24,7 @@#include <common.h> #include <config.h> #include <circbuf.h> -#include <devices.h> +#include <stdio.h> #include "usbtty.h" #include "usb_cdc_acm.h" #include "usbdescriptors.h"
@@ -70,7 +70,7 @@ static circbuf_t usbtty_output;/* * Instance variables */ -static device_t usbttydev; +static stdio_device_t usbttydev;static struct usb_device_instance device_instance[1 ];static struct usb_bus_instance bus_instance[1 ];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.puts = usbtty_puts;/* 'puts' function */ - rc =device_register (&usbttydev); + rc =stdio_register (&usbttydev);return (rc ==0 ) ?1 : rc; }
drivers/usb/musb/musb_hcd.c +2 -2
@@ -770,7 +770,7 @@ int submit_int_msg(struct usb_device *dev, unsigned long pipe,*/ void usb_event_poll () { -device_t *dev; +stdio_device_t *dev;struct usb_device *usb_kbd_dev;struct usb_interface_descriptor *iface;struct usb_endpoint_descriptor *ep;
@@ -778,7 +778,7 @@ void usb_event_poll()int maxp;/* 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; iface = &usb_kbd_dev->config.if_desc[0 ]; ep = &iface->ep_desc[0 ];
drivers/usb/musb/musb_hcd.h +1 -1
@@ -26,7 +26,7 @@#include "musb_core.h" #ifdef CONFIG_USB_KEYBOARD -#include <devices.h> +#include <stdio.h> extern unsigned char new[];#endif
drivers/video/cfb_console.c +4 -4
@@ -183,7 +183,7 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the#include <version.h> #include <linux/types.h> -#include <devices.h> +#include <stdio.h> #include <video_font.h> #if defined(CONFIG_CMD_DATE )
@@ -1333,7 +1333,7 @@ static int video_init (void)int drv_video_init (void ) {int skip_dev_init; -device_t console_dev; +stdio_device_t console_dev; skip_dev_init =0 ;
@@ -1354,7 +1354,7 @@ int drv_video_init (void) console_dev.tstc =NULL ;/* 'tstc' function */ console_dev.getc =NULL ;/* 'getc' function */ -if (device_register (&console_dev) ==0 ) +if (stdio_register (&console_dev) ==0 ) return 1; }#else
@@ -1373,7 +1373,7 @@ int drv_video_init (void) console_dev.tstc =VIDEO_TSTC_FCT ;/* 'tstc' function */ console_dev.getc =VIDEO_GETC_FCT ;/* 'getc' function */ -if (device_register (&console_dev) ==0 ) +if (stdio_register (&console_dev) ==0 ) return 1; }#endif /* CONFIG_VGA_AS_SINGLE_DEVICE */
include/configs/APC405.h +1 -1
@@ -168,7 +168,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/AR405.h +1 -1
@@ -114,7 +114,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/ASH405.h +1 -1
@@ -117,7 +117,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/AmigaOneG3SE.h +1 -1
@@ -363,7 +363,7 @@#define CONFIG_USB_UHCI 1#define CONFIG_USB_STORAGE 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
include/configs/CATcenter.h +1 -1
@@ -176,7 +176,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/CMS700.h +1 -1
@@ -117,7 +117,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/CPCI2DP.h +1 -1
@@ -102,7 +102,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/CPCI405.h +1 -1
@@ -117,7 +117,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/CPCI4052.h +1 -1
@@ -124,7 +124,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/CPCI405AB.h +1 -1
@@ -125,7 +125,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/CPCI405DT.h +1 -1
@@ -125,7 +125,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/DP405.h +1 -1
@@ -109,7 +109,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/G2000.h +1 -1
@@ -142,7 +142,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/HH405.h +1 -1
@@ -167,7 +167,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #undef CONFIG_SYS_CONSOLE_INFO_QUIET/* print console @ startup */
include/configs/HUB405.h +1 -1
@@ -110,7 +110,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/M5249EVB.h +1 -1
@@ -74,7 +74,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup */ #define CONFIG_AUTO_COMPLETE 1/* add autocompletion support */ #define CONFIG_LOOPW 1/* enable loopw command */
include/configs/MIP405.h +1 -1
@@ -414,7 +414,7 @@#define CONFIG_USB_STORAGE /* Enable needed helper functions */ -#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ +#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ #endif /************************************************************ * Debug support
include/configs/MPC8610HPCD.h +1 -1
@@ -321,7 +321,7 @@#define CONFIG_PCI_OHCI 1#define CONFIG_USB_OHCI_NEW 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_OHCI_SLOT_NAME "ohci_pci"#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15
include/configs/MPC8641HPCN.h +1 -1
@@ -395,7 +395,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);#define CONFIG_PCI_OHCI 1#define CONFIG_USB_OHCI_NEW 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_OHCI_SLOT_NAME "ohci_pci"#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15
include/configs/PCI405.h +1 -1
@@ -103,7 +103,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/PIP405.h +1 -1
@@ -360,7 +360,7 @@#define CONFIG_USB_STORAGE /* Enable needed helper functions */ -#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ +#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ /************************************************************ * Debug support
include/configs/PLU405.h +1 -1
@@ -128,7 +128,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/PMC405.h +1 -1
@@ -121,7 +121,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Sz */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console info */
include/configs/PPChameleonEVB.h +1 -1
@@ -184,7 +184,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/QS823.h +1 -1
@@ -35,7 +35,7 @@#define __CONFIG_H/* various debug settings */ -#undef CONFIG_SYS_DEVICE_NULLDEV/* null device */ +#undef CONFIG_SYS_STDIO_NULLDEV/* null device */ #undef CONFIG_SILENT_CONSOLE/* silent console */ #undef CONFIG_SYS_CONSOLE_INFO_QUIET/* silent console ? */ #undef DEBUG_FLASH/* debug flash code */
include/configs/QS850.h +1 -1
@@ -35,7 +35,7 @@#define __CONFIG_H/* various debug settings */ -#undef CONFIG_SYS_DEVICE_NULLDEV/* null device */ +#undef CONFIG_SYS_STDIO_NULLDEV/* null device */ #undef CONFIG_SILENT_CONSOLE/* silent console */ #undef CONFIG_SYS_CONSOLE_INFO_QUIET/* silent console ? */ #undef DEBUG_FLASH/* debug flash code */
include/configs/QS860T.h +1 -1
@@ -35,7 +35,7 @@#define __CONFIG_H/* various debug settings */ -#undef CONFIG_SYS_DEVICE_NULLDEV/* null device */ +#undef CONFIG_SYS_STDIO_NULLDEV/* null device */ #undef CONFIG_SILENT_CONSOLE/* silent console */ #undef CONFIG_SYS_CONSOLE_INFO_QUIET/* silent console ? */ #undef DEBUG_FLASH/* debug flash code */
include/configs/R360MPI.h +1 -1
@@ -139,7 +139,7 @@/* * Miscellaneous configurable options */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* we need the null device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* we need the null device */ #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1/* must set console from env */ #define CONFIG_SYS_LONGHELP /* undef to save memory */
include/configs/TASREG.h +1 -1
@@ -90,7 +90,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/ #define CONFIG_AUTO_COMPLETE 1/* add autocompletion support */ #define CONFIG_LOOPW 1/* enable loopw command */
include/configs/TQM5200.h +1 -1
@@ -58,7 +58,7 @@#define CONFIG_BOOTCOUNT_LIMIT 1#ifdef CONFIG_FO300 -#define CONFIG_SYS_DEVICE_NULLDEV 1/* enable null device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* enable null device */ #define CONFIG_SILENT_CONSOLE 1/* enable silent startup */ #define CONFIG_BOARD_EARLY_INIT_F 1/* used to detect S1 switch position */ #define CONFIG_USB_BIN_FIXUP 1/* for a buggy USB device */
include/configs/VCMA9.h +1 -1
@@ -130,7 +130,7 @@#define CONFIG_DOS_PARTITION 1/* Enable needed helper functions */ -#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ +#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ /************************************************************ * RTC
include/configs/VOH405.h +1 -1
@@ -124,7 +124,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/VOM405.h +1 -1
@@ -113,7 +113,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/WUH405.h +1 -1
@@ -114,7 +114,7 @@#define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #define CONFIG_SYS_CONSOLE_INFO_QUIET 1/* don't print console @ startup*/
include/configs/cerf250.h +1 -1
@@ -111,7 +111,7 @@/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0xa0400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000/* 4 ... 8 MB in DRAM */
include/configs/delta.h +1 -1
@@ -164,7 +164,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0x80400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x80800000/* 4 ... 8 MB in DRAM */
include/configs/gr_ep2s60.h +1 -1
@@ -87,7 +87,7 @@#define CONFIG_CMD_USB #define CONFIG_USB_STORAGE /* Enable needed helper functions */ -#define CONFIG_SYS_DEVICE_DEREGISTER /* needs device_deregister */ +#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ #endif /*
include/configs/lubbock.h +1 -1
@@ -120,7 +120,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0xa0400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000/* 4 ... 8 MB in DRAM */
include/configs/mimc200.h +1 -1
@@ -80,7 +80,7 @@#define CONFIG_SILENT_CONSOLE 1/* enable silent startup */ #define CONFIG_DISABLE_CONSOLE 1/* disable console */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ /* * Only interrupt autoboot if <space> is pressed. Otherwise, garbage
include/configs/mp2usb.h +2 -2
@@ -216,7 +216,7 @@#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_DEVICE_DEREGISTER /* needs device_deregister */ +#define CONFIG_SYS_STDIO_DEREGISTER /* needs stdio_deregister */ #define CONFIG_SYS_HZ 1000#define CONFIG_SYS_HZ_CLOCK (AT91C_MASTER_CLOCK/2)/* AT91C_TC0_CMR is implicitly set to */
@@ -228,7 +228,7 @@#error CONFIG_USE_IRQ not supported#endif -#define CONFIG_SYS_DEVICE_NULLDEV 1/* enble null device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* enble null device */ #undef CONFIG_SILENT_CONSOLE/* enable silent startup */ #define CONFIG_AUTOBOOT_KEYED
include/configs/pleb2.h +1 -1
@@ -120,7 +120,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0xa0400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000/* 4 ... 8 MB in DRAM */
include/configs/pxa255_idp.h +1 -1
@@ -234,7 +234,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0xa0400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000/* 4 ... 8 MB in DRAM */
include/configs/sc3.h +1 -1
@@ -128,7 +128,7 @@#undef CONFIG_BOOTCOMMAND#define CONFIG_SILENT_CONSOLE 1/* enable silent startup */ -#define CONFIG_SYS_DEVICE_NULLDEV 1/* include nulldev device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* include nulldev device */ #if 1 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */
include/configs/trab.h +1 -1
@@ -58,7 +58,7 @@#define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_INITRD_TAG 1 -#define CONFIG_SYS_DEVICE_NULLDEV 1/* enble null device */ +#define CONFIG_SYS_STDIO_NULLDEV 1/* enble null device */ #define CONFIG_SILENT_CONSOLE 1/* enable silent startup */ #define CONFIG_VERSION_VARIABLE 1/* include version env variable */
include/configs/trizepsiv.h +1 -1
@@ -161,7 +161,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0xa0400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000/* 4 ... 8 MB in DRAM */
include/configs/xaeniax.h +1 -1
@@ -132,7 +132,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0xa0400000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xa0800000/* 4 ... 8 MB in DRAM */
include/configs/zylonite.h +1 -1
@@ -137,7 +137,7 @@#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)/* Print Buffer Size */ #define CONFIG_SYS_MAXARGS 16/* max number of command args */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot Argument Buffer Size */ -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#define CONFIG_SYS_STDIO_NULLDEV 1#define CONFIG_SYS_MEMTEST_START 0x9c000000/* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x9c400000/* 4 ... 8 MB in DRAM */
include/console.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* -* (C) Copyright 2000 -* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio at 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 ] ; - -void stdio_print_current_devices (void ); - -#endif
include/iomux.h +3 -3
@@ -24,7 +24,7 @@#ifndef _IO_MUX_H#define _IO_MUX_H -#include <devices.h> +#include <stdio.h> /* * Stuff required to support console multiplexing.
@@ -34,7 +34,7 @@* Pointers to devices used for each file type. Defined in console.c * but storage is allocated in iomux.c. */ -extern device_t **console_devices[MAX_FILES ]; +extern stdio_device_t **console_devices[MAX_FILES ];/* * The count of devices assigned to each FILE. Defined in console.c * and populated in iomux.c.
@@ -43,6 +43,6 @@ extern int cd_count[MAX_FILES];int iomux_doenv (const int ,const char *);void iomux_printdevs (const int ); -device_t *search_device (int ,char *); +stdio_device_t *search_device (int ,char *);#endif /* _IO_MUX_H */
include/serial.h +1 -1
@@ -47,7 +47,7 @@ extern struct serial_device serial_btuart_device;extern struct serial_device serial_stuart_device;extern void serial_initialize (void ); -extern void serial_devices_init (void ); +extern void serial_stdio_init (void );extern int serial_assign (char * name);extern void serial_reinit_all (void );
include/stdio.h renamed from include/devices.h +17 -16
@@ -12,7 +12,7 @@* * 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 +* 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
@@ -21,13 +21,13 @@* MA 02111-1307 USA */ -#include <linux/list.h> +#ifndef _STDIO_H_ +#define _STDIO_H_ -#ifndef _DEVICES_H_ -#define _DEVICES_H_ +#include <linux/list.h> /* -* CONSOLE DEVICES +* STDIO DEVICES */ #define DEV_FLAGS_INPUT 0x00000001/* Device can be used as input console */
@@ -36,7 +36,7 @@#define DEV_EXT_VIDEO 0x00000001/* Video extensions supported */ /* Device information */ -typedef struct { +typedef struct stdio_device { int flags; /* Device flags: input/output/system */ int ext; /* Supported extensions */ char name[16]; /* Device name */
@@ -60,7 +60,7 @@ typedef struct {void *priv;/* Private extensions */ struct list_head list; -} device_t; +} stdio_device_t;/* * VIDEO EXTENSIONS
@@ -83,20 +83,21 @@ typedef struct {/* * VARIABLES */ -extern device_t *stdio_devices[]; +extern stdio_device_t *stdio_devices[];extern char *stdio_names[MAX_FILES ];/* * PROTOTYPES */ -int device_register (device_t * dev); -int devices_init (void ); -#ifdef CONFIG_SYS_DEVICE_DEREGISTER -int device_deregister (char *devname); +int stdio_register (stdio_device_t * dev); +int stdio_init (void ); +void stdio_print_current_devices (void ); +#ifdef CONFIG_SYS_STDIO_DEREGISTER +int stdio_deregister (char *devname);#endif -struct list_head *device_get_list (void ); -device_t *device_get_by_name (char * name); -device_t *device_clone (device_t *dev); +struct list_head *stdio_get_list (void ); +stdio_device_t *stdio_get_by_name (char * name); +stdio_device_t *stdio_clone (stdio_device_t *dev);#ifdef CONFIG_ARM_DCC_MULTI int drv_arm_dcc_init (void );
@@ -123,4 +124,4 @@ int drv_nc_init (void);int drv_jtag_console_init (void );#endif -#endif /* _DEVICES_H_ */ +#endif
lib_arm/board.c +2 -2
@@ -41,7 +41,7 @@#include <common.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <timestamp.h> #include <version.h> #include <net.h>
@@ -388,7 +388,7 @@ void start_armboot (void)/* IP Address */ gd->bd->bi_ip_addr =getenv_IPaddr ("ipaddr" ); -devices_init ();/* get the devices list going. */ +stdio_init ();/* get the devices list going. */ jumptable_init ();
lib_avr32/board.c +2 -2
@@ -22,7 +22,7 @@#include <common.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <timestamp.h> #include <version.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" ); -devices_init (); +stdio_init ();jumptable_init ();console_init_r ();
lib_blackfin/board.c +3 -3
@@ -11,7 +11,7 @@#include <common.h> #include <command.h> -#include <devices.h> +#include <stdio.h> #include <environment.h> #include <malloc.h> #include <net.h>
@@ -353,8 +353,8 @@ void board_init_r(gd_t * id, ulong dest_addr)/* relocate environment function pointers etc. */ env_relocate (); -/* Initialize devices */ -devices_init (); +/* Initialize stdio devices */ +stdio_init ();jumptable_init ();/* Initialize the console (after the relocation and devices init) */
lib_blackfin/post.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <console.h> +#include <stdio.h> #include <watchdog.h> #include <post.h>
lib_i386/board.c +2 -2
@@ -31,7 +31,7 @@#include <common.h> #include <watchdog.h> #include <command.h> -#include <devices.h> +#include <stdio.h> #include <timestamp.h> #include <version.h> #include <malloc.h>
@@ -299,7 +299,7 @@ void start_i386boot (void)show_boot_progress (0x27 ); -devices_init (); +stdio_init ();jumptable_init ();
lib_i386/video.c +5 -5
@@ -23,7 +23,7 @@#include <common.h> #include <pci.h> -#include <devices.h> +#include <stdio.h> #include <i8042.h> #include <asm/ptrace.h> #include <asm/realmode.h>
@@ -168,8 +168,8 @@ int video_init(void) {u16 pos; -static device_t vga_dev; -static device_t kbd_dev; +static stdio_device_t vga_dev; +static stdio_device_t kbd_dev; vidmem = (char *)0xb8000 ; vidport =0x3d4 ;
@@ -203,7 +203,7 @@ int video_init(void) vga_dev.tstc =NULL ;/* 'tstc' function */ vga_dev.getc =NULL ;/* 'getc' function */ -if (device_register (&vga_dev) ==0 ) { +if (stdio_register (&vga_dev) ==0 ) {return 1 ; }
@@ -220,7 +220,7 @@ int video_init(void) kbd_dev.tstc = i8042_tstc;/* 'tstc' function */ kbd_dev.getc = i8042_getc;/* 'getc' function */ -if (device_register (&kbd_dev) ==0 ) { +if (stdio_register (&kbd_dev) ==0 ) {return 1 ; }return 0 ;
lib_m68k/board.c +3 -3
@@ -28,7 +28,7 @@#include <watchdog.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <asm/immap.h>
@@ -596,8 +596,8 @@ void board_init_r (gd_t *id, ulong dest_addr)#endif /** leave this here (after malloc(), environment and PCI are working) **/ -/* Initialize devices */ -devices_init (); +/* Initialize stdio devices */ +stdio_init ();/* Initialize the jump table for applications */ jumptable_init ();
lib_mips/board.c +3 -3
@@ -24,7 +24,7 @@#include <common.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <timestamp.h> #include <version.h> #include <net.h>
@@ -412,8 +412,8 @@ void board_init_r (gd_t *id, ulong dest_addr)#endif /** leave this here (after malloc(), environment and PCI are working) **/ -/* Initialize devices */ -devices_init (); +/* Initialize stdio devices */ +stdio_init ();jumptable_init ();
lib_nios/board.c +2 -2
@@ -25,7 +25,7 @@*/ #include <common.h> -#include <devices.h> +#include <stdio.h> #include <watchdog.h> #include <net.h> #ifdef CONFIG_STATUS_LED
@@ -153,7 +153,7 @@ void board_init (void) bd->bi_ip_addr =getenv_IPaddr ("ipaddr" );WATCHDOG_RESET (); -devices_init (); +stdio_init ();jumptable_init ();console_init_r ();/*
lib_nios2/board.c +2 -2
@@ -25,7 +25,7 @@*/ #include <common.h> -#include <devices.h> +#include <stdio.h> #include <watchdog.h> #include <net.h> #ifdef CONFIG_STATUS_LED
@@ -159,7 +159,7 @@ void board_init (void) bd->bi_ip_addr =getenv_IPaddr ("ipaddr" );WATCHDOG_RESET (); -devices_init (); +stdio_init ();jumptable_init ();console_init_r ();
lib_ppc/board.c +3 -3
@@ -25,7 +25,7 @@#include <watchdog.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #ifdef CONFIG_8xx#include <mpc8xx.h> #endif
@@ -932,8 +932,8 @@ void board_init_r (gd_t *id, ulong dest_addr)#endif /** leave this here (after malloc(), environment and PCI are working) **/ -/* Initialize devices */ -devices_init (); +/* Initialize stdio devices */ +stdio_init ();/* Initialize the jump table for applications */ jumptable_init ();
lib_sh/board.c +2 -2
@@ -21,7 +21,7 @@#include <common.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <timestamp.h> #include <version.h> #include <watchdog.h>
@@ -150,7 +150,7 @@ init_fnc_t *init_sequence[] = sh_mem_env_init, INIT_FUNC_NAND_INIT/* Flash memory (NAND) init */INIT_FUNC_PCI_INIT /* PCI init */ - devices_init, + stdio_init, console_init_r, interrupt_init, #ifdef BOARD_LATE_INIT
lib_sparc/board.c +3 -3
@@ -28,7 +28,7 @@#include <common.h> #include <command.h> #include <malloc.h> -#include <devices.h> +#include <stdio.h> #include <config.h> #if defined(CONFIG_CMD_IDE )#include <ide.h>
@@ -403,8 +403,8 @@ void board_init_f(ulong bootflag)pci_init ();#endif -/* Initialize devices */ -devices_init (); +/* Initialize stdio devices */ +stdio_init ();/* Initialize the jump table for applications */ jumptable_init ();
post/post.c +1 -1
@@ -22,7 +22,7 @@*/ #include <common.h> -#include <console.h> +#include <stdio.h> #include <watchdog.h> #include <post.h>
Signature · 1 line
1.6.1.3
RFC PATCH v2 3/3 stdio/device: rework function naming convention
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
actually the console API use the following naming convention
Please look up the difference in meaning between "actually" and "cur- rently"; I think you usually mean "currently" when you say "actually".
This patch should preceed the previous one, where you already use the new, not yet introduced "stdio_" naming scheme.
Quoted 11 lines
======Extract======
typedef structdevice_t;int
device_register(device_t* dev);
intdevices_init(void);
intdevice_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);
=======
Quoted 1 line
which is not console dependent and is confusing
I think this explanation is confusing, too, as I don't know whjat you mean by "console dependent".
Quoted 4 lines
---
v2:
usestdio_instead ofconsole_
check all ubifs update
???? What has ubifs to do with that? UBI is nowhere mentioned in this patch at all.
Review
Quoted 2 lines
(quoted diff) +1
-1- device_t kbddev ; + stdio_device_t kbddev ;
stdio_device_t is too long; please use "stdio_dev instead of stdio_device.
Review
Quoted 2 lines
(quoted diff) +1
-1-#include <devices.h> +#include <stdio.h>
NAK. This is unacceptable. <stdio.h> has a standardized meaning, and what you are doing here is something completely different. You might call this stdio_dev.h or similar, but stdio.h cannot be accepted.
common/stdio.c line 45
Quoted 5 lines
common/stdio.c renamed from common/devices.c +2
-2-#if defined(CONFIG_SPLASH_SCREEN ) && !defined(CONFIG_SYS_DEVICE_NULLDEV ) -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#if defined(CONFIG_SPLASH_SCREEN ) && !defined(CONFIG_SYS_STDIO_NULLDEV ) +#define CONFIG_SYS_STDIO_NULLDEV 1#endif
I'm not happy about the CONFIG_SYS_STDIO_NULLDEV; the "NULL device" is actually a more general concept and not limited to the stdio handling. Please do not put a "STDIO" in this name.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Perfection is reached, not when there is no longer anything to add,
but when there is no longer anything to take away.
- Antoine de Saint-ExuperyRFC PATCH v2 3/3 stdio/device: rework function naming convention
Hi
2009/5/9 Wolfgang Denk <[email protected]>:
Quoted 4 lines
Quoted 1 line
check all ubifs update
???? What has ubifs to do with that? UBI is nowhere mentioned in this patch at all.
v1 of the patch touched some ubi stuff because of the global search&replace, hence the comment above.
/Magnus
RFC PATCH v2 3/3 stdio/device: rework function naming convention
In reply to Wolfgang DenkQuoted 23 lines · Wolfgang Denk
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 1 line · In message <[email protected]> you wrote:
actually the console API use the following naming convention
Please look up the difference in meaning between "actually" and "cur- rently"; I think you usually mean "currently" when you say "actually".
This patch should preceed the previous one, where you already use the new, not yet introduced "
stdio_" naming scheme.Quoted 11 lines
======Extract======
typedef structdevice_t;int
device_register(device_t* dev);
intdevices_init(void);
intdevice_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);
=======
Quoted 4 lines
Quoted 1 line
which is not console dependent and is confusing
I think this explanation is confusing, too, as I don't know whjat you mean by "console dependent".
device is a generic name
Quoted 10 lines
common/stdio.c line 45
Quoted 6 lines
common/stdio.c renamed from common/devices.c +2
-2-#if defined(CONFIG_SPLASH_SCREEN ) && !defined(CONFIG_SYS_DEVICE_NULLDEV ) -#define CONFIG_SYS_DEVICE_NULLDEV 1 +#if defined(CONFIG_SPLASH_SCREEN ) && !defined(CONFIG_SYS_STDIO_NULLDEV ) +#define CONFIG_SYS_STDIO_NULLDEV 1#endif I'm not happy about the
CONFIG_SYS_STDIO_NULLDEV; the "NULL device" is actually a more general concept and not limited to the stdio handling. Please do not put a "STDIO" in this name.
here it's to active the stdio null device
Best Regards,
J.
RFC PATCH v2 3/3 stdio/device: rework function naming convention
Dear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 22 lines · In message <[email protected]> you wrote:
Quoted 22 lines
Quoted 1 line · In message <[email protected]> you wrote:
actually the console API use the following naming convention
Please look up the difference in meaning between "actually" and "cur- rently"; I think you usually mean "currently" when you say "actually".
This patch should preceed the previous one, where you already use the new, not yet introduced "
stdio_" naming scheme.Quoted 11 lines
======Extract======
typedef structdevice_t;int
device_register(device_t* dev);
intdevices_init(void);
intdevice_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);
=======
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
which is not console dependent and is confusing
I think this explanation is confusing, too, as I don't know whjat you mean by "console dependent".
device is a generic name
Can you please try and explain what you find confusing, and what you mean by "not console dependent"? I cannot even guess what you mean here.
Quoted 9 lines
Quoted 8 lines
common/stdio.c line 45
Quoted 4 lines
common/stdio.c renamed from common/devices.c +2
-1-#define CONFIG_SYS_DEVICE_NULLDEV 1 +#if defined(CONFIG_SPLASH_SCREEN ) && !defined(CONFIG_SYS_STDIO_NULLDEV ) +#define CONFIG_SYS_STDIO_NULLDEV 1#endif I'm not happy about the
CONFIG_SYS_STDIO_NULLDEV; the "NULL device" is actually a more general concept and not limited to the stdio handling. Please do not put a "STDIO" in this name.here it's to active the stdio null device
No. If you are talking about "a more general concept" which is "not limited to the stdio handling", then we should do it right. Then there is no such thing as a "stdio null device". There is only a null device, and we assign it to one or more stdio channels here. Please do not name this "stdio null device" or ...STDIO_NULLDEV.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de PROGRAM - n. A magic spell cast over a computer allowing it to turn one's input into error messages. v. tr. - To engage in a pastime similar to banging one's head against a wall, but with fewer opportunities for reward.
PATCH 2/3 console: unify printing current devices
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 6 lines · In message <[email protected]> you wrote:
actually the mpl's boards duplicate the printing current devices from
common/console.ccreate
stdio_print_current_devices()for this purposeSigned-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Quoted 9 lines
--- board/mpl/common/common_util.c | 30 ----------------------- board/mpl/common/common_util.h | 1 - board/mpl/mip405/mip405.c | 3 +- board/mpl/pip405/pip405.c | 3 +- board/mpl/vcma9/vcma9.c | 3 +- common/console.c | 51 ++++++++++++++++++++++------------------ include/console.h | 2 + 7 files changed, 36 insertions(+), 57 deletions(-)
Please split into 2 separate patches: one to factor out the code in common/console.c, and another one to use this function to remove dupolicated code.
...
Quoted 25 lines
common/console.c +17
-0@@ -532,6 +532,33 @@ int console_init_f(void)return 0 ; } +void stdio_print_current_devices (void ) +{ +#ifdef CONFIG_SYS_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); + }
common/console.c int console_init_f(void) · line 561
Quoted 10 lines
common/console.c +10
-0+ +puts ("Err: " ); +if (stdio_devices[stderr] ==NULL ) { +puts ("No error devices available!\n" ); + }else { +printf ("%s\n" , stdio_devices[stderr]->name); + } +#endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */ +} +
Nearly the same code is repeated a second time for the !CONFIG_SYS_CONSOLE_IS_IN_ENV case; if you factor out one into a separate function, you should do the same for the other, too.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Is a computer language with goto's totally Wirth-less?
PATCH 1/3 console.h: remove non implement function : console_realloc
In reply to Jean-Christophe PLAGNIOL-VILLARDDear Jean-Christophe PLAGNIOL-VILLARD,
Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>--- include/console.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
Please change commit message into: "remove unused prototype".
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Nothing is easier than to denounce the evildoer; nothing is more difficult than to understand him. - Fyodor Dostoevski