Remove unneeded inclusions of chipdrivers.h

This is related to the spi split patch as discussed in:
http://www.flashrom.org/pipermail/flashrom/2010-February/thread.html#2364
the old commit (r914) log notes:
"Some of the spi programmer drivers required chipdrivers.h, needs fixing later: it87spi.c
  ichspi.c   sb600spi.c   wbsio_spi.c   buspirate_spi.c   ft2232spi.c   bitbang_spi.c   dediprog.c"

there still remain a few cases where chipdrivers.h is needed:
dediprog.c (spi_read_chunked and spi_write_chunked)
it87spi.c (due to spi_write_enable and spi_read_status_register)
wbsio_spi.c (spi_programmer registration only)

besides that, there are also non-spi files that do not need it.
also, add flash.h to chipdrivers.h because it uses some types of it
and remove flashchips.h from print.c

Corresponding to flashrom svn r1414.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>

13 files changed, 2 insertions, 12 deletions

diff --git a/bitbang_spi.c b/bitbang_spi.c
index 4219a62c8..391fd3246 100644
--- a/bitbang_spi.c
+++ b/bitbang_spi.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/buspirate_spi.c b/buspirate_spi.c
index ff1aac486..a556185d8 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -23,7 +23,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/chipdrivers.h b/chipdrivers.h
index 92ddbea41..3f5b503e3 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -25,6 +25,8 @@
 #ifndef __CHIPDRIVERS_H__
 #define __CHIPDRIVERS_H__ 1
 
+#include "flash.h"	/* for chipaddr and flashchip */
+
 /* spi.c, should probably be in spi_chip.c */
 int probe_spi_rdid(struct flashchip *flash);
 int probe_spi_rdid4(struct flashchip *flash);
diff --git a/ft2232_spi.c b/ft2232_spi.c
index ef2449a14..8ab89fa3f 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 #include <ftdi.h>
diff --git a/ichspi.c b/ichspi.c
index 34f089199..8b4210ee3 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -27,7 +27,6 @@
 
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/it85spi.c b/it85spi.c
index f1ad22b88..75a565c5a 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -30,7 +30,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "spi.h"
 #include "programmer.h"
 
diff --git a/jedec.c b/jedec.c
index b96f5fd93..cf34bcd21 100644
--- a/jedec.c
+++ b/jedec.c
@@ -23,7 +23,6 @@
  */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 #define MAX_REFLASH_TRIES 0x10
 #define MASK_FULL 0xffff
diff --git a/pm49fl00x.c b/pm49fl00x.c
index 4136b170d..28052e5fc 100644
--- a/pm49fl00x.c
+++ b/pm49fl00x.c
@@ -21,7 +21,6 @@
  */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static void write_lockbits_49fl00x(chipaddr bios, int size,
 			    unsigned char bits, int block_size)
diff --git a/print.c b/print.c
index 21b457092..c25cb3e22 100644
--- a/print.c
+++ b/print.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "flash.h"
-#include "flashchips.h"
 #include "programmer.h"
 
 /*
diff --git a/sb600spi.c b/sb600spi.c
index 37aac3b62..5ad578216 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -24,7 +24,6 @@
 #if defined(__i386__) || defined(__x86_64__)
 
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
diff --git a/sst_fwhub.c b/sst_fwhub.c
index 65bd2b36b..a11cccb9e 100644
--- a/sst_fwhub.c
+++ b/sst_fwhub.c
@@ -23,7 +23,6 @@
 /* Adapted from the Intel FW hub stuff for 82802ax parts. */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static int check_sst_fwhub_block_lock(struct flashchip *flash, int offset)
 {
diff --git a/w29ee011.c b/w29ee011.c
index 21fb6f22f..ee5aa44d5 100644
--- a/w29ee011.c
+++ b/w29ee011.c
@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
 
 /* According to the Winbond W29EE011, W29EE012, W29C010M, W29C011A
  * datasheets this is the only valid probe function for those chips.
diff --git a/w39.c b/w39.c
index 920a43f51..2e9aa4f9a 100644
--- a/w39.c
+++ b/w39.c
@@ -20,7 +20,6 @@
  */
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static int printlock_w39_fwh_block(struct flashchip *flash, int offset)
 {