summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-06-21 23:20:15 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-06-21 23:20:15 +0000
commitdcef67e46875f9600c39716c2ac8b843bb86429c (patch)
tree21e5b1ed74666095913b80cbb08fb0a822bf14ba
parentc96a8bd458a985fdc2ffe299482dfb353728dbd1 (diff)
downloadast2050-flashrom-dcef67e46875f9600c39716c2ac8b843bb86429c.zip
ast2050-flashrom-dcef67e46875f9600c39716c2ac8b843bb86429c.tar.gz
Kill unneeded #include wherever possible
Tested on Linux, FreeBSD, NetBSD, OpenBSD, DOS. Thanks to Jonathan A. Kollasch and Idwer Vollering for testing. Corresponding to flashrom svn r1057. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Idwer Vollering <vidwer+lists.flashrom@gmail.com>
-rw-r--r--chipset_enable.c4
-rw-r--r--hwaccess.c11
-rw-r--r--internal.c3
-rw-r--r--physmap.c10
4 files changed, 16 insertions, 12 deletions
diff --git a/chipset_enable.c b/chipset_enable.c
index 02d139e..d124291 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -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__)
diff --git a/hwaccess.c b/hwaccess.c
index f754166..85e13ed 100644
--- a/hwaccess.c
+++ b/hwaccess.c
@@ -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 @@ int io_fd;
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 @@ void get_io_perms(void)
"You need to be root.\n", strerror(errno));
exit(1);
}
+#endif
}
void release_io_perms(void)
diff --git a/internal.c b/internal.c
index 9619618..8230926 100644
--- a/internal.c
+++ b/internal.c
@@ -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
diff --git a/physmap.c b/physmap.c
index 7642938..c65df30 100644
--- a/physmap.c
+++ b/physmap.c
@@ -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>
OpenPOWER on IntegriCloud