| gptboot.c (163914) | gptboot.c (172921) |
|---|---|
| 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 163914 2006-11-02 17:28:38Z ru $"); | 17__FBSDID("$FreeBSD: head/sys/boot/i386/gptboot/gptboot.c 172921 2007-10-24 04:03:25Z jhb $"); |
| 18 19#include <sys/param.h> 20#include <sys/disklabel.h> 21#include <sys/diskmbr.h> 22#include <sys/dirent.h> 23#include <sys/reboot.h> 24 25#include <machine/bootinfo.h> --- 364 unchanged lines hidden (view full) --- 390 } 391 } 392 addr = hdr.eh.e_entry & 0xffffff; 393 } 394 bootinfo.bi_esymtab = VTOP(p); 395 bootinfo.bi_kernelname = VTOP(kname); 396 bootinfo.bi_bios_dev = dsk.drive; 397 __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), | 18 19#include <sys/param.h> 20#include <sys/disklabel.h> 21#include <sys/diskmbr.h> 22#include <sys/dirent.h> 23#include <sys/reboot.h> 24 25#include <machine/bootinfo.h> --- 364 unchanged lines hidden (view full) --- 390 } 391 } 392 addr = hdr.eh.e_entry & 0xffffff; 393 } 394 bootinfo.bi_esymtab = VTOP(p); 395 bootinfo.bi_kernelname = VTOP(kname); 396 bootinfo.bi_bios_dev = dsk.drive; 397 __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), |
| 398 MAKEBOOTDEV(dev_maj[dsk.type], 0, dsk.slice, dsk.unit, dsk.part), | 398 MAKEBOOTDEV(dev_maj[dsk.type], dsk.slice, dsk.unit, dsk.part), |
| 399 0, 0, 0, VTOP(&bootinfo)); 400} 401 402static int 403parse() 404{ 405 char *arg = cmd; 406 char *ep, *p, *q; --- 276 unchanged lines hidden --- | 399 0, 0, 0, VTOP(&bootinfo)); 400} 401 402static int 403parse() 404{ 405 char *arg = cmd; 406 char *ep, *p, *q; --- 276 unchanged lines hidden --- |