diff options
| -rw-r--r-- | sys/arch/alpha/stand/OSFpal.c | 10 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/boot/boot.c | 15 | ||||
| -rw-r--r-- | sys/arch/alpha/stand/loadfile.c | 5 |
3 files changed, 14 insertions, 16 deletions
diff --git a/sys/arch/alpha/stand/OSFpal.c b/sys/arch/alpha/stand/OSFpal.c index 5a69e70d125..48aae25998a 100644 --- a/sys/arch/alpha/stand/OSFpal.c +++ b/sys/arch/alpha/stand/OSFpal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: OSFpal.c,v 1.5 1996/11/27 19:54:45 niklas Exp $ */ +/* $OpenBSD: OSFpal.c,v 1.6 2001/05/16 00:38:15 deraadt Exp $ */ /* $NetBSD: OSFpal.c,v 1.4 1996/10/13 03:00:24 christos Exp $ */ /* @@ -46,10 +46,10 @@ OSFpal() offset = r->rpb_pcs_size * cpu_number(); p = (struct pcs *)((u_int8_t *)r + r->rpb_pcs_off + offset); - printf("VMS PAL revision: 0x%lx\n", - p->pcs_palrevisions[PALvar_OpenVMS]); - printf("OSF PAL rev: 0x%lx\n", p->pcs_palrevisions[PALvar_OSF1]); + printf("VMS PAL rev: 0x%lx, OSF PAL rev: 0x%lx\n", + p->pcs_palrevisions[PALvar_OpenVMS], + p->pcs_palrevisions[PALvar_OSF1]); (void)switch_palcode(); - printf("Switch to OSF PAL code succeeded.\n"); + printf("Switched to OSF PAL.\n"); } diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c index 315d862d10e..5210fadcd7b 100644 --- a/sys/arch/alpha/stand/boot/boot.c +++ b/sys/arch/alpha/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.12 2000/11/08 16:01:25 art Exp $ */ +/* $OpenBSD: boot.c,v 1.13 2001/05/16 00:38:16 deraadt Exp $ */ /* $NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $ */ /* @@ -87,10 +87,8 @@ main() init_prom_calls(); /* print a banner */ - printf("\n"); - printf("%s, Revision %s\n", bootprog_name, bootprog_rev); - printf("(%s, %s)\n", bootprog_maker, bootprog_date); - printf("\n"); + printf("%s, Revision %s (%s, %s)\n", bootprog_name, bootprog_rev, + bootprog_maker, bootprog_date); /* switch to OSF pal code. */ OSFpal(); @@ -101,8 +99,7 @@ main() prom_getenv(PROM_E_BOOTED_OSFLAGS, boot_flags, sizeof(boot_flags)); if (boot_file[0] != 0) - (void)printf("Boot file: %s\n", boot_file); - (void)printf("Boot flags: %s\n", boot_flags); + (void)printf("Boot file: %s %s\n", boot_file, boot_flags); if (boot_file[0] != '\0') win = (loadfile(name = boot_file, &entry) == 0); @@ -133,8 +130,8 @@ main() (void)printf("Entering %s at 0x%lx...\n", name, entry); (*(void (*)(u_int64_t, u_int64_t, u_int64_t, void *, u_int64_t, - u_int64_t))entry)(ffp_save, ptbr_save, BOOTINFO_MAGIC, - &bootinfo_v1, 1, 0); + u_int64_t))entry)(ffp_save, ptbr_save, BOOTINFO_MAGIC, + &bootinfo_v1, 1, 0); fail: (void)printf("Boot failed! Halting...\n"); diff --git a/sys/arch/alpha/stand/loadfile.c b/sys/arch/alpha/stand/loadfile.c index 18b629633a2..4e46eb872a4 100644 --- a/sys/arch/alpha/stand/loadfile.c +++ b/sys/arch/alpha/stand/loadfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loadfile.c,v 1.10 2001/01/16 15:34:22 art Exp $ */ +/* $OpenBSD: loadfile.c,v 1.11 2001/05/16 00:38:15 deraadt Exp $ */ /* $NetBSD: loadfile.c,v 1.3 1997/04/06 08:40:59 cgd Exp $ */ /* @@ -321,7 +321,8 @@ elf_exec(fd, elf, entryp) printf("lseek symbols: %s\n", strerror(errno)); return (1); } - if (read(fd, (void *)ffp_save, shp[i].sh_size) != shp[i].sh_size) { + if (read(fd, (void *)ffp_save, shp[i].sh_size) != + shp[i].sh_size) { printf("read symbols: %s\n", strerror(errno)); return (1); } |