Author: stefanct Date: Tue Aug 16 14:08:22 2011 New Revision: 1414 URL: http://flashrom.org/trac/flashrom/changeset/1414
Log: 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@student.tuwien.ac.at Acked-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at
Modified: trunk/bitbang_spi.c trunk/buspirate_spi.c trunk/chipdrivers.h trunk/ft2232_spi.c trunk/ichspi.c trunk/it85spi.c trunk/jedec.c trunk/pm49fl00x.c trunk/print.c trunk/sb600spi.c trunk/sst_fwhub.c trunk/w29ee011.c trunk/w39.c
Modified: trunk/bitbang_spi.c ============================================================================== --- trunk/bitbang_spi.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/bitbang_spi.c Tue Aug 16 14:08:22 2011 (r1414) @@ -22,7 +22,6 @@ #include <stdlib.h> #include <ctype.h> #include "flash.h" -#include "chipdrivers.h" #include "programmer.h" #include "spi.h"
Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/buspirate_spi.c Tue Aug 16 14:08:22 2011 (r1414) @@ -23,7 +23,6 @@ #include <ctype.h> #include <unistd.h> #include "flash.h" -#include "chipdrivers.h" #include "programmer.h" #include "spi.h"
Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/chipdrivers.h Tue Aug 16 14:08:22 2011 (r1414) @@ -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);
Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/ft2232_spi.c Tue Aug 16 14:08:22 2011 (r1414) @@ -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>
Modified: trunk/ichspi.c ============================================================================== --- trunk/ichspi.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/ichspi.c Tue Aug 16 14:08:22 2011 (r1414) @@ -27,7 +27,6 @@
#include <string.h> #include "flash.h" -#include "chipdrivers.h" #include "programmer.h" #include "spi.h"
Modified: trunk/it85spi.c ============================================================================== --- trunk/it85spi.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/it85spi.c Tue Aug 16 14:08:22 2011 (r1414) @@ -30,7 +30,6 @@ #include <stdio.h> #include <stdlib.h> #include "flash.h" -#include "chipdrivers.h" #include "spi.h" #include "programmer.h"
Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/jedec.c Tue Aug 16 14:08:22 2011 (r1414) @@ -23,7 +23,6 @@ */
#include "flash.h" -#include "chipdrivers.h"
#define MAX_REFLASH_TRIES 0x10 #define MASK_FULL 0xffff
Modified: trunk/pm49fl00x.c ============================================================================== --- trunk/pm49fl00x.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/pm49fl00x.c Tue Aug 16 14:08:22 2011 (r1414) @@ -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)
Modified: trunk/print.c ============================================================================== --- trunk/print.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/print.c Tue Aug 16 14:08:22 2011 (r1414) @@ -23,7 +23,6 @@ #include <string.h> #include <stdlib.h> #include "flash.h" -#include "flashchips.h" #include "programmer.h"
/*
Modified: trunk/sb600spi.c ============================================================================== --- trunk/sb600spi.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/sb600spi.c Tue Aug 16 14:08:22 2011 (r1414) @@ -24,7 +24,6 @@ #if defined(__i386__) || defined(__x86_64__)
#include "flash.h" -#include "chipdrivers.h" #include "programmer.h" #include "spi.h"
Modified: trunk/sst_fwhub.c ============================================================================== --- trunk/sst_fwhub.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/sst_fwhub.c Tue Aug 16 14:08:22 2011 (r1414) @@ -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) {
Modified: trunk/w29ee011.c ============================================================================== --- trunk/w29ee011.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/w29ee011.c Tue Aug 16 14:08:22 2011 (r1414) @@ -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.
Modified: trunk/w39.c ============================================================================== --- trunk/w39.c Mon Aug 15 21:54:20 2011 (r1413) +++ trunk/w39.c Tue Aug 16 14:08:22 2011 (r1414) @@ -20,7 +20,6 @@ */
#include "flash.h" -#include "chipdrivers.h"
static int printlock_w39_fwh_block(struct flashchip *flash, int offset) {