| syscons.c (199171) | syscons.c (201223) |
|---|---|
| 1/*- 2 * Copyright (c) 1992-1998 S�ren Schmidt 3 * All rights reserved. 4 * 5 * This code is derived from software contributed to The DragonFly Project 6 * by Sascha Wildner <saw@online.de> 7 * 8 * Redistribution and use in source and binary forms, with or without --- 16 unchanged lines hidden (view full) --- 25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 */ 31 32#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1992-1998 S�ren Schmidt 3 * All rights reserved. 4 * 5 * This code is derived from software contributed to The DragonFly Project 6 * by Sascha Wildner <saw@online.de> 7 * 8 * Redistribution and use in source and binary forms, with or without --- 16 unchanged lines hidden (view full) --- 25 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 29 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 */ 31 32#include <sys/cdefs.h> |
| 33__FBSDID("$FreeBSD: head/sys/dev/syscons/syscons.c 199171 2009-11-11 08:20:19Z ed $"); | 33__FBSDID("$FreeBSD: head/sys/dev/syscons/syscons.c 201223 2009-12-29 21:51:28Z rnoland $"); |
| 34 35#include "opt_compat.h" 36#include "opt_syscons.h" 37#include "opt_splash.h" 38#include "opt_ddb.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 3384 unchanged lines hidden (view full) --- 3426 return c; 3427 } 3428 } 3429 3430 goto next_code; 3431} 3432 3433static int | 34 35#include "opt_compat.h" 36#include "opt_syscons.h" 37#include "opt_splash.h" 38#include "opt_ddb.h" 39 40#include <sys/param.h> 41#include <sys/systm.h> --- 3384 unchanged lines hidden (view full) --- 3426 return c; 3427 } 3428 } 3429 3430 goto next_code; 3431} 3432 3433static int |
| 3434sctty_mmap(struct tty *tp, vm_offset_t offset, vm_paddr_t *paddr, int nprot) | 3434sctty_mmap(struct tty *tp, vm_ooffset_t offset, vm_paddr_t *paddr, 3435 int nprot, vm_memattr_t *memattr) |
| 3435{ 3436 scr_stat *scp; 3437 3438 scp = sc_get_stat(tp); 3439 if (scp != scp->sc->cur_scp) 3440 return -1; | 3436{ 3437 scr_stat *scp; 3438 3439 scp = sc_get_stat(tp); 3440 if (scp != scp->sc->cur_scp) 3441 return -1; |
| 3441 return vidd_mmap(scp->sc->adp, offset, paddr, nprot); | 3442 return vidd_mmap(scp->sc->adp, offset, paddr, nprot, memattr); |
| 3442} 3443 3444static int 3445save_kbd_state(scr_stat *scp) 3446{ 3447 int state; 3448 int error; 3449 --- 268 unchanged lines hidden --- | 3443} 3444 3445static int 3446save_kbd_state(scr_stat *scp) 3447{ 3448 int state; 3449 int error; 3450 --- 268 unchanged lines hidden --- |