Changeset 1021

Timestamp:

05/31/10 00:24:40 (20 months 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@…>

Location:

trunk

Files:

• 82802ab.c (modified) (1 diff)
• board_enable.c (modified) (3 diffs)
• cbtable.c (modified) (1 diff)
• chipset_enable.c (modified) (1 diff)
• cli_classic.c (modified) (1 diff)
• dediprog.c (modified) (1 diff)
• drkaiser.c (modified) (1 diff)
• flash.h (modified) (3 diffs)
• flashrom.c (modified) (1 diff)
• hwaccess.c (modified) (1 diff)
• layout.c (modified) (9 diffs)
• nic3com.c (modified) (1 diff)
• nicrealtek.c (modified) (1 diff)
• physmap.c (modified) (3 diffs)
• print.c (modified) (1 diff)
• programmer.c (modified) (1 diff)
• satasii.c (modified) (1 diff)
• sb600spi.c (modified) (1 diff)
• sharplhf00l04.c (modified) (1 diff)
• spi.c (modified) (1 diff)
• sst49lfxxxc.c (modified) (1 diff)
• sst_fwhub.c (modified) (1 diff)
• stm50flw0x0x.c (modified) (1 diff)
• udelay.c (modified) (3 diffs)
• wbsio_spi.c (modified) (1 diff)

trunk/82802ab.c

@@ -27 +27 @@
  */
 
-#include <string.h>
-#include <stdlib.h>
 #include "flash.h"
 #include "chipdrivers.h"

trunk/board_enable.c

@@ -26 +26 @@
 
 #include <string.h>
-#include <fcntl.h>
 #include "flash.h"
 
@@ -108 +107 @@
         id = sio_read(port, 0x20);
         if (id != 0x44) {
-                fprintf(stderr, "\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n",
-                        name, id);
+                msg_perr("\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n",
+                         name, id);
                 OUTB(0xAA, port); /* leave conf mode */
                 return -1;
@@ -119 +118 @@
         if ((val & 0x1B) != 0x10)       /* output, no invert, GPIO */
         {
-                fprintf(stderr, "\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n",
-                        name, val);
+                msg_perr("\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n",
+                         name, val);
                 OUTB(0xAA, port);
                 return -1;

trunk/cbtable.c

@@ -23 +23 @@
  */
 
+#include <unistd.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>

trunk/chipset_enable.c

@@ -28 +28 @@
 #define _LARGEFILE64_SOURCE
 
+#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>

trunk/cli_classic.c

@@ -22 +22 @@
  */
 
+#include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>

trunk/dediprog.c

@@ -19 +19 @@
 
 #include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <sys/types.h>
 #include <usb.h>
 #include "flash.h"

trunk/drkaiser.c

@@ -20 +20 @@
 
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "flash.h"
 

trunk/flash.h

@@ -25 +25 @@
 #define __FLASH_H__ 1
 
-#include <unistd.h>
 #include <stdint.h>
-#include <stdio.h>
 #include "hwaccess.h"
 #ifdef _WIN32
@@ -33 +31 @@
 #undef min
 #undef max
+#endif
+
+#ifndef NULL
+#define NULL ((void *) 0)
 #endif
 
@@ -557 +559 @@
 extern const char *flashrom_version;
 extern char *chip_to_probe;
-#define printf_debug(x...) { if (verbose) printf(x); }
 void map_flash_registers(struct flashchip *flash);
 int read_memmapped(struct flashchip *flash, uint8_t *buf, int start, int len);

trunk/flashrom.c

@@ -22 +22 @@
  */
 
+#include <stdio.h>
 #include <fcntl.h>
 #include <sys/types.h>

trunk/hwaccess.c

@@ -22 +22 @@
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>

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;

trunk/nic3com.c

@@ -22 +22 @@
 
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "flash.h"
 

trunk/nicrealtek.c

@@ -22 +22 @@
 
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include "flash.h"
 

trunk/physmap.c

@@ -21 +21 @@
  */
 
+#include <unistd.h>
+#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -311 +313 @@
 {
         char msrfilename[64];
-        memset(msrfilename, 0, 64);
-        sprintf(msrfilename, "/dev/cpu/%d/msr", cpu);
+        memset(msrfilename, 0, sizeof(msrfilename));
+        snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu);
 
         if (fd_msr != -1) {
@@ -394 +396 @@
 {
         char msrfilename[64];
-        memset(msrfilename, 0, 64);
-        sprintf(msrfilename, "/dev/cpu%d", cpu);
+        memset(msrfilename, 0, sizeof(msrfilename));
+        snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu%d", cpu);
 
         if (fd_msr != -1) {

trunk/print.c

@@ -20 +20 @@
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

trunk/programmer.c

@@ -19 +19 @@
  */
 
-#include <stdlib.h>
 #include "flash.h"
 

trunk/satasii.c

@@ -22 +22 @@
 
 #include <stdlib.h>
-#include <string.h>
 #include "flash.h"
 

trunk/sb600spi.c

@@ -24 +24 @@
 #if defined(__i386__) || defined(__x86_64__)
 
-#include <string.h>
 #include "flash.h"
 #include "chipdrivers.h"

trunk/sharplhf00l04.c

@@ -19 +19 @@
  */
 
-#include <stdlib.h>
 #include "flash.h"
 #include "chipdrivers.h"

trunk/spi.c

@@ -23 +23 @@
  */
 
-#include <string.h>
 #include "flash.h"
 #include "flashchips.h"

trunk/sst49lfxxxc.c

@@ -21 +21 @@
  */
 
-#include <stdlib.h>
 #include "flash.h"
 #include "chipdrivers.h"

trunk/sst_fwhub.c

@@ -23 +23 @@
 /* Adapted from the Intel FW hub stuff for 82802ax parts. */
 
-#include <stdlib.h>
-#include <string.h>
 #include "flash.h"
 #include "chipdrivers.h"

trunk/stm50flw0x0x.c

@@ -28 +28 @@
  */
 
-#include <string.h>
-#include <stdlib.h>
 #include "flash.h"
 #include "flashchips.h"

trunk/udelay.c

@@ -20 +20 @@
  */
 
+#include <unistd.h>
 #include <sys/time.h>
 #include <stdlib.h>
@@ -64 +65 @@
         int i, tries = 0;
 
-        printf("Calibrating delay loop... ");
+        msg_pinfo("Calibrating delay loop... ");
 
 recalibrate:
@@ -114 +115 @@
         msg_pdbg("10000 myus = %ld us, ", timeusec);
 
-        printf("OK.\n");
+        msg_pinfo("OK.\n");
 }
 

trunk/wbsio_spi.c

@@ -21 +21 @@
 #if defined(__i386__) || defined(__x86_64__)
 
-#include <string.h>
 #include "flash.h"
 #include "chipdrivers.h"