Module Name: src Committed By: isaki Date: Fri Apr 6 09:38:40 UTC 2012
Modified Files: src/sys/arch/x68k/stand/mboot: mboot.c Log Message: Print my progname in error messages. It makes easy to find who displayed it. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/mboot/mboot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/x68k/stand/mboot/mboot.c diff -u src/sys/arch/x68k/stand/mboot/mboot.c:1.10 src/sys/arch/x68k/stand/mboot/mboot.c:1.11 --- src/sys/arch/x68k/stand/mboot/mboot.c:1.10 Thu Apr 5 12:01:36 2012 +++ src/sys/arch/x68k/stand/mboot/mboot.c Fri Apr 6 09:38:40 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mboot.c,v 1.10 2012/04/05 12:01:36 isaki Exp $ */ +/* $NetBSD: mboot.c,v 1.11 2012/04/06 09:38:40 isaki Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -58,12 +58,12 @@ bootmain(int scsiid) { long *label = (void*) 0x3000; if (IOCS_S_READ(0, 1, scsiid, size, label) < 0) { - IOCS_B_PRINT("Error in reading.\r\n"); + IOCS_B_PRINT(BOOT ": Error in reading.\r\n"); return 0; } if (label[0] != 0x58363853 || label[1] != 0x43534931) { - IOCS_B_PRINT("Invalid disk.\r\n"); + IOCS_B_PRINT(BOOT ": Invalid disk.\r\n"); return 0; } } @@ -74,12 +74,12 @@ bootmain(int scsiid) unsigned char *t; if (IOCS_S_READ(2<<(2-size), size?2:1, scsiid, size, label) < 0) { - IOCS_B_PRINT("Error in reading.\r\n"); + IOCS_B_PRINT(BOOT ": Error in reading.\r\n"); return 0; } t = label->dosparts[0].dp_typname; if (t[0] != 'X' || t[1] != '6' || t[2] != '8' || t[3] != 'K') { - IOCS_B_PRINT("Invalid disk.\r\n"); + IOCS_B_PRINT(BOOT ": Invalid disk.\r\n"); return 0; } @@ -108,11 +108,11 @@ bootmain(int scsiid) size, (void*) 0x2400); if (r < 0) { - IOCS_B_PRINT ("Error in reading.\r\n"); + IOCS_B_PRINT(BOOT ": Error in reading.\r\n"); return 0; } if (*((char*) 0x2400) != 0x60) { - IOCS_B_PRINT("Invalid disk.\r\n"); + IOCS_B_PRINT(BOOT ": Invalid disk.\r\n"); return 0; } __asm volatile ("movl %0,%%d4\n\t" @@ -123,7 +123,7 @@ bootmain(int scsiid) : "d4"); return 0; } - IOCS_B_PRINT ("No bootable partition.\r\n"); + IOCS_B_PRINT(BOOT ": No bootable partition.\r\n"); return 0; }