diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:53 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-13 08:16:53 +0100 |
| commit | 97d2da3d980ccdad1d8069cdefeeb445bf046475 (patch) | |
| tree | f59742b82b16e676c08d64add347f41e4b35050d /include | |
| parent | 6b926567c0cfd360d7ab8bedc3745610eda379bd (diff) | |
| parent | f210382b3f698d0829db12b28f409862c7e504f8 (diff) | |
| download | barebox-97d2da3d980ccdad1d8069cdefeeb445bf046475.tar.gz barebox-97d2da3d980ccdad1d8069cdefeeb445bf046475.tar.xz | |
Merge branch 'for-next/video'
Diffstat (limited to 'include')
| -rw-r--r-- | include/console.h | 10 | ||||
| -rw-r--r-- | include/fb.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/console.h b/include/console.h index 4b2f134a4c..126c2e8aa3 100644 --- a/include/console.h +++ b/include/console.h @@ -44,7 +44,8 @@ struct console_device { int (*setbrg)(struct console_device *cdev, int baudrate); void (*flush)(struct console_device *cdev); int (*set_mode)(struct console_device *cdev, enum console_mode mode); - int (*set_active)(struct console_device *cdev, unsigned active); + int (*open)(struct console_device *cdev); + int (*close)(struct console_device *cdev); char *devname; int devid; @@ -54,10 +55,15 @@ struct console_device { unsigned char f_active; char active[4]; + unsigned int open_count; + unsigned int baudrate; unsigned int baudrate_param; const char *linux_console_name; + + struct cdev devfs; + struct file_operations fops; }; int console_register(struct console_device *cdev); @@ -75,6 +81,8 @@ extern int barebox_loglevel; struct console_device *console_get_first_active(void); +int console_open(struct console_device *cdev); +int console_close(struct console_device *cdev); int console_set_active(struct console_device *cdev, unsigned active); unsigned console_get_active(struct console_device *cdev); int console_set_baudrate(struct console_device *cdev, unsigned baudrate); diff --git a/include/fb.h b/include/fb.h index b2a9c7152b..271b939968 100644 --- a/include/fb.h +++ b/include/fb.h @@ -86,6 +86,7 @@ struct fb_ops { void (*fb_enable)(struct fb_info *info); void (*fb_disable)(struct fb_info *info); int (*fb_activate_var)(struct fb_info *info); + void (*fb_flush)(struct fb_info *info); }; /* @@ -152,6 +153,7 @@ int register_framebuffer(struct fb_info *info); int fb_enable(struct fb_info *info); int fb_disable(struct fb_info *info); +void fb_flush(struct fb_info *info); #define FBIOGET_SCREENINFO _IOR('F', 1, loff_t) #define FBIO_ENABLE _IO('F', 2) |