boot1.c (243254) | boot1.c (293461) |
---|---|
1/*- 2 * Copyright (c) 1998 Robert Nordier 3 * All rights reserved. 4 * Copyright (c) 2001 Robert Drehmel 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms are freely 8 * permitted provided that the above copyright notice and this 9 * paragraph and the following disclaimer are duplicated in all 10 * such forms. 11 * 12 * This software is provided "AS IS" and without any express or 13 * implied warranties, including, without limitation, the implied 14 * warranties of merchantability and fitness for a particular 15 * purpose. 16 */ 17 18#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1998 Robert Nordier 3 * All rights reserved. 4 * Copyright (c) 2001 Robert Drehmel 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms are freely 8 * permitted provided that the above copyright notice and this 9 * paragraph and the following disclaimer are duplicated in all 10 * such forms. 11 * 12 * This software is provided "AS IS" and without any express or 13 * implied warranties, including, without limitation, the implied 14 * warranties of merchantability and fitness for a particular 15 * purpose. 16 */ 17 18#include <sys/cdefs.h> |
19__FBSDID("$FreeBSD: head/sys/boot/powerpc/boot1.chrp/boot1.c 243254 2012-11-19 01:15:32Z trasz $"); | 19__FBSDID("$FreeBSD: head/sys/boot/powerpc/boot1.chrp/boot1.c 293461 2016-01-09 03:30:33Z smh $"); |
20 21#include <sys/param.h> 22#include <sys/dirent.h> 23#include <machine/elf.h> 24#include <machine/stdarg.h> 25 26#define _PATH_LOADER "/boot/loader" 27#define _PATH_KERNEL "/boot/kernel/kernel" --- 531 unchanged lines hidden (view full) --- 559} 560 561static int 562printf(const char *fmt, ...) 563{ 564 va_list ap; 565 int ret; 566 | 20 21#include <sys/param.h> 22#include <sys/dirent.h> 23#include <machine/elf.h> 24#include <machine/stdarg.h> 25 26#define _PATH_LOADER "/boot/loader" 27#define _PATH_KERNEL "/boot/kernel/kernel" --- 531 unchanged lines hidden (view full) --- 559} 560 561static int 562printf(const char *fmt, ...) 563{ 564 va_list ap; 565 int ret; 566 |
567 /* Don't annoy the user as we probe for partitions */ 568 if (strcmp(fmt,"Not ufs\n") == 0) 569 return 0; 570 | |
571 va_start(ap, fmt); 572 ret = vprintf(fmt, ap); 573 va_end(ap); 574 return (ret); 575} 576 577static int 578putchar(char c, void *arg) --- 193 unchanged lines hidden --- | 567 va_start(ap, fmt); 568 ret = vprintf(fmt, ap); 569 va_end(ap); 570 return (ret); 571} 572 573static int 574putchar(char c, void *arg) --- 193 unchanged lines hidden --- |