X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fstdio_dev.h;h=3164fa2a557960482b0fd5d4a4ba5e2ba08f5318;hb=d884c58f0c7b997fd7f04e360d86717e75de74b1;hp=a7d0825c7e52fe86c5d6c9d94d7283b6d427b755;hpb=772e173802627a1917a3f5878ad4b9b920089a33;p=u-boot

diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index a7d0825c7e..3164fa2a55 100644
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -16,14 +16,13 @@
 
 #define DEV_FLAGS_INPUT	 0x00000001	/* Device can be used as input	console */
 #define DEV_FLAGS_OUTPUT 0x00000002	/* Device can be used as output console */
-#define DEV_FLAGS_SYSTEM 0x80000000	/* Device is a system device		*/
-#define DEV_EXT_VIDEO	 0x00000001	/* Video extensions supported		*/
+#define DEV_FLAGS_DM     0x00000004	/* Device priv is a struct udevice * */
 
 /* Device information */
 struct stdio_dev {
 	int	flags;			/* Device flags: input/output/system	*/
 	int	ext;			/* Supported extensions			*/
-	char	name[16];		/* Device name				*/
+	char	name[32];		/* Device name				*/
 
 /* GENERAL functions */
 
@@ -78,11 +77,33 @@ extern char *stdio_names[MAX_FILES];
  */
 int	stdio_register (struct stdio_dev * dev);
 int stdio_register_dev(struct stdio_dev *dev, struct stdio_dev **devp);
-int	stdio_init (void);
+
+/**
+ * stdio_init_tables() - set up stdio tables ready for devices
+ *
+ * This does not add any devices, but just prepares stdio for use.
+ */
+int stdio_init_tables(void);
+
+/**
+ * stdio_add_devices() - Add stdio devices to the table
+ *
+ * This makes calls to all the various subsystems that use stdio, to make
+ * them register with stdio.
+ */
+int stdio_add_devices(void);
+
+/**
+ * stdio_init() - Sets up stdio ready for use
+ *
+ * This calls stdio_init_tables() and stdio_add_devices()
+ */
+int stdio_init(void);
+
 void	stdio_print_current_devices(void);
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
-int	stdio_deregister(const char *devname);
-int stdio_deregister_dev(struct stdio_dev *dev);
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
+int stdio_deregister(const char *devname, int force);
+int stdio_deregister_dev(struct stdio_dev *dev, int force);
 #endif
 struct list_head* stdio_get_list(void);
 struct stdio_dev* stdio_get_by_name(const char* name);