Page MenuHomeFreeBSD
Files F152761196

D38089.diff
No OneTemporary
Actions

D38089.diff
View Options

diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
--- a/sys/dev/vt/hw/fb/vt_fb.c
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -517,19 +517,21 @@
int
vt_fb_attach(struct fb_info *info)
{
+ int ret;
- vt_allocate(&vt_fb_driver, info);
+ ret = vt_allocate(&vt_fb_driver, info);
- return (0);
+ return (ret);
}
int
vt_fb_detach(struct fb_info *info)
{
+ int ret;
- vt_deallocate(&vt_fb_driver, info);
+ ret = vt_deallocate(&vt_fb_driver, info);
- return (0);
+ return (ret);
}
void
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
--- a/sys/dev/vt/vt.h
+++ b/sys/dev/vt/vt.h
@@ -91,8 +91,8 @@
struct vt_driver;
-void vt_allocate(const struct vt_driver *, void *);
-void vt_deallocate(const struct vt_driver *, void *);
+int vt_allocate(const struct vt_driver *, void *);
+int vt_deallocate(const struct vt_driver *, void *);
typedef unsigned int vt_axis_t;
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -3137,12 +3137,12 @@
vd->vd_flags &= ~VDF_SUSPENDED;
}
-void
+int
vt_allocate(const struct vt_driver *drv, void *softc)
{
if (!vty_enabled(VTY_VT))
- return;
+ return (EINVAL);
if (main_vd->vd_driver == NULL) {
main_vd->vd_driver = drv;
@@ -3156,31 +3156,35 @@
if (drv->vd_priority <= main_vd->vd_driver->vd_priority) {
printf("VT: Driver priority %d too low. Current %d\n ",
drv->vd_priority, main_vd->vd_driver->vd_priority);
- return;
+ return (EEXIST);
}
printf("VT: Replacing driver \"%s\" with new \"%s\".\n",
main_vd->vd_driver->vd_name, drv->vd_name);
}
vt_replace_backend(drv, softc);
+
+ return (0);
}
-void
+int
vt_deallocate(const struct vt_driver *drv, void *softc)
{
if (!vty_enabled(VTY_VT))
- return;
+ return (EINVAL);
if (main_vd->vd_prev_driver == NULL ||
main_vd->vd_driver != drv ||
main_vd->vd_softc != softc)
- return;
+ return (EPERM);
printf("VT: Switching back from \"%s\" to \"%s\".\n",
main_vd->vd_driver->vd_name, main_vd->vd_prev_driver->vd_name);
vt_replace_backend(NULL, NULL);
+
+ return (0);
}
void

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 17, 11:12 PM (12 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31631276
Default Alt Text
D38089.diff (2 KB)

Event Timeline