Refactor a bit so that a make install also does an include/urjtag install. Problem: I don't know (yet) how to handle config.h, even though it is included in sysdep.h

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1547 b68d4a1b-bc3d-0410-92ed-d4ac073336b7

urjtag/Makefile.am

@@ -34,9 +34,6 @@ SUBDIRS = \
 DIST_SUBDIRS = \
 	$(SUBDIRS)
 
-noinst_HEADERS = \
-	sysdep.h
-
 EXTRA_DIST = \
 	Makefile.rules \
 	UrJTAG.nsi \

urjtag/Makefile.rules

@@ -22,8 +22,12 @@
 # Written by Marcel Telka <marcel@telka.sk>, 2003, 2004.
 #
 
+LINT_FLAGS	=
+LINT_FLAGS	+= -warnposixheaders
+LINT_FLAGS	+= +boolint
+
 lint:
-	-test "$(SOURCES)" && splint $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SOURCES)
+	-test "$(SOURCES)" && splint $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(SOURCES)
 	test -z "$(SUBDIRS)" || $(MAKE) RECURSIVE_TARGETS=lint-recursive $(AM_MAKEFLAGS) lint-recursive
 
 lint-am: Makefile @MAINTAINER_MODE_TRUE@ $(top_srcdir)/Makefile.rules

urjtag/autogen.sh

@@ -33,4 +33,4 @@ else
 	exit 1
 fi
 
-./configure --enable-maintainer-mode
+./configure --enable-maintainer-mode "$@"

urjtag/include/urjtag/Makefile.am

@@ -23,32 +23,36 @@
 
 include $(top_srcdir)/Makefile.rules
 
-noinst_HEADERS = \
+pkginclude_HEADERS = \
+	bitmask.h \
 	bsbit.h \
 	bsdl.h \
 	bsdl_mode.h \
-	bitmask.h \
+	bssignal.h \
 	bus.h \
 	bus_driver.h \
 	cable.h \
 	chain.h \
-	data_register.h \
 	cmd.h \
+	data_register.h \
+	error.h \
+	fclock.h \
 	flash.h \
 	gettext.h \
+	jim.h \
+	jim/some_cpu.h \
+	jtag.h \
 	part_instruction.h \
 	parport.h \
 	part.h \
+	pod.h \
 	tap_register.h \
-	bssignal.h \
 	tap_state.h \
-	jtag.h \
 	tap.h \
-	fclock.h \
-	jim.h \
-	jim/some_cpu.h \
-	pod.h \
 	svf.h \
+	sysdep.h \
+	types.h \
+	urjtag.h \
 	usbconn.h \
 	usbconn/libftdx.h \
 	usbconn/libusb.h \

urjtag/include/urjtag/xpcu.h

@@ -33,7 +33,7 @@
 #define URJ_XPCU_PID 0x0008
 
 struct usb_device *find_xpcu (void);
-int xpcu_init ();
+int xpcu_init (void);
 int xpcu_close (struct usb_dev_handle *xpcu);
 int xpcu_request_28 (struct usb_dev_handle *xpcu, int value);
 int xpcu_raise_ioa5 (struct usb_dev_handle *xpcu);

urjtag/src/apps/jtag/jtag.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #ifndef SVN_REVISION
 #define SVN_REVISION "0"

urjtag/src/bsdl/bsdl.c

@@ -31,7 +31,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <urjtag/chain.h>
 #include <urjtag/part.h>

urjtag/src/bus/au1500.c

@@ -27,7 +27,7 @@
  */
 
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <string.h>
 #include <stdint.h>

urjtag/src/bus/avr32.c

@@ -25,7 +25,7 @@
  *     AVR(R)32 32-Bit Microcontroller", Rev. 32003K-AVR32-10/07
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/bcm1250.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <string.h>
 #include <stdint.h>

urjtag/src/bus/bf533_ezkit.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/bf533_stamp.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/bf537_stamp.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/bf548_ezkit.c

@@ -22,7 +22,7 @@
  * Written by Jie Zhang <jie.zhang@analog.com>, 2008.
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/bf561_ezkit.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/bscoach.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/buses.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/bus/ejtag.c

@@ -27,7 +27,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/ejtag_dma.c

@@ -34,7 +34,7 @@
  */
 
 //#define PRINT_DATA_DEBUG 1
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/fjmem.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/generic_bus.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 

urjtag/src/bus/h7202.c

@@ -23,7 +23,7 @@
  *
  */
 
-//#include "sysdep.h"
+//#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/ixp425.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/jopcyc.c

@@ -54,7 +54,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/lh7a400.c

@@ -32,7 +32,7 @@
  *        - use only to access flash devices
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/mpc5200.c

@@ -27,7 +27,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/mpc824x.c

@@ -27,7 +27,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/ppc405ep.c

@@ -20,7 +20,7 @@
  * Modified by Wojtek Kaniewski <wojtekka@toxygen.net>, 2004.
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/ppc440gx_ebc8.c

@@ -19,7 +19,7 @@
  * Written by Marcel Telka <marcel@telka.sk>, 2002, 2003.
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/prototype.c

@@ -23,7 +23,7 @@
  * Modified from ppc405ep.c by Detrick Martin <jtag@detrickmartin.net>, 2008.
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/pxa2x0.c

@@ -30,7 +30,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/readmem.c

@@ -28,7 +28,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <string.h>

urjtag/src/bus/s3c4510x.c

@@ -52,7 +52,7 @@
 =============================================================================*/
 
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/sa1110.c

@@ -26,7 +26,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/sh7727.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/bus/sh7750r.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/bus/sh7751r.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/bus/sharc21065l.c

@@ -27,7 +27,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/slsup3.c

@@ -26,7 +26,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/tx4925.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/bus/writemem.c

@@ -21,7 +21,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <string.h>

urjtag/src/bus/zefant-xs3.c

@@ -54,7 +54,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdint.h>

urjtag/src/cmd/cmd_addpart.c

@@ -20,7 +20,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_bit.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stddef.h>
 #include <stdio.h>

urjtag/src/cmd/cmd_bsdl.c

@@ -23,7 +23,7 @@
  */
 
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_bus.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_cable.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_cmd.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_debug.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_detect.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_detectflash.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 

urjtag/src/cmd/cmd_discovery.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 

urjtag/src/cmd/cmd_dr.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_endian.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_eraseflash.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdint.h>

urjtag/src/cmd/cmd_flashmem.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdint.h>

urjtag/src/cmd/cmd_frequency.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 

urjtag/src/cmd/cmd_get.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_help.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_idcode.c

@@ -21,7 +21,7 @@
  * Written by Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>, 2008.
  *
  */
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 

urjtag/src/cmd/cmd_include.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <ctype.h>
 #include <stdio.h>

urjtag/src/cmd/cmd_initbus.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_instruction.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_parse.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_part.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_peekpoke.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdint.h>

urjtag/src/cmd/cmd_pod.c

@@ -24,7 +24,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_print.c

@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdio.h>

urjtag/src/cmd/cmd_quit.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 

urjtag/src/cmd/cmd_readmem.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdint.h>

urjtag/src/cmd/cmd_register.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_reset.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_salias.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_scan.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_set.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_shell.c

@@ -22,7 +22,7 @@
  * shell.c added by djf
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <sys/types.h>
 #include <unistd.h>

urjtag/src/cmd/cmd_shift.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_signal.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/cmd/cmd_svf.c

@@ -23,7 +23,7 @@
  */
 
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdio.h>

urjtag/src/cmd/cmd_test.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <string.h>

urjtag/src/cmd/cmd_usleep.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <unistd.h>
 

urjtag/src/cmd/cmd_writemem.c

@@ -20,7 +20,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdint.h>

urjtag/src/flash/amd.c

@@ -32,13 +32,13 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
+#include <unistd.h>     /* usleep */
 
 #include <urjtag/flash.h>
 #include <urjtag/bus.h>
@@ -48,20 +48,6 @@
 
 static int dbg = 0;
 
-static int amd_flash_erase_block (urj_flash_cfi_array_t *cfi_array,
-                                  uint32_t adr);
-static int amd_flash_unlock_block (urj_flash_cfi_array_t *cfi_array,
-                                   uint32_t adr);
-static int amd_flash_program_single (urj_flash_cfi_array_t *cfi_array,
-                                     uint32_t adr, uint32_t data);
-static int amd_flash_program_buffer (urj_flash_cfi_array_t *cfi_array,
-                                     uint32_t adr, uint32_t *buffer, int count);
-static int amd_flash_program (urj_flash_cfi_array_t *cfi_array,
-                              uint32_t adr, uint32_t *buffer, int count);
-static int amd_flash_program32 (urj_flash_cfi_array_t *cfi_array,
-                                uint32_t adr, uint32_t *buffer, int count);
-static void amd_flash_read_array (urj_flash_cfi_array_t *cfi_array);
-
 /* The code below assumes a connection of the flash chip address LSB (A0)
  * to A0, A1 or A2 of the byte-addressed CPU bus dependent on the bus width.
  *
@@ -87,8 +73,7 @@ amd_flash_address_shift (urj_flash_cfi_array_t *cfi_array)
 
     /* else: cfi_array->bus_width is 2 (16 bit) or 1 (8 bit): */
 
-    switch (cfi_array->cfi_chips[0]->cfi.device_geometry.
-            device_interface)
+    switch (cfi_array->cfi_chips[0]->cfi.device_geometry.device_interface)
     {
     case CFI_INTERFACE_X8_X16: /* regardless whether 8 or 16 bit mode */
     case CFI_INTERFACE_X16:    /* native */
@@ -114,8 +99,8 @@ amd_flash_autodetect32 (urj_flash_cfi_array_t *cfi_array)
 {
     if (cfi_array->bus_width != 4)
         return 0;
-    return (cfi_array->cfi_chips[0]->cfi.identification_string.
-            pri_id_code == CFI_VENDOR_AMD_SCS);
+    return (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code
+            == CFI_VENDOR_AMD_SCS);
 }
 
 static int
@@ -123,8 +108,8 @@ amd_flash_autodetect16 (urj_flash_cfi_array_t *cfi_array)
 {
     if (cfi_array->bus_width != 2)
         return 0;
-    return (cfi_array->cfi_chips[0]->cfi.identification_string.
-            pri_id_code == CFI_VENDOR_AMD_SCS);
+    return (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code
+            == CFI_VENDOR_AMD_SCS);
 }
 
 static int
@@ -132,8 +117,8 @@ amd_flash_autodetect8 (urj_flash_cfi_array_t *cfi_array)
 {
     if (cfi_array->bus_width != 1)
         return 0;
-    return (cfi_array->cfi_chips[0]->cfi.identification_string.
-            pri_id_code == CFI_VENDOR_AMD_SCS);
+    return (cfi_array->cfi_chips[0]->cfi.identification_string.pri_id_code
+            == CFI_VENDOR_AMD_SCS);
 }
 
 /*
@@ -266,6 +251,13 @@ amdstatus (urj_flash_cfi_array_t *cfi_array, uint32_t adr, int data)
 
 #endif /* 0 */
 
+static void
+amd_flash_read_array (urj_flash_cfi_array_t *cfi_array)
+{
+    /* Read Array */
+    URJ_BUS_WRITE (cfi_array->bus, cfi_array->address, 0x00F000F0); /* AMD reset */
+}
+
 #if 0
 static int
 amdisprotected (parts * ps, urj_flash_cfi_array_t *cfi_array,
@@ -296,14 +288,10 @@ amd_flash_print_info (urj_flash_cfi_array_t *cfi_array)
     int o = amd_flash_address_shift (cfi_array);
 
     URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00aa00aa);      /* autoselect p29 */
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o),
-                   0x00550055);
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o),
-                   0x00900090);
-    mid = URJ_BUS_READ (bus,
-                        cfi_array->address + (0x00 << o)) & 0xFFFF;
-    cid = URJ_BUS_READ (bus,
-                        cfi_array->address + (0x01 << o)) & 0xFFFF;
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o), 0x00550055);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00900090);
+    mid = URJ_BUS_READ (bus, cfi_array->address + (0x00 << o)) & 0xFFFF;
+    cid = URJ_BUS_READ (bus, cfi_array->address + (0x01 << o)) & 0xFFFF;
     prot = URJ_BUS_READ (bus, cfi_array->address + (0x02 << o)) & 0xFF;
     amd_flash_read_array (cfi_array); /* AMD reset */
     printf (_("Chip: AMD Flash\n\tManufacturer: "));
@@ -401,8 +389,7 @@ amd_flash_print_info (urj_flash_cfi_array_t *cfi_array)
 }
 
 static int
-amd_flash_erase_block (urj_flash_cfi_array_t *cfi_array,
-                       uint32_t adr)
+amd_flash_erase_block (urj_flash_cfi_array_t *cfi_array, uint32_t adr)
 {
     urj_bus_t *bus = cfi_array->bus;
     int o = amd_flash_address_shift (cfi_array);
@@ -412,14 +399,10 @@ amd_flash_erase_block (urj_flash_cfi_array_t *cfi_array,
     /*      printf("protected: %d\n", amdisprotected(ps, cfi_array, adr)); */
 
     URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00aa00aa);      /* autoselect p29, sector erase */
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o),
-                   0x00550055);
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o),
-                   0x00800080);
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o),
-                   0x00aa00aa);
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o),
-                   0x00550055);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o), 0x00550055);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00800080);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00aa00aa);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o), 0x00550055);
     URJ_BUS_WRITE (bus, adr, 0x00300030);
 
     if (amdstatus (cfi_array, adr, 0xffff))
@@ -436,16 +419,15 @@ amd_flash_erase_block (urj_flash_cfi_array_t *cfi_array,
 }
 
 static int
-amd_flash_unlock_block (urj_flash_cfi_array_t *cfi_array,
-                        uint32_t adr)
+amd_flash_unlock_block (urj_flash_cfi_array_t *cfi_array, uint32_t adr)
 {
     printf ("flash_unlock_block 0x%08X IGNORE\n", adr);
     return 0;
 }
 
 static int
-amd_flash_program_single (urj_flash_cfi_array_t *cfi_array,
-                          uint32_t adr, uint32_t data)
+amd_flash_program_single (urj_flash_cfi_array_t *cfi_array, uint32_t adr,
+                          uint32_t data)
 {
     int status;
     urj_bus_t *bus = cfi_array->bus;
@@ -455,10 +437,8 @@ amd_flash_program_single (urj_flash_cfi_array_t *cfi_array,
         printf ("\nflash_program 0x%08X = 0x%08X\n", adr, data);
 
     URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00aa00aa);      /* autoselect p29, program */
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o),
-                   0x00550055);
-    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o),
-                   0x00A000A0);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x02aa << o), 0x00550055);
+    URJ_BUS_WRITE (bus, cfi_array->address + (0x0555 << o), 0x00A000A0);
 
     URJ_BUS_WRITE (bus, adr, data);
     status = amdstatus (cfi_array, adr, data);
@@ -468,8 +448,8 @@ amd_flash_program_single (urj_flash_cfi_array_t *cfi_array,
 }
 
 static int
-amd_program_buffer_status (urj_flash_cfi_array_t *cfi_array,
-                           uint32_t adr, uint32_t data)
+amd_program_buffer_status (urj_flash_cfi_array_t *cfi_array, uint32_t adr,
+                           uint32_t data)
 {
     /* NOTE: Status polling according to [3], Figure 1.
        The current method for status polling is not compatible with 32 bit (2x16) configurations
@@ -503,8 +483,8 @@ amd_program_buffer_status (urj_flash_cfi_array_t *cfi_array,
 }
 
 static int
-amd_flash_program_buffer (urj_flash_cfi_array_t *cfi_array,
-                          uint32_t adr, uint32_t *buffer, int count)
+amd_flash_program_buffer (urj_flash_cfi_array_t *cfi_array, uint32_t adr,
+                          uint32_t *buffer, int count)
 {
     /* NOTE: Write buffer programming operation according to [3], Figure 1. */
     int status;
@@ -591,8 +571,8 @@ amd_flash_program (urj_flash_cfi_array_t *cfi_array, uint32_t adr,
 }
 
 static int
-amd_flash_program32 (urj_flash_cfi_array_t *cfi_array,
-                     uint32_t adr, uint32_t *buffer, int count)
+amd_flash_program32 (urj_flash_cfi_array_t *cfi_array, uint32_t adr,
+                     uint32_t *buffer, int count)
 {
     /* Single byte programming is forced for 32 bit (2x16) flash configuration.
        a) lack of testing capbilities for 2x16 multi-byte write operation
@@ -614,13 +594,6 @@ amd_flash_program32 (urj_flash_cfi_array_t *cfi_array,
     return 0;
 }
 
-static void
-amd_flash_read_array (urj_flash_cfi_array_t *cfi_array)
-{
-    /* Read Array */
-    URJ_BUS_WRITE (cfi_array->bus, cfi_array->address, 0x00F000F0); /* AMD reset */
-}
-
 urj_flash_driver_t urj_flash_amd_32_flash_driver = {
     4,                          /* buswidth */
     N_("AMD/Fujitsu Standard Command Set"),

urjtag/src/flash/amd_flash.c

@@ -26,7 +26,7 @@
  * [2] Spansion, Am29LV040B Data Sheet
 */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/flash/cfi.c

@@ -28,7 +28,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/flash/detectflash.c

@@ -28,7 +28,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <string.h>

urjtag/src/flash/flash.c

@@ -33,7 +33,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/flash/intel.c

@@ -35,7 +35,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdint.h>
 #include <stdlib.h>

urjtag/src/global/urjtag.c

@@ -21,7 +21,7 @@
  * Written by Rutger Hofman
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <urjtag/error.h>
 #include <urjtag/jtag.h>

urjtag/src/lib/getdelim.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <stdlib.h>

urjtag/src/lib/getline.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdio.h>
 #include <unistd.h>

urjtag/src/part/bsbit.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <string.h>

urjtag/src/part/data_register.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <string.h>

urjtag/src/part/instruction.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdio.h>

urjtag/src/part/part.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <string.h>

urjtag/src/part/signal.c

@@ -22,11 +22,11 @@
  *
  */
 
+#include <urjtag/sysdep.h>
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "sysdep.h"
-
 #include <urjtag/chain.h>
 #include <urjtag/bssignal.h>
 #include <urjtag/part.h>

urjtag/src/svf/svf.c

@@ -26,6 +26,7 @@
  *
  */
 
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -39,8 +40,6 @@
 #define SA_ONESHOT SA_RESETHAND
 #endif
 
-#include "sysdep.h"
-
 #include <urjtag/jtag.h>
 #include <urjtag/cable.h>
 #include <urjtag/part.h>

urjtag/src/svf/svf_flex.l

@@ -34,7 +34,7 @@
 #include <strings.h>
 #include <ctype.h>
 
-#include <sysdep.h>
+#include <urjtag/sysdep.h>
 
 #ifdef ENABLE_NLS
 #include <locale.h>

urjtag/src/tap/cable.c

@@ -26,7 +26,7 @@
  *
  */
 
-#include "sysdep.h"
+#include <urjtag/sysdep.h>
 
 #include <stdlib.h>
 #include <unistd.h>