Changeset 1414

Timestamp:

08/16/11 14:08:22 (9 months ago)

Author:

stefanct

Message:

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

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Stefan Tauner <stefan.tauner@…>

Location:

trunk

Files:

• bitbang_spi.c (modified) (1 diff)
• buspirate_spi.c (modified) (1 diff)
• chipdrivers.h (modified) (1 diff)
• ft2232_spi.c (modified) (1 diff)
• ichspi.c (modified) (1 diff)
• it85spi.c (modified) (1 diff)
• jedec.c (modified) (1 diff)
• pm49fl00x.c (modified) (1 diff)
• print.c (modified) (1 diff)
• sb600spi.c (modified) (1 diff)
• sst_fwhub.c (modified) (1 diff)
• w29ee011.c (modified) (1 diff)
• w39.c (modified) (1 diff)

trunk/bitbang_spi.c

@@ -23 +23 @@
 #include <ctype.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"

trunk/buspirate_spi.c

@@ -24 +24 @@
 #include <unistd.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"

trunk/chipdrivers.h

@@ -25 +25 @@
 #ifndef __CHIPDRIVERS_H__
 #define __CHIPDRIVERS_H__ 1
+
+#include "flash.h"      /* for chipaddr and flashchip */
 
 /* spi.c, should probably be in spi_chip.c */

trunk/ft2232_spi.c

@@ -26 +26 @@
 #include <ctype.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"

trunk/ichspi.c

@@ -28 +28 @@
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"

trunk/it85spi.c

@@ -31 +31 @@
 #include <stdlib.h>
 #include "flash.h"
-#include "chipdrivers.h"
 #include "spi.h"
 #include "programmer.h"

trunk/jedec.c

@@ -24 +24 @@
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 #define MAX_REFLASH_TRIES 0x10

trunk/pm49fl00x.c

@@ -22 +22 @@
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static void write_lockbits_49fl00x(chipaddr bios, int size,

trunk/print.c

@@ -24 +24 @@
 #include <stdlib.h>
 #include "flash.h"
-#include "flashchips.h"
 #include "programmer.h"
 

trunk/sb600spi.c

@@ -25 +25 @@
 
 #include "flash.h"
-#include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"

trunk/sst_fwhub.c

@@ -24 +24 @@
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static int check_sst_fwhub_block_lock(struct flashchip *flash, int offset)

trunk/w29ee011.c

@@ -21 +21 @@
 #include <string.h>
 #include "flash.h"
-#include "chipdrivers.h"
 
 /* According to the Winbond W29EE011, W29EE012, W29C010M, W29C011A

trunk/w39.c

@@ -21 +21 @@
 
 #include "flash.h"
-#include "chipdrivers.h"
 
 static int printlock_w39_fwh_block(struct flashchip *flash, int offset)