Changeset 1021 for trunk/layout.c

Timestamp:

05/31/10 00:24:40 (2 years ago)

Author:

hailfinger

Message:

Remove unneeded #include statements completely.

unistd.h was only used to get a definition of NULL in all files. Add our
own NULL #define and remove unistd.h from flash.h
stdio.h has no place in flash.h, it should be included only in files
which really need it.
Add #include statements in individual .c files where needed.

Replace a few printf with msg_* to eliminate the need for stdio.h.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/layout.c (modified) (9 diffs)

trunk/layout.c

@@ -19 +19 @@
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -74 +75 @@
         if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size ||
             mb_part_offset > size || mb_vendor_offset > size) {
-                printf("Flash image seems to be a legacy BIOS. Disabling checks.\n");
+                msg_pinfo("Flash image seems to be a legacy BIOS. Disabling checks.\n");
                 return 0;
         }
@@ -82 +83 @@
         if (!isprint((unsigned char)*mb_part) ||
             !isprint((unsigned char)*mb_vendor)) {
-                printf("Flash image seems to have garbage in the ID location."
+                msg_pinfo("Flash image seems to have garbage in the ID location."
                        " Disabling checks.\n");
                 return 0;
         }
 
-        printf_debug("coreboot last image size "
+        msg_pdbg("coreboot last image size "
                      "(not ROM size) is %d bytes.\n", *walk);
 
         mainboard_part = strdup(mb_part);
         mainboard_vendor = strdup(mb_vendor);
-        printf_debug("Manufacturer: %s\n", mainboard_vendor);
-        printf_debug("Mainboard ID: %s\n", mainboard_part);
+        msg_pdbg("Manufacturer: %s\n", mainboard_vendor);
+        msg_pdbg("Mainboard ID: %s\n", mainboard_part);
 
         /*
@@ -100 +101 @@
          */
         if (!lb_vendor || !lb_part) {
-                printf("Note: If the following flash access fails, "
+                msg_pinfo("Note: If the following flash access fails, "
                        "try -m <vendor>:<mainboard>.\n");
                 return 0;
@@ -110 +111 @@
         if (!strcasecmp(mainboard_vendor, lb_vendor) &&
             !strcasecmp(mainboard_part, lb_part)) {
-                printf_debug("This firmware image matches this mainboard.\n");
+                msg_pdbg("This firmware image matches this mainboard.\n");
         } else {
                 if (force_boardmismatch) {
-                        printf("WARNING: This firmware image does not "
+                        msg_pinfo("WARNING: This firmware image does not "
                                "seem to fit to this machine - forcing it.\n");
                 } else {
-                        printf("ERROR: Your firmware image (%s:%s) does not "
+                        msg_pinfo("ERROR: Your firmware image (%s:%s) does not "
                                "appear to\n       be correct for the detected "
                                "mainboard (%s:%s)\n\nOverride with -p internal:"
@@ -142 +143 @@
 
         if (!romlayout) {
-                fprintf(stderr, "ERROR: Could not open ROM layout (%s).\n",
+                msg_gerr("ERROR: Could not open ROM layout (%s).\n",
                         name);
                 return -1;
@@ -160 +161 @@
                 tstr2 = strtok(NULL, ":");
                 if (!tstr1 || !tstr2) {
-                        fprintf(stderr, "Error parsing layout file.\n");
+                        msg_gerr("Error parsing layout file.\n");
                         fclose(romlayout);
                         return 1;
@@ -171 +172 @@
 
         for (i = 0; i < romimages; i++) {
-                printf_debug("romlayout %08x - %08x named %s\n",
+                msg_gdbg("romlayout %08x - %08x named %s\n",
                              rom_entries[i].start,
                              rom_entries[i].end, rom_entries[i].name);
@@ -188 +189 @@
                 return -1;
 
-        printf("Looking for \"%s\"... ", name);
+        msg_ginfo("Looking for \"%s\"... ", name);
 
         for (i = 0; i < romimages; i++) {
                 if (!strcmp(rom_entries[i].name, name)) {
                         rom_entries[i].included = 1;
-                        printf("found.\n");
+                        msg_ginfo("found.\n");
                         return i;
                 }
         }
-        printf("not found.\n"); // Not found. Error.
+        msg_ginfo("not found.\n");      // Not found. Error.
 
         return -1;