| kbd.c (298307) | kbd.c (298848) |
|---|---|
| 1/*- 2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 12 unchanged lines hidden (view full) --- 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * 26 */ 27 28#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 12 unchanged lines hidden (view full) --- 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * 26 */ 27 28#include <sys/cdefs.h> |
| 29__FBSDID("$FreeBSD: head/sys/dev/kbd/kbd.c 298307 2016-04-19 23:37:24Z pfg $"); | 29__FBSDID("$FreeBSD: head/sys/dev/kbd/kbd.c 298848 2016-04-30 14:41:18Z pfg $"); |
| 30 31#include "opt_kbd.h" 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/kernel.h> 36#include <sys/malloc.h> 37#include <sys/conf.h> --- 53 unchanged lines hidden (view full) --- 91kbd_realloc_array(void) 92{ 93 keyboard_t **new_kbd; 94 keyboard_switch_t **new_kbdsw; 95 int newsize; 96 int s; 97 98 s = spltty(); | 30 31#include "opt_kbd.h" 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/kernel.h> 36#include <sys/malloc.h> 37#include <sys/conf.h> --- 53 unchanged lines hidden (view full) --- 91kbd_realloc_array(void) 92{ 93 keyboard_t **new_kbd; 94 keyboard_switch_t **new_kbdsw; 95 int newsize; 96 int s; 97 98 s = spltty(); |
| 99 newsize = ((keyboards + ARRAY_DELTA)/ARRAY_DELTA)*ARRAY_DELTA; | 99 newsize = rounddown(keyboards + ARRAY_DELTA, ARRAY_DELTA); |
| 100 new_kbd = malloc(sizeof(*new_kbd)*newsize, M_DEVBUF, M_NOWAIT|M_ZERO); 101 if (new_kbd == NULL) { 102 splx(s); 103 return (ENOMEM); 104 } 105 new_kbdsw = malloc(sizeof(*new_kbdsw)*newsize, M_DEVBUF, 106 M_NOWAIT|M_ZERO); 107 if (new_kbdsw == NULL) { --- 1380 unchanged lines hidden --- | 100 new_kbd = malloc(sizeof(*new_kbd)*newsize, M_DEVBUF, M_NOWAIT|M_ZERO); 101 if (new_kbd == NULL) { 102 splx(s); 103 return (ENOMEM); 104 } 105 new_kbdsw = malloc(sizeof(*new_kbdsw)*newsize, M_DEVBUF, 106 M_NOWAIT|M_ZERO); 107 if (new_kbdsw == NULL) { --- 1380 unchanged lines hidden --- |