| gptboot.c (235988) | gptboot.c (241301) |
|---|---|
| 1/*- 2 * Copyright (c) 1998 Robert Nordier 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms are freely 6 * permitted provided that the above copyright notice and this 7 * paragraph and the following disclaimer are duplicated in all 8 * such forms. 9 * 10 * This software is provided "AS IS" and without any express or 11 * implied warranties, including, without limitation, the implied 12 * warranties of merchantability and fitness for a particular 13 * purpose. 14 */ 15 16#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998 Robert Nordier 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms are freely 6 * permitted provided that the above copyright notice and this 7 * paragraph and the following disclaimer are duplicated in all 8 * such forms. 9 * 10 * This software is provided "AS IS" and without any express or 11 * implied warranties, including, without limitation, the implied 12 * warranties of merchantability and fitness for a particular 13 * purpose. 14 */ 15 16#include <sys/cdefs.h> |
| 17__FBSDID("$FreeBSD: head/sys/boot/i386/gptboot/gptboot.c 235988 2012-05-25 09:36:39Z gleb $"); | 17__FBSDID("$FreeBSD: head/sys/boot/i386/gptboot/gptboot.c 241301 2012-10-06 20:08:29Z avg $"); |
| 18 19#include <sys/param.h> 20#include <sys/gpt.h> 21#include <sys/dirent.h> 22#include <sys/reboot.h> 23 24#include <machine/bootinfo.h> 25#include <machine/elf.h> --- 348 unchanged lines hidden (view full) --- 374 } 375 for (i = 0; c != optstr[i]; i++) 376 if (i == NOPT - 1) 377 return -1; 378 opts ^= OPT_SET(flags[i]); 379 } 380 ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) : 381 OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD; | 18 19#include <sys/param.h> 20#include <sys/gpt.h> 21#include <sys/dirent.h> 22#include <sys/reboot.h> 23 24#include <machine/bootinfo.h> 25#include <machine/elf.h> --- 348 unchanged lines hidden (view full) --- 374 } 375 for (i = 0; c != optstr[i]; i++) 376 if (i == NOPT - 1) 377 return -1; 378 opts ^= OPT_SET(flags[i]); 379 } 380 ioctrl = OPT_CHECK(RBX_DUAL) ? (IO_SERIAL|IO_KEYBOARD) : 381 OPT_CHECK(RBX_SERIAL) ? IO_SERIAL : IO_KEYBOARD; |
| 382 if (ioctrl & IO_SERIAL) 383 sio_init(115200 / comspeed); | 382 if (ioctrl & IO_SERIAL) { 383 if (sio_init(115200 / comspeed) != 0) 384 ioctrl &= ~IO_SERIAL; 385 } |
| 384 } else { 385 for (q = arg--; *q && *q != '('; q++); 386 if (*q) { 387 drv = -1; 388 if (arg[1] == ':') { 389 drv = *arg - '0'; 390 if (drv > 9) 391 return (-1); --- 44 unchanged lines hidden --- | 386 } else { 387 for (q = arg--; *q && *q != '('; q++); 388 if (*q) { 389 drv = -1; 390 if (arg[1] == ':') { 391 drv = *arg - '0'; 392 if (drv > 9) 393 return (-1); --- 44 unchanged lines hidden --- |