| vt_core.c (230469) | vt_core.c (243802) |
|---|---|
| 1/*- 2 * Copyright (c) 2009 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Ed Schouten under sponsorship from the 6 * FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2009 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Ed Schouten under sponsorship from the 6 * FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29 30#include <sys/cdefs.h> |
| 31__FBSDID("$FreeBSD: user/ed/newcons/sys/dev/vt/vt_core.c 230469 2012-01-22 19:49:43Z nwhitehorn $"); | 31__FBSDID("$FreeBSD: user/ed/newcons/sys/dev/vt/vt_core.c 243802 2012-12-02 22:21:40Z nwhitehorn $"); |
| 32 33#include <sys/param.h> 34#include <sys/consio.h> 35#include <sys/eventhandler.h> 36#include <sys/fbio.h> 37#include <sys/kbio.h> 38#include <sys/kdb.h> 39#include <sys/kernel.h> --- 162 unchanged lines hidden (view full) --- 202 break; 203 case HALT: 204 shutdown_nice(RB_HALT); 205 break; 206 case PDWN: 207 shutdown_nice(RB_HALT|RB_POWEROFF); 208 break; 209 case SLK: { | 32 33#include <sys/param.h> 34#include <sys/consio.h> 35#include <sys/eventhandler.h> 36#include <sys/fbio.h> 37#include <sys/kbio.h> 38#include <sys/kdb.h> 39#include <sys/kernel.h> --- 162 unchanged lines hidden (view full) --- 202 break; 203 case HALT: 204 shutdown_nice(RB_HALT); 205 break; 206 case PDWN: 207 shutdown_nice(RB_HALT|RB_POWEROFF); 208 break; 209 case SLK: { |
| 210 int state; | 210 int state = 0; |
| 211 212 kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state); 213 VT_LOCK(vd); 214 if (state & SLKED) { 215 /* Turn scrolling on. */ 216 vw->vw_flags |= VWF_SCROLL; 217 } else { 218 /* Turn scrolling off. */ --- 436 unchanged lines hidden (view full) --- 655 return (-1); 656 657 /* Stripped down handling of vt_kbdevent(), without locking, etc. */ 658 if (c & SPCLKEY) { 659 c &= ~SPCLKEY; 660 661 switch (c) { 662 case SLK: { | 211 212 kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state); 213 VT_LOCK(vd); 214 if (state & SLKED) { 215 /* Turn scrolling on. */ 216 vw->vw_flags |= VWF_SCROLL; 217 } else { 218 /* Turn scrolling off. */ --- 436 unchanged lines hidden (view full) --- 655 return (-1); 656 657 /* Stripped down handling of vt_kbdevent(), without locking, etc. */ 658 if (c & SPCLKEY) { 659 c &= ~SPCLKEY; 660 661 switch (c) { 662 case SLK: { |
| 663 int state; | 663 int state = 0; |
| 664 665 kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state); 666 if (state & SLKED) { 667 /* Turn scrolling on. */ 668 vw->vw_flags |= VWF_SCROLL; 669 } else { 670 /* Turn scrolling off. */ 671 vw->vw_flags &= ~VWF_SCROLL; --- 373 unchanged lines hidden --- | 664 665 kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state); 666 if (state & SLKED) { 667 /* Turn scrolling on. */ 668 vw->vw_flags |= VWF_SCROLL; 669 } else { 670 /* Turn scrolling off. */ 671 vw->vw_flags &= ~VWF_SCROLL; --- 373 unchanged lines hidden --- |