Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/stand/mboot Print my progname in error messages.



details:   https://anonhg.NetBSD.org/src/rev/0ed49b92385c
branches:  trunk
changeset: 778597:0ed49b92385c
user:      isaki <isaki%NetBSD.org@localhost>
date:      Fri Apr 06 09:38:40 2012 +0000

description:
Print my progname in error messages.
It makes easy to find who displayed it.

diffstat:

 sys/arch/x68k/stand/mboot/mboot.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r c55183a054b8 -r 0ed49b92385c sys/arch/x68k/stand/mboot/mboot.c
--- a/sys/arch/x68k/stand/mboot/mboot.c Fri Apr 06 09:21:39 2012 +0000
+++ b/sys/arch/x68k/stand/mboot/mboot.c Fri Apr 06 09:38:40 2012 +0000
@@ -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 @@
        {
                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 @@
                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 @@
                                                   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 @@
                                      : "d4");
                        return 0;
                }
-               IOCS_B_PRINT ("No bootable partition.\r\n");
+               IOCS_B_PRINT(BOOT ": No bootable partition.\r\n");
                return 0;
        }
 



Home | Main Index | Thread Index | Old Index