From 75a33a66f9973fe081a3429cb652a155f97037a9 Mon Sep 17 00:00:00 2001 From: emaste Date: Wed, 16 May 2018 11:19:03 +0000 Subject: [PATCH] Clean up vt source whitespace issues --- sys/dev/vt/hw/fb/vt_early_fb.c | 2 +- sys/dev/vt/hw/ofwfb/ofwfb.c | 4 ++-- sys/dev/vt/vt.h | 2 +- sys/dev/vt/vt_core.c | 20 ++++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c index 29306f336e4a..15af1aedbd25 100644 --- a/sys/dev/vt/hw/fb/vt_early_fb.c +++ b/sys/dev/vt/hw/fb/vt_early_fb.c @@ -224,7 +224,7 @@ vt_efb_init(struct vt_device *vd) * remapped for us when relocation turns on. */ if (OF_getproplen(node, "address") == sizeof(info->fb_pbase)) { - /* XXX We assume #address-cells is 1 at this point. */ + /* XXX We assume #address-cells is 1 at this point. */ OF_getencprop(node, "address", &info->fb_pbase, sizeof(info->fb_pbase)); diff --git a/sys/dev/vt/hw/ofwfb/ofwfb.c b/sys/dev/vt/hw/ofwfb/ofwfb.c index 5474a6c0cbe4..ab9c99d3fe3d 100644 --- a/sys/dev/vt/hw/ofwfb/ofwfb.c +++ b/sys/dev/vt/hw/ofwfb/ofwfb.c @@ -317,7 +317,7 @@ ofwfb_initialize(struct vt_device *vd) } if (i != 16) sc->iso_palette = 1; - + break; case 32: @@ -417,7 +417,7 @@ ofwfb_init(struct vt_device *vd) * remapped for us when relocation turns on. */ if (OF_getproplen(node, "address") == sizeof(fb_phys)) { - /* XXX We assume #address-cells is 1 at this point. */ + /* XXX We assume #address-cells is 1 at this point. */ OF_getprop(node, "address", &fb_phys, sizeof(fb_phys)); #if defined(__powerpc__) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index 62eaa06b7668..745f9de836cb 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -93,7 +93,7 @@ struct vt_driver; void vt_allocate(const struct vt_driver *, void *); void vt_deallocate(const struct vt_driver *, void *); -typedef unsigned int vt_axis_t; +typedef unsigned int vt_axis_t; /* * List of locks diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index d85ddf9b90da..81a803fcd00f 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -539,14 +539,14 @@ vt_window_switch(struct vt_window *vw) return (0); if (!(vw->vw_flags & (VWF_OPENED|VWF_CONSOLE))) return (EINVAL); - + vd->vd_curwindow = vw; vd->vd_flags |= VDF_INVALID; if (vd->vd_driver->vd_postswitch) vd->vd_driver->vd_postswitch(vd); return (0); } - + VT_LOCK(vd); if (curvw == vw) { /* Nothing to do. */ @@ -2279,7 +2279,7 @@ skip_thunk: /* XXX */ *(int *)data = M_CG640x480; return (0); - case CONS_BELLTYPE: /* set bell type sound */ + case CONS_BELLTYPE: /* set bell type sound */ if ((*(int *)data) & CONS_QUIET_BELL) vd->vd_flags |= VDF_QUIET_BELL; else @@ -2383,7 +2383,7 @@ skip_thunk: break; } return (0); - case KDENABIO: /* allow io operations */ + case KDENABIO: /* allow io operations */ error = priv_check(td, PRIV_IO); if (error != 0) return (error); @@ -2396,20 +2396,20 @@ skip_thunk: td->td_frame->tf_rflags |= PSL_IOPL; #endif return (0); - case KDDISABIO: /* disallow io operations (default) */ + case KDDISABIO: /* disallow io operations (default) */ #if defined(__i386__) td->td_frame->tf_eflags &= ~PSL_IOPL; #elif defined(__amd64__) td->td_frame->tf_rflags &= ~PSL_IOPL; #endif return (0); - case KDMKTONE: /* sound the bell */ + case KDMKTONE: /* sound the bell */ vtterm_beep(tm, *(u_int *)data); return (0); - case KIOCSOUND: /* make tone (*data) hz */ + case KIOCSOUND: /* make tone (*data) hz */ /* TODO */ return (0); - case CONS_SETKBD: /* set the new keyboard */ + case CONS_SETKBD: /* set the new keyboard */ mtx_lock(&Giant); error = 0; if (vd->vd_keyboard != *(int *)data) { @@ -2437,7 +2437,7 @@ skip_thunk: } mtx_unlock(&Giant); return (error); - case CONS_RELKBD: /* release the current keyboard */ + case CONS_RELKBD: /* release the current keyboard */ mtx_lock(&Giant); error = 0; if (vd->vd_keyboard != -1) { @@ -2509,7 +2509,7 @@ skip_thunk: VT_UNLOCK(vd); return (error); } - case VT_SETMODE: { /* set screen switcher mode */ + case VT_SETMODE: { /* set screen switcher mode */ struct vt_mode *mode; struct proc *p1;