Changeset 691 for trunk/ft2232_spi.c

Timestamp:

Aug 19, 2009 3:27:58 PM (4 years ago)

Author:

hailfinger

Message:

If FT2232H SPI is not enabled, it should be compiled out completely. We
can't remove ft2232_spi.o from unconditional OBJS yet due to our
makefile structure (make features), but this patch adds #ifdefs around
all FT2232H code, so the net effect is the same.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Stefan Reinauer <stepan@…>

File:

• trunk/ft2232_spi.c (modified) (3 diffs)

trunk/ft2232_spi.c

@@ -18 +18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+
+#if FT2232_SPI_SUPPORT == 1
 
 #include <stdio.h>
@@ -26 +28 @@
 #include "flash.h"
 #include "spi.h"
-
-#if FT2232_SPI_SUPPORT == 1
-
 #include <ftdi.h>
 
@@ -298 +297 @@
 }
 
-#else
-int ft2232_spi_init(void)
-{
-        fprintf(stderr, "FT2232 SPI support was not compiled in\n");
-        exit(1);
-}
-
-int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt,
-                const unsigned char *writearr, unsigned char *readarr)
-{
-        fprintf(stderr, "FT2232 SPI support was not compiled in\n");
-        exit(1);
-}
-
-int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len)
-{
-        fprintf(stderr, "FT2232 SPI support was not compiled in\n");
-        exit(1);
-}
-
-int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf)
-{
-        fprintf(stderr, "FT2232 SPI support was not compiled in\n");
-        exit(1);
-}
 #endif