efi_loader: type of efi_secure_mode

[oweals/u-boot.git] / include / stdio_dev.h

diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index e6dc12ac3984b578be2601a09efd6c1bce5febe3..cd0cd601bff624ebcacbe419d8795b190f45ea0c 100644 (file)
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -1,13 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2000
  * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _STDIO_DEV_H_
 #define _STDIO_DEV_H_
 
+#include <stdio.h>
 #include <linux/list.h>
 
 /*
@@ -16,29 +16,31 @@
 
 #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 */
 
-       int (*start) (void);            /* To start the device                  */
-       int (*stop) (void);             /* To stop the device                   */
+       int (*start)(struct stdio_dev *dev);    /* To start the device */
+       int (*stop)(struct stdio_dev *dev);     /* To stop the device */
 
 /* OUTPUT functions */
 
-       void (*putc) (const char c);    /* To put a char                        */
-       void (*puts) (const char *s);   /* To put a string (accelerator)        */
+       /* To put a char */
+       void (*putc)(struct stdio_dev *dev, const char c);
+       /* To put a string (accelerator) */
+       void (*puts)(struct stdio_dev *dev, const char *s);
 
 /* INPUT functions */
 
-       int (*tstc) (void);             /* To test if a char is ready...        */
-       int (*getc) (void);             /* To get that char                     */
+       /* To test if a char is ready... */
+       int (*tstc)(struct stdio_dev *dev);
+       int (*getc)(struct stdio_dev *dev);     /* To get that char */
 
 /* Other functions */
 
@@ -46,24 +48,6 @@ struct stdio_dev {
        struct list_head list;
 };
 
-/*
- * VIDEO EXTENSIONS
- */
-#define VIDEO_FORMAT_RGB_INDEXED       0x0000
-#define VIDEO_FORMAT_RGB_DIRECTCOLOR   0x0001
-#define VIDEO_FORMAT_YUYV_4_4_4                0x0010
-#define VIDEO_FORMAT_YUYV_4_2_2                0x0011
-
-typedef struct {
-       void *address;                  /* Address of framebuffer               */
-       ushort  width;                  /* Horizontal resolution                */
-       ushort  height;                 /* Vertical resolution                  */
-       uchar   format;                 /* Format                               */
-       uchar   colors;                 /* Colors number or color depth         */
-       void (*setcolreg) (int, int, int, int);
-       void (*getcolreg) (int, void *);
-} video_ext_t;
-
 /*
  * VARIABLES
  */
@@ -74,10 +58,34 @@ extern char *stdio_names[MAX_FILES];
  * PROTOTYPES
  */
 int    stdio_register (struct stdio_dev * dev);
-int    stdio_init (void);
+int stdio_register_dev(struct stdio_dev *dev, struct stdio_dev **devp);
+
+/**
+ * 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);
+#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);