--- ft2232h_2/src/jtag/ft2232.c	Thu Aug 13 13:41:49 2009
+++ trunk/src/jtag/ft2232.c	Thu Aug 13 14:11:48 2009
@@ -423,13 +423,16 @@
 	return ERROR_OK;
 }
 
-#ifdef BUILD_FT2232_HIGHSPEED
 static bool ft2232_device_is_highspeed(void)
 {
-#if BUILD_FT2232_FTD2XX == 1
+#ifdef BUILD_FT2232_HIGHSPEED
+	#if BUILD_FT2232_FTD2XX == 1
 	return (ftdi_device == FT_DEVICE_2232H) || (ftdi_device == FT_DEVICE_4232H);
-#elif BUILD_FT2232_LIBFTDI == 1
+	#elif BUILD_FT2232_LIBFTDI == 1
 	return (ftdi_device == TYPE_2232H || ftdi_device == TYPE_4232H);
+	#endif
+#else
+	return false;
 #endif
 }
 
@@ -477,7 +480,6 @@
 
 	return ERROR_OK;
 }
-#endif
 
 static int ft2232_speed(int speed)
 {
@@ -485,7 +487,6 @@
 	int retval;
 	uint32_t bytes_written;
 
-#ifdef BUILD_FT2232_HIGHSPEED
 	retval = ERROR_OK;
 	bool enable_adaptive_clocking = (RTCK_SPEED == speed);
 	if (ft2232_device_is_highspeed())
@@ -499,7 +500,7 @@
 
 	if ((enable_adaptive_clocking) || (ERROR_OK != retval))
 		return retval;
-#endif
+
 	buf[0] = 0x86;			/* command "set divisor" */
 	buf[1] = speed & 0xff;          /* valueL (0 = 6MHz, 1 = 3MHz, 2 = 2.0MHz, ...*/
 	buf[2] = (speed >> 8) & 0xff;   /* valueH */
@@ -531,7 +532,6 @@
 {
 	if (khz == 0)
 	{
-#ifdef BUILD_FT2232_HIGHSPEED
 		if (ft2232_device_is_highspeed())
 		{
 			*jtag_speed = RTCK_SPEED;
@@ -540,14 +540,12 @@
 		else
 		{
 			LOG_DEBUG("RCLK not supported");
+#ifndef BUILD_FT2232_HIGHSPEED
+			LOG_DEBUG("If you have a high-speed FTDI device, then "
+				"OpenOCD may be built with --enable-ft2232-highspeed.");
+#endif
 			return ERROR_FAIL;
 		}
-#else
-		LOG_DEBUG("RCLK not supported");
-		LOG_DEBUG("If you have a high-speed FTDI device, then "
-			"OpenOCD may be built with --enable-ft2232-highspeed.");
-		return ERROR_FAIL;
-#endif
 	}
 
 	/* Take a look in the FT2232 manual,
@@ -2151,13 +2149,11 @@
 	if (layout->init() != ERROR_OK)
 		return ERROR_JTAG_INIT_FAILED;
 
-#ifdef BUILD_FT2232_HIGHSPEED
 	if (ft2232_device_is_highspeed())
 	{
 		if (ft2232h_ft4232h_clk_divide_by_5(false) != ERROR_OK)
 			return ERROR_JTAG_INIT_FAILED;
 	}
-#endif
 
 	ft2232_speed(jtag_get_speed());