Split spi.c into programmer and chip code Remove chipdriver.h include from flash.h

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

Corresponding to flashrom svn r914.
Signed-off-by: Sean Nelson <audiohacked@gmail.com>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

82802ab.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "flash.h"
+#include "chipdrivers.h"
 
 // I need that Berkeley bit-map printer
 void print_82802ab_status(uint8_t status)

Makefile

@@ -43,7 +43,7 @@ endif
 
 CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o sharplhf00l04.o w29ee011.o \
 	sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \
-	sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o
+	sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o
 
 LIB_OBJS = layout.o
 

bitbang_spi.c

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 
 /* Length of half a clock period in usecs */

buspirate_spi.c

@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 
 /* Change this to #define if you want to test without a serial implementation */

dediprog.c

@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <usb.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 
 #define DEFAULT_TIMEOUT 3000

flash.h

@@ -681,6 +681,4 @@ int serialport_shutdown(void);
 int serialport_write(unsigned char *buf, unsigned int writecnt);
 int serialport_read(unsigned char *buf, unsigned int readcnt);
 
-#include "chipdrivers.h"
-
 #endif				/* !__FLASH_H__ */

flashchips.c

@@ -24,6 +24,7 @@
 
 #include "flash.h"
 #include "flashchips.h"
+#include "chipdrivers.h"
 
 /**
  * List of supported flash chips.

ft2232_spi.c

@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 #include <ftdi.h>
 

ichspi.c

@@ -35,6 +35,7 @@
 
 #include <string.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 
 /* Change this to #define if you want lowlevel debugging of commands

it87spi.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 
 #define ITE_SUPERIO_PORT1	0x2e

jedec.c

@@ -23,6 +23,7 @@
  */
 
 #include "flash.h"
+#include "chipdrivers.h"
 
 #define MAX_REFLASH_TRIES 0x10
 #define MASK_FULL 0xffff

m29f400bt.c

@@ -19,6 +19,7 @@
  */
 
 #include "flash.h"
+#include "chipdrivers.h"
 
 /* WARNING! 
    This chip uses the standard JEDEC Addresses in 16-bit mode as word

pm49fl00x.c

@@ -21,6 +21,7 @@
  */
 
 #include "flash.h"
+#include "chipdrivers.h"
 
 void write_lockbits_49fl00x(chipaddr bios, int size,
 			    unsigned char bits, int block_size)

sb600spi.c

@@ -22,6 +22,7 @@
 
 #include <string.h>
 #include "flash.h"
+#include "chipdrivers.h"
 #include "spi.h"
 
 /* This struct is unused, but helps visualize the SB600 SPI BAR layout.

sharplhf00l04.c

@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include "flash.h"
+#include "chipdrivers.h"
 
 // I need that Berkeley bit-map printer
 void print_lhf00l04_status(uint8_t status)

sst28sf040.c

@@ -21,6 +21,7 @@
  */
 
 #include "flash.h"
+#include "chipdrivers.h"
 
 #define AUTO_PG_ERASE1		0x20
 #define AUTO_PG_ERASE2		0xD0

sst49lfxxxc.c

@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include "flash.h"
+#include "chipdrivers.h"
 
 #define SECTOR_ERASE		0x30
 #define BLOCK_ERASE		0x20

sst_fwhub.c

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "flash.h"
+#include "chipdrivers.h"
 
 // I need that Berkeley bit-map printer
 void print_sst_fwhub_status(uint8_t status)