Merge tag 'next-20220328' of https://source.denx.de/u-boot/custodians/u-boot-video...

[platform/kernel/u-boot.git] / include / stdio_dev.h

diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index 48871a6..270fa27 100644 (file)
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -18,6 +18,8 @@
 #define DEV_FLAGS_OUTPUT 0x00000002    /* Device can be used as output console */
 #define DEV_FLAGS_DM     0x00000004    /* Device priv is a struct udevice * */
 
+int stdio_file_to_flags(const int file);
+
 /* Device information */
 struct stdio_dev {
        int     flags;                  /* Device flags: input/output/system    */
@@ -83,7 +85,6 @@ int stdio_add_devices(void);
 int stdio_init(void);
 
 void stdio_print_current_devices(void);
-int stdio_deregister(const char *devname, int force);
 
 /**
  * stdio_deregister_dev() - deregister the device "devname".
@@ -102,6 +103,7 @@ int drv_lcd_init(void);
 int drv_video_init(void);
 int drv_keyboard_init(void);
 int drv_usbtty_init(void);
+int drv_usbacm_init(void);
 int drv_nc_init(void);
 int drv_jtag_console_init(void);
 int cbmemc_init(void);