summaryrefslogtreecommitdiffstats
path: root/programmer.h
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-08-09 23:34:41 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-08-09 23:34:41 +0000
commit78a5798705bd92036a29516593d151cafb99c2fe (patch)
treeadbb52deb6d42ab9f32ed347d18ff42384190c47 /programmer.h
parent7cd532fb0c2d1eea3e1d405de3e247f3710e82b2 (diff)
downloadflashrom-78a5798705bd92036a29516593d151cafb99c2fe.zip
flashrom-78a5798705bd92036a29516593d151cafb99c2fe.tar.gz
Portability fixes and cleanups
Move Mac OS X IOKit/DirectHW availability checks in the Makefile from compiler check to pciutils check. Print the compiler error messages for feature detection. Add DOS libpci in the Makefile includes only if a PCI-based programmer was requested. Restrict mmap usage in ich_descriptors_tool to Unix style systems. Build ich_descriptors_tool with the correct .exe extension on DOS/Windows. Build ich_descriptors_tool by default on x86. (Patch by Stefan Tauner) Print the Windows version instead of "unknown machine" on Windows. Don't #define our own __DARWIN__, use the standard OS X detection method. Update the README. Add more generated files to svn:ignore Corresponding to flashrom svn r1567. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'programmer.h')
-rw-r--r--programmer.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/programmer.h b/programmer.h
index 5109ed9..723374d 100644
--- a/programmer.h
+++ b/programmer.h
@@ -240,6 +240,7 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data);
/* print.c */
#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1
+/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */
void print_supported_pcidevs(const struct pcidev_status *devs);
#endif
@@ -637,7 +638,7 @@ void serprog_delay(int usecs);
#endif
/* serial.c */
-#if _WIN32
+#ifdef _WIN32
typedef HANDLE fdtype;
#else
typedef int fdtype;
OpenPOWER on IntegriCloud