Author: hailfinger Date: Tue Jun 22 01:20:15 2010 New Revision: 1057 URL: http://flashrom.org/trac/coreboot/changeset/1057
Log: Kill unneeded #include wherever possible.
Tested on Linux, FreeBSD, NetBSD, OpenBSD, DOS. Thanks to Jonathan A. Kollasch and Idwer Vollering for testing.
Signed-off-by: Carl-Daniel Hailfinger c-d.hailfinger.devel.2006@gmx.net Acked-by: Idwer Vollering vidwer+lists.flashrom@gmail.com
Modified: trunk/chipset_enable.c trunk/hwaccess.c trunk/internal.c trunk/physmap.c
Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Mon Jun 21 18:12:22 2010 (r1056) +++ trunk/chipset_enable.c Tue Jun 22 01:20:15 2010 (r1057) @@ -27,12 +27,10 @@
#define _LARGEFILE64_SOURCE
-#include <unistd.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> +#include <unistd.h> #include "flash.h"
#if defined(__i386__) || defined(__x86_64__)
Modified: trunk/hwaccess.c ============================================================================== --- trunk/hwaccess.c Mon Jun 21 18:12:22 2010 (r1056) +++ trunk/hwaccess.c Tue Jun 22 01:20:15 2010 (r1057) @@ -21,10 +21,12 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> +#include <sys/types.h> +#if !defined (__DJGPP__) #include <unistd.h> #include <fcntl.h> -#include <sys/types.h> #include <errno.h> +#endif #include "flash.h"
#if defined(__i386__) || defined(__x86_64__) @@ -42,12 +44,14 @@
void get_io_perms(void) { +#if defined(__DJGPP__) + /* We have full permissions by default. */ + return; +#else #if defined (__sun) && (defined(__i386) || defined(__amd64)) if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0) { #elif defined(__FreeBSD__) || defined (__DragonFly__) if ((io_fd = open("/dev/io", O_RDWR)) < 0) { -#elif __DJGPP__ - if (0) { #else if (iopl(3) != 0) { #endif @@ -55,6 +59,7 @@ "You need to be root.\n", strerror(errno)); exit(1); } +#endif }
void release_io_perms(void)
Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Mon Jun 21 18:12:22 2010 (r1056) +++ trunk/internal.c Tue Jun 22 01:20:15 2010 (r1057) @@ -21,10 +21,7 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h"
#if NEED_PCI == 1
Modified: trunk/physmap.c ============================================================================== --- trunk/physmap.c Mon Jun 21 18:12:22 2010 (r1056) +++ trunk/physmap.c Tue Jun 22 01:20:15 2010 (r1057) @@ -23,13 +23,17 @@ #include <unistd.h> #include <stdio.h> #include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> #include <stdlib.h> #include <string.h> -#include <errno.h> #include "flash.h"
+/* Do we need any file access or ioctl for physmap or MSR? */ +#if !defined(__DJGPP__) +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> +#endif + #ifdef __DJGPP__ #include <dpmi.h> #include <sys/nearptr.h>