summaryrefslogtreecommitdiffstats
path: root/lib_i386
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-05-16 12:14:54 +0200
committerWolfgang Denk <wd@denx.de>2009-07-18 00:27:46 +0200
commit52cb4d4fb3487313f5a72ea740f527a4aefaa365 (patch)
treee673bea782668009ec4818c16b159d7cf1b062ba /lib_i386
parentf732a7598fa36d48241df20b1a1f4cdbf09f75ee (diff)
downloadtalos-obmc-uboot-52cb4d4fb3487313f5a72ea740f527a4aefaa365.tar.gz
talos-obmc-uboot-52cb4d4fb3487313f5a72ea740f527a4aefaa365.zip
stdio/device: rework function naming convention
So far the console API uses the following naming convention: ======Extract====== typedef struct device_t; int device_register (device_t * dev); int devices_init (void); int device_deregister(char *devname); struct list_head* device_get_list(void); device_t* device_get_by_name(char* name); device_t* device_clone(device_t *dev); ======= which is too generic and confusing. Instead of using device_XX and device_t we change this into stdio_XX and stdio_dev This will also allow to add later a generic device mechanism in order to have support for multiple devices and driver instances. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Edited commit message. Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_i386')
-rw-r--r--lib_i386/board.c4
-rw-r--r--lib_i386/video.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/lib_i386/board.c b/lib_i386/board.c
index e18dfa5bc4..54ef6e75a8 100644
--- a/lib_i386/board.c
+++ b/lib_i386/board.c
@@ -31,7 +31,7 @@
#include <common.h>
#include <watchdog.h>
#include <command.h>
-#include <devices.h>
+#include <stdio_dev.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 ();
diff --git a/lib_i386/video.c b/lib_i386/video.c
index cd89457382..c58ed104cc 100644
--- a/lib_i386/video.c
+++ b/lib_i386/video.c
@@ -23,7 +23,7 @@
#include <common.h>
#include <pci.h>
-#include <devices.h>
+#include <stdio_dev.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 struct stdio_dev vga_dev;
+ static struct stdio_dev 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;
OpenPOWER on IntegriCloud