diff options
author | Jean-Christophe PLAGNIOL-VILLARD | 2009-05-16 12:14:54 +0200 |
---|---|---|
committer | Wolfgang Denk | 2009-07-18 00:27:46 +0200 |
commit | 52cb4d4fb3487313f5a72ea740f527a4aefaa365 (patch) | |
tree | e673bea782668009ec4818c16b159d7cf1b062ba /board/mpl | |
parent | f732a7598fa36d48241df20b1a1f4cdbf09f75ee (diff) |
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 'board/mpl')
-rw-r--r-- | board/mpl/common/common_util.c | 2 | ||||
-rw-r--r-- | board/mpl/common/isa.c | 2 | ||||
-rw-r--r-- | board/mpl/common/kbd.c | 6 | ||||
-rw-r--r-- | board/mpl/pati/pati.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c index d16939120ae..243e3eb7f91 100644 --- a/board/mpl/common/common_util.c +++ b/board/mpl/common/common_util.c @@ -29,7 +29,7 @@ #include <asm/processor.h> #include <asm/byteorder.h> #include <i2c.h> -#include <devices.h> +#include <stdio_dev.h> #include <pci.h> #include <malloc.h> #include <bzlib.h> diff --git a/board/mpl/common/isa.c b/board/mpl/common/isa.c index 91829d44f3c..5d467b48dc3 100644 --- a/board/mpl/common/isa.c +++ b/board/mpl/common/isa.c @@ -26,7 +26,7 @@ #include <common.h> #include <asm/processor.h> -#include <devices.h> +#include <stdio_dev.h> #include "isa.h" #include "piix4_pci.h" #include "kbd.h" diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c index a457635d4de..b0a9620232d 100644 --- a/board/mpl/common/kbd.c +++ b/board/mpl/common/kbd.c @@ -28,7 +28,7 @@ */ #include <common.h> #include <asm/processor.h> -#include <devices.h> +#include <stdio_dev.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 ; + struct stdio_dev 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) { diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c index 85c5af956d3..8f23d2dc0e3 100644 --- a/board/mpl/pati/pati.c +++ b/board/mpl/pati/pati.c @@ -46,7 +46,7 @@ #include <common.h> #include <mpc5xx.h> -#include <devices.h> +#include <stdio_dev.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; +struct stdio_dev 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); |