Deleted Added
full compact
boot2.c (94411) boot2.c (96424)
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/*
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/*
17 * $FreeBSD: head/sys/boot/i386/boot2/boot2.c 94411 2002-04-11 09:21:10Z pb $
17 * $FreeBSD: head/sys/boot/i386/boot2/boot2.c 96424 2002-05-11 21:39:59Z peter $
18 */
19
20#include <sys/param.h>
21#include <sys/reboot.h>
22#include <sys/diskslice.h>
23#include <sys/disklabel.h>
24#include <sys/dirent.h>
25#include <machine/bootinfo.h>

--- 425 unchanged lines hidden (view full) ---

451 while ((c = *arg++)) {
452 for (i = 0; c != optstr[i]; i++)
453 if (i == NOPT - 1)
454 return -1;
455 opts ^= 1 << flags[i];
456 }
457 if (opts & 1 << RBX_PROBEKBD) {
458 i = *(uint8_t *)PTOV(0x496) & 0x10;
18 */
19
20#include <sys/param.h>
21#include <sys/reboot.h>
22#include <sys/diskslice.h>
23#include <sys/disklabel.h>
24#include <sys/dirent.h>
25#include <machine/bootinfo.h>

--- 425 unchanged lines hidden (view full) ---

451 while ((c = *arg++)) {
452 for (i = 0; c != optstr[i]; i++)
453 if (i == NOPT - 1)
454 return -1;
455 opts ^= 1 << flags[i];
456 }
457 if (opts & 1 << RBX_PROBEKBD) {
458 i = *(uint8_t *)PTOV(0x496) & 0x10;
459 printf("Keyboard: %s\n", i ? "yes" : "no");
459 /* printf("Keyboard: %s\n", i ? "yes" : "no"); XXX GCC31 size */
460 if (!i)
461 opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL;
462 opts &= ~(1 << RBX_PROBEKBD);
463 }
464 ioctrl = opts & 1 << RBX_DUAL ? (IO_SERIAL|IO_KEYBOARD) :
465 opts & 1 << RBX_SERIAL ? IO_SERIAL : IO_KEYBOARD;
466 if (ioctrl & IO_SERIAL)
467 sio_init();

--- 373 unchanged lines hidden ---
460 if (!i)
461 opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL;
462 opts &= ~(1 << RBX_PROBEKBD);
463 }
464 ioctrl = opts & 1 << RBX_DUAL ? (IO_SERIAL|IO_KEYBOARD) :
465 opts & 1 << RBX_SERIAL ? IO_SERIAL : IO_KEYBOARD;
466 if (ioctrl & IO_SERIAL)
467 sio_init();

--- 373 unchanged lines hidden ---