From 095f6085cebf90250d7e954ded59141deffb4027 Mon Sep 17 00:00:00 2001 From: Rutger Hofman Date: Sat, 2 May 2009 14:35:08 +0000 Subject: [PATCH] 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 | 3 - urjtag/Makefile.rules | 6 +- urjtag/autogen.sh | 2 +- urjtag/include/urjtag/Makefile.am | 22 +++--- urjtag/{ => include/urjtag}/sysdep.h | 0 urjtag/include/urjtag/xpcu.h | 2 +- urjtag/src/apps/jtag/jtag.c | 2 +- urjtag/src/bsdl/bsdl.c | 2 +- urjtag/src/bus/au1500.c | 2 +- urjtag/src/bus/avr32.c | 2 +- urjtag/src/bus/bcm1250.c | 2 +- urjtag/src/bus/bf533_ezkit.c | 2 +- urjtag/src/bus/bf533_stamp.c | 2 +- urjtag/src/bus/bf537_stamp.c | 2 +- urjtag/src/bus/bf548_ezkit.c | 2 +- urjtag/src/bus/bf561_ezkit.c | 2 +- urjtag/src/bus/bscoach.c | 2 +- urjtag/src/bus/buses.c | 2 +- urjtag/src/bus/ejtag.c | 2 +- urjtag/src/bus/ejtag_dma.c | 2 +- urjtag/src/bus/fjmem.c | 2 +- urjtag/src/bus/generic_bus.c | 2 +- urjtag/src/bus/h7202.c | 2 +- urjtag/src/bus/ixp425.c | 2 +- urjtag/src/bus/jopcyc.c | 2 +- urjtag/src/bus/lh7a400.c | 2 +- urjtag/src/bus/mpc5200.c | 2 +- urjtag/src/bus/mpc824x.c | 2 +- urjtag/src/bus/ppc405ep.c | 2 +- urjtag/src/bus/ppc440gx_ebc8.c | 2 +- urjtag/src/bus/prototype.c | 2 +- urjtag/src/bus/pxa2x0.c | 2 +- urjtag/src/bus/readmem.c | 2 +- urjtag/src/bus/s3c4510x.c | 2 +- urjtag/src/bus/sa1110.c | 2 +- urjtag/src/bus/sh7727.c | 2 +- urjtag/src/bus/sh7750r.c | 2 +- urjtag/src/bus/sh7751r.c | 2 +- urjtag/src/bus/sharc21065l.c | 2 +- urjtag/src/bus/slsup3.c | 2 +- urjtag/src/bus/tx4925.c | 2 +- urjtag/src/bus/writemem.c | 2 +- urjtag/src/bus/zefant-xs3.c | 2 +- urjtag/src/cmd/cmd_addpart.c | 2 +- urjtag/src/cmd/cmd_bit.c | 2 +- urjtag/src/cmd/cmd_bsdl.c | 2 +- urjtag/src/cmd/cmd_bus.c | 2 +- urjtag/src/cmd/cmd_cable.c | 2 +- urjtag/src/cmd/cmd_cmd.c | 2 +- urjtag/src/cmd/cmd_debug.c | 2 +- urjtag/src/cmd/cmd_detect.c | 2 +- urjtag/src/cmd/cmd_detectflash.c | 2 +- urjtag/src/cmd/cmd_discovery.c | 2 +- urjtag/src/cmd/cmd_dr.c | 2 +- urjtag/src/cmd/cmd_endian.c | 2 +- urjtag/src/cmd/cmd_eraseflash.c | 2 +- urjtag/src/cmd/cmd_flashmem.c | 2 +- urjtag/src/cmd/cmd_frequency.c | 2 +- urjtag/src/cmd/cmd_get.c | 2 +- urjtag/src/cmd/cmd_help.c | 2 +- urjtag/src/cmd/cmd_idcode.c | 2 +- urjtag/src/cmd/cmd_include.c | 2 +- urjtag/src/cmd/cmd_initbus.c | 2 +- urjtag/src/cmd/cmd_instruction.c | 2 +- urjtag/src/cmd/cmd_parse.c | 2 +- urjtag/src/cmd/cmd_part.c | 2 +- urjtag/src/cmd/cmd_peekpoke.c | 2 +- urjtag/src/cmd/cmd_pod.c | 2 +- urjtag/src/cmd/cmd_print.c | 2 +- urjtag/src/cmd/cmd_quit.c | 2 +- urjtag/src/cmd/cmd_readmem.c | 2 +- urjtag/src/cmd/cmd_register.c | 2 +- urjtag/src/cmd/cmd_reset.c | 2 +- urjtag/src/cmd/cmd_salias.c | 2 +- urjtag/src/cmd/cmd_scan.c | 2 +- urjtag/src/cmd/cmd_set.c | 2 +- urjtag/src/cmd/cmd_shell.c | 2 +- urjtag/src/cmd/cmd_shift.c | 2 +- urjtag/src/cmd/cmd_signal.c | 2 +- urjtag/src/cmd/cmd_svf.c | 2 +- urjtag/src/cmd/cmd_test.c | 2 +- urjtag/src/cmd/cmd_usleep.c | 2 +- urjtag/src/cmd/cmd_writemem.c | 2 +- urjtag/src/flash/amd.c | 99 ++++++++++---------------- urjtag/src/flash/amd_flash.c | 2 +- urjtag/src/flash/cfi.c | 2 +- urjtag/src/flash/detectflash.c | 2 +- urjtag/src/flash/flash.c | 2 +- urjtag/src/flash/intel.c | 2 +- urjtag/src/global/urjtag.c | 2 +- urjtag/src/lib/getdelim.c | 2 +- urjtag/src/lib/getline.c | 2 +- urjtag/src/part/bsbit.c | 2 +- urjtag/src/part/data_register.c | 2 +- urjtag/src/part/instruction.c | 2 +- urjtag/src/part/part.c | 2 +- urjtag/src/part/signal.c | 4 +- urjtag/src/svf/svf.c | 3 +- urjtag/src/svf/svf_flex.l | 2 +- urjtag/src/tap/cable.c | 2 +- urjtag/src/tap/cable/arcom.c | 2 +- urjtag/src/tap/cable/byteblaster.c | 2 +- urjtag/src/tap/cable/cmd_xfer.c | 4 +- urjtag/src/tap/cable/cmd_xfer.h | 2 +- urjtag/src/tap/cable/dlc5.c | 2 +- urjtag/src/tap/cable/ea253.c | 2 +- urjtag/src/tap/cable/ei012.c | 2 +- urjtag/src/tap/cable/ft2232.c | 2 +- urjtag/src/tap/cable/generic.c | 2 +- urjtag/src/tap/cable/generic_parport.c | 2 +- urjtag/src/tap/cable/generic_usbconn.c | 2 +- urjtag/src/tap/cable/jim.c | 2 +- urjtag/src/tap/cable/jlink.c | 2 +- urjtag/src/tap/cable/keithkoep.c | 2 +- urjtag/src/tap/cable/lattice.c | 2 +- urjtag/src/tap/cable/mpcbdm.c | 2 +- urjtag/src/tap/cable/triton.c | 2 +- urjtag/src/tap/cable/ts7800.c | 2 +- urjtag/src/tap/cable/usbblaster.c | 2 +- urjtag/src/tap/cable/vision_ep9307.c | 2 +- urjtag/src/tap/cable/wiggler.c | 2 +- urjtag/src/tap/cable/wiggler2.c | 2 +- urjtag/src/tap/cable/xpc.c | 2 +- urjtag/src/tap/chain.c | 2 +- urjtag/src/tap/detect.c | 2 +- urjtag/src/tap/discovery.c | 2 +- urjtag/src/tap/idcode.c | 2 +- urjtag/src/tap/parport.c | 2 +- urjtag/src/tap/parport/direct.c | 2 +- urjtag/src/tap/parport/ppdev.c | 2 +- urjtag/src/tap/parport/ppi.c | 2 +- urjtag/src/tap/tap.c | 2 +- urjtag/src/tap/usbconn.c | 2 +- urjtag/src/tap/usbconn/libftd2xx.c | 2 +- urjtag/src/tap/usbconn/libftdi.c | 2 +- urjtag/src/tap/usbconn/libusb.c | 2 +- 136 files changed, 187 insertions(+), 210 deletions(-) rename urjtag/{ => include/urjtag}/sysdep.h (100%) diff --git a/urjtag/Makefile.am b/urjtag/Makefile.am index 52505062..2fc1d870 100644 --- a/urjtag/Makefile.am +++ b/urjtag/Makefile.am @@ -34,9 +34,6 @@ SUBDIRS = \ DIST_SUBDIRS = \ $(SUBDIRS) -noinst_HEADERS = \ - sysdep.h - EXTRA_DIST = \ Makefile.rules \ UrJTAG.nsi \ diff --git a/urjtag/Makefile.rules b/urjtag/Makefile.rules index 80dc10d7..3faa5789 100644 --- a/urjtag/Makefile.rules +++ b/urjtag/Makefile.rules @@ -22,8 +22,12 @@ # Written by Marcel Telka , 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 diff --git a/urjtag/autogen.sh b/urjtag/autogen.sh index dc57579d..9ecea15d 100755 --- a/urjtag/autogen.sh +++ b/urjtag/autogen.sh @@ -33,4 +33,4 @@ else exit 1 fi -./configure --enable-maintainer-mode +./configure --enable-maintainer-mode "$@" diff --git a/urjtag/include/urjtag/Makefile.am b/urjtag/include/urjtag/Makefile.am index b732bb35..4ba72c09 100644 --- a/urjtag/include/urjtag/Makefile.am +++ b/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 \ diff --git a/urjtag/sysdep.h b/urjtag/include/urjtag/sysdep.h similarity index 100% rename from urjtag/sysdep.h rename to urjtag/include/urjtag/sysdep.h diff --git a/urjtag/include/urjtag/xpcu.h b/urjtag/include/urjtag/xpcu.h index 07393341..7a7789de 100644 --- a/urjtag/include/urjtag/xpcu.h +++ b/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); diff --git a/urjtag/src/apps/jtag/jtag.c b/urjtag/src/apps/jtag/jtag.c index ec92e9cf..cc4880d7 100644 --- a/urjtag/src/apps/jtag/jtag.c +++ b/urjtag/src/apps/jtag/jtag.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #ifndef SVN_REVISION #define SVN_REVISION "0" diff --git a/urjtag/src/bsdl/bsdl.c b/urjtag/src/bsdl/bsdl.c index dce35cde..f18eb50f 100644 --- a/urjtag/src/bsdl/bsdl.c +++ b/urjtag/src/bsdl/bsdl.c @@ -31,7 +31,7 @@ #include #include -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/au1500.c b/urjtag/src/bus/au1500.c index b1ad47eb..8ec889ae 100644 --- a/urjtag/src/bus/au1500.c +++ b/urjtag/src/bus/au1500.c @@ -27,7 +27,7 @@ */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/avr32.c b/urjtag/src/bus/avr32.c index e2f67ad0..6ba2b020 100644 --- a/urjtag/src/bus/avr32.c +++ b/urjtag/src/bus/avr32.c @@ -25,7 +25,7 @@ * AVR(R)32 32-Bit Microcontroller", Rev. 32003K-AVR32-10/07 */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bcm1250.c b/urjtag/src/bus/bcm1250.c index 444eabe4..4a2f49be 100644 --- a/urjtag/src/bus/bcm1250.c +++ b/urjtag/src/bus/bcm1250.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bf533_ezkit.c b/urjtag/src/bus/bf533_ezkit.c index 6a889d38..f427c936 100644 --- a/urjtag/src/bus/bf533_ezkit.c +++ b/urjtag/src/bus/bf533_ezkit.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bf533_stamp.c b/urjtag/src/bus/bf533_stamp.c index f33c2243..4c592524 100644 --- a/urjtag/src/bus/bf533_stamp.c +++ b/urjtag/src/bus/bf533_stamp.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bf537_stamp.c b/urjtag/src/bus/bf537_stamp.c index c200deac..ea7f1129 100644 --- a/urjtag/src/bus/bf537_stamp.c +++ b/urjtag/src/bus/bf537_stamp.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bf548_ezkit.c b/urjtag/src/bus/bf548_ezkit.c index d1558a6a..5f2bd1c0 100644 --- a/urjtag/src/bus/bf548_ezkit.c +++ b/urjtag/src/bus/bf548_ezkit.c @@ -22,7 +22,7 @@ * Written by Jie Zhang , 2008. */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bf561_ezkit.c b/urjtag/src/bus/bf561_ezkit.c index b282170b..9d7f44c5 100644 --- a/urjtag/src/bus/bf561_ezkit.c +++ b/urjtag/src/bus/bf561_ezkit.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/bscoach.c b/urjtag/src/bus/bscoach.c index d938b6ee..1a009ef4 100644 --- a/urjtag/src/bus/bscoach.c +++ b/urjtag/src/bus/bscoach.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/buses.c b/urjtag/src/bus/buses.c index 579faa64..f0c2818b 100644 --- a/urjtag/src/bus/buses.c +++ b/urjtag/src/bus/buses.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/ejtag.c b/urjtag/src/bus/ejtag.c index d8167ef1..485022ad 100644 --- a/urjtag/src/bus/ejtag.c +++ b/urjtag/src/bus/ejtag.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/ejtag_dma.c b/urjtag/src/bus/ejtag_dma.c index 3bd91838..7b1d2be0 100644 --- a/urjtag/src/bus/ejtag_dma.c +++ b/urjtag/src/bus/ejtag_dma.c @@ -34,7 +34,7 @@ */ //#define PRINT_DATA_DEBUG 1 -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/fjmem.c b/urjtag/src/bus/fjmem.c index 37e99dd9..03e4d393 100644 --- a/urjtag/src/bus/fjmem.c +++ b/urjtag/src/bus/fjmem.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/generic_bus.c b/urjtag/src/bus/generic_bus.c index 9d3ac0b2..94f90b61 100644 --- a/urjtag/src/bus/generic_bus.c +++ b/urjtag/src/bus/generic_bus.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/bus/h7202.c b/urjtag/src/bus/h7202.c index ee2dcc9d..65fb272f 100644 --- a/urjtag/src/bus/h7202.c +++ b/urjtag/src/bus/h7202.c @@ -23,7 +23,7 @@ * */ -//#include "sysdep.h" +//#include #include #include diff --git a/urjtag/src/bus/ixp425.c b/urjtag/src/bus/ixp425.c index 637bba63..b27ffc93 100644 --- a/urjtag/src/bus/ixp425.c +++ b/urjtag/src/bus/ixp425.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/jopcyc.c b/urjtag/src/bus/jopcyc.c index 3e3d4d1d..67bf486c 100644 --- a/urjtag/src/bus/jopcyc.c +++ b/urjtag/src/bus/jopcyc.c @@ -54,7 +54,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/lh7a400.c b/urjtag/src/bus/lh7a400.c index fb80d73f..2fc4726a 100644 --- a/urjtag/src/bus/lh7a400.c +++ b/urjtag/src/bus/lh7a400.c @@ -32,7 +32,7 @@ * - use only to access flash devices */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/mpc5200.c b/urjtag/src/bus/mpc5200.c index 8bfa290d..053396c8 100644 --- a/urjtag/src/bus/mpc5200.c +++ b/urjtag/src/bus/mpc5200.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/mpc824x.c b/urjtag/src/bus/mpc824x.c index fdf32bc6..d1edf1af 100644 --- a/urjtag/src/bus/mpc824x.c +++ b/urjtag/src/bus/mpc824x.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/ppc405ep.c b/urjtag/src/bus/ppc405ep.c index f7474f0f..c9c62045 100644 --- a/urjtag/src/bus/ppc405ep.c +++ b/urjtag/src/bus/ppc405ep.c @@ -20,7 +20,7 @@ * Modified by Wojtek Kaniewski , 2004. */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/ppc440gx_ebc8.c b/urjtag/src/bus/ppc440gx_ebc8.c index 3e38a2f9..b9783183 100644 --- a/urjtag/src/bus/ppc440gx_ebc8.c +++ b/urjtag/src/bus/ppc440gx_ebc8.c @@ -19,7 +19,7 @@ * Written by Marcel Telka , 2002, 2003. */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/prototype.c b/urjtag/src/bus/prototype.c index df9a6192..7e48d016 100644 --- a/urjtag/src/bus/prototype.c +++ b/urjtag/src/bus/prototype.c @@ -23,7 +23,7 @@ * Modified from ppc405ep.c by Detrick Martin , 2008. */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/pxa2x0.c b/urjtag/src/bus/pxa2x0.c index 18d03517..d86d5661 100644 --- a/urjtag/src/bus/pxa2x0.c +++ b/urjtag/src/bus/pxa2x0.c @@ -30,7 +30,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/readmem.c b/urjtag/src/bus/readmem.c index 5802cbf8..e2bcaff1 100644 --- a/urjtag/src/bus/readmem.c +++ b/urjtag/src/bus/readmem.c @@ -28,7 +28,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/s3c4510x.c b/urjtag/src/bus/s3c4510x.c index a0ca8dad..4feaba7a 100644 --- a/urjtag/src/bus/s3c4510x.c +++ b/urjtag/src/bus/s3c4510x.c @@ -52,7 +52,7 @@ =============================================================================*/ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/sa1110.c b/urjtag/src/bus/sa1110.c index c4ab596a..67a877d5 100644 --- a/urjtag/src/bus/sa1110.c +++ b/urjtag/src/bus/sa1110.c @@ -26,7 +26,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/sh7727.c b/urjtag/src/bus/sh7727.c index 232ae545..19327260 100644 --- a/urjtag/src/bus/sh7727.c +++ b/urjtag/src/bus/sh7727.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/sh7750r.c b/urjtag/src/bus/sh7750r.c index 2cf50983..19d8742e 100644 --- a/urjtag/src/bus/sh7750r.c +++ b/urjtag/src/bus/sh7750r.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/sh7751r.c b/urjtag/src/bus/sh7751r.c index e0516868..1f0568da 100644 --- a/urjtag/src/bus/sh7751r.c +++ b/urjtag/src/bus/sh7751r.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/sharc21065l.c b/urjtag/src/bus/sharc21065l.c index 87d795e1..c292402a 100644 --- a/urjtag/src/bus/sharc21065l.c +++ b/urjtag/src/bus/sharc21065l.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/slsup3.c b/urjtag/src/bus/slsup3.c index 37d6c41f..1b763923 100644 --- a/urjtag/src/bus/slsup3.c +++ b/urjtag/src/bus/slsup3.c @@ -26,7 +26,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/tx4925.c b/urjtag/src/bus/tx4925.c index b64ef47f..9a7049e5 100644 --- a/urjtag/src/bus/tx4925.c +++ b/urjtag/src/bus/tx4925.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/writemem.c b/urjtag/src/bus/writemem.c index e7cf288d..3e1d59a1 100644 --- a/urjtag/src/bus/writemem.c +++ b/urjtag/src/bus/writemem.c @@ -21,7 +21,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/bus/zefant-xs3.c b/urjtag/src/bus/zefant-xs3.c index b1906b43..98c87134 100644 --- a/urjtag/src/bus/zefant-xs3.c +++ b/urjtag/src/bus/zefant-xs3.c @@ -54,7 +54,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_addpart.c b/urjtag/src/cmd/cmd_addpart.c index 056dd04f..3e5625dc 100644 --- a/urjtag/src/cmd/cmd_addpart.c +++ b/urjtag/src/cmd/cmd_addpart.c @@ -20,7 +20,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_bit.c b/urjtag/src/cmd/cmd_bit.c index 5f81045f..19acc0d8 100644 --- a/urjtag/src/cmd/cmd_bit.c +++ b/urjtag/src/cmd/cmd_bit.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_bsdl.c b/urjtag/src/cmd/cmd_bsdl.c index 7bda2ae6..cf1f6e98 100644 --- a/urjtag/src/cmd/cmd_bsdl.c +++ b/urjtag/src/cmd/cmd_bsdl.c @@ -23,7 +23,7 @@ */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_bus.c b/urjtag/src/cmd/cmd_bus.c index b46d5396..a532359e 100644 --- a/urjtag/src/cmd/cmd_bus.c +++ b/urjtag/src/cmd/cmd_bus.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_cable.c b/urjtag/src/cmd/cmd_cable.c index b828bd48..ae80f335 100644 --- a/urjtag/src/cmd/cmd_cable.c +++ b/urjtag/src/cmd/cmd_cable.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_cmd.c b/urjtag/src/cmd/cmd_cmd.c index 1007cc80..5d4c725e 100644 --- a/urjtag/src/cmd/cmd_cmd.c +++ b/urjtag/src/cmd/cmd_cmd.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_debug.c b/urjtag/src/cmd/cmd_debug.c index 16bfcb4c..9677e8c2 100644 --- a/urjtag/src/cmd/cmd_debug.c +++ b/urjtag/src/cmd/cmd_debug.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_detect.c b/urjtag/src/cmd/cmd_detect.c index e350077b..ebbcd7f8 100644 --- a/urjtag/src/cmd/cmd_detect.c +++ b/urjtag/src/cmd/cmd_detect.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_detectflash.c b/urjtag/src/cmd/cmd_detectflash.c index 4eb71817..d03e6f5a 100644 --- a/urjtag/src/cmd/cmd_detectflash.c +++ b/urjtag/src/cmd/cmd_detectflash.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/cmd/cmd_discovery.c b/urjtag/src/cmd/cmd_discovery.c index 92d0e44b..c600eef6 100644 --- a/urjtag/src/cmd/cmd_discovery.c +++ b/urjtag/src/cmd/cmd_discovery.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/cmd/cmd_dr.c b/urjtag/src/cmd/cmd_dr.c index ed781c2b..d0710cbb 100644 --- a/urjtag/src/cmd/cmd_dr.c +++ b/urjtag/src/cmd/cmd_dr.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_endian.c b/urjtag/src/cmd/cmd_endian.c index c64606f9..8a024a4b 100644 --- a/urjtag/src/cmd/cmd_endian.c +++ b/urjtag/src/cmd/cmd_endian.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_eraseflash.c b/urjtag/src/cmd/cmd_eraseflash.c index 3f50153b..e374ad51 100644 --- a/urjtag/src/cmd/cmd_eraseflash.c +++ b/urjtag/src/cmd/cmd_eraseflash.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_flashmem.c b/urjtag/src/cmd/cmd_flashmem.c index dd72b441..dab29704 100644 --- a/urjtag/src/cmd/cmd_flashmem.c +++ b/urjtag/src/cmd/cmd_flashmem.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_frequency.c b/urjtag/src/cmd/cmd_frequency.c index 58c48330..00a6fa5a 100644 --- a/urjtag/src/cmd/cmd_frequency.c +++ b/urjtag/src/cmd/cmd_frequency.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/cmd/cmd_get.c b/urjtag/src/cmd/cmd_get.c index 5229b4bc..bb7a5516 100644 --- a/urjtag/src/cmd/cmd_get.c +++ b/urjtag/src/cmd/cmd_get.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_help.c b/urjtag/src/cmd/cmd_help.c index 78f213d8..6e6fa033 100644 --- a/urjtag/src/cmd/cmd_help.c +++ b/urjtag/src/cmd/cmd_help.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_idcode.c b/urjtag/src/cmd/cmd_idcode.c index fa08843e..87a3b0fa 100644 --- a/urjtag/src/cmd/cmd_idcode.c +++ b/urjtag/src/cmd/cmd_idcode.c @@ -21,7 +21,7 @@ * Written by Uwe Bonnes , 2008. * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/cmd/cmd_include.c b/urjtag/src/cmd/cmd_include.c index 113e7a9f..45bfdf26 100644 --- a/urjtag/src/cmd/cmd_include.c +++ b/urjtag/src/cmd/cmd_include.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_initbus.c b/urjtag/src/cmd/cmd_initbus.c index a664dcd0..b09bc0c8 100644 --- a/urjtag/src/cmd/cmd_initbus.c +++ b/urjtag/src/cmd/cmd_initbus.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_instruction.c b/urjtag/src/cmd/cmd_instruction.c index 6411334c..87fbdce8 100644 --- a/urjtag/src/cmd/cmd_instruction.c +++ b/urjtag/src/cmd/cmd_instruction.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_parse.c b/urjtag/src/cmd/cmd_parse.c index 2c3ca59c..d3a642d7 100644 --- a/urjtag/src/cmd/cmd_parse.c +++ b/urjtag/src/cmd/cmd_parse.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_part.c b/urjtag/src/cmd/cmd_part.c index 7d3439e1..f1dd0b94 100644 --- a/urjtag/src/cmd/cmd_part.c +++ b/urjtag/src/cmd/cmd_part.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_peekpoke.c b/urjtag/src/cmd/cmd_peekpoke.c index c32a5633..820178ac 100644 --- a/urjtag/src/cmd/cmd_peekpoke.c +++ b/urjtag/src/cmd/cmd_peekpoke.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_pod.c b/urjtag/src/cmd/cmd_pod.c index 89c36284..c09c317c 100644 --- a/urjtag/src/cmd/cmd_pod.c +++ b/urjtag/src/cmd/cmd_pod.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_print.c b/urjtag/src/cmd/cmd_print.c index ba014b59..50fd8890 100644 --- a/urjtag/src/cmd/cmd_print.c +++ b/urjtag/src/cmd/cmd_print.c @@ -24,7 +24,7 @@ #include -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_quit.c b/urjtag/src/cmd/cmd_quit.c index 0d898867..e6ea2bd7 100644 --- a/urjtag/src/cmd/cmd_quit.c +++ b/urjtag/src/cmd/cmd_quit.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/cmd/cmd_readmem.c b/urjtag/src/cmd/cmd_readmem.c index 08a5d83e..0b9fbca5 100644 --- a/urjtag/src/cmd/cmd_readmem.c +++ b/urjtag/src/cmd/cmd_readmem.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_register.c b/urjtag/src/cmd/cmd_register.c index 1a788ae6..0f69c31f 100644 --- a/urjtag/src/cmd/cmd_register.c +++ b/urjtag/src/cmd/cmd_register.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_reset.c b/urjtag/src/cmd/cmd_reset.c index 9d4b30b1..19aa71c3 100644 --- a/urjtag/src/cmd/cmd_reset.c +++ b/urjtag/src/cmd/cmd_reset.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_salias.c b/urjtag/src/cmd/cmd_salias.c index 31164a4b..c6f0fefe 100644 --- a/urjtag/src/cmd/cmd_salias.c +++ b/urjtag/src/cmd/cmd_salias.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_scan.c b/urjtag/src/cmd/cmd_scan.c index d4bbab77..49385d05 100644 --- a/urjtag/src/cmd/cmd_scan.c +++ b/urjtag/src/cmd/cmd_scan.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_set.c b/urjtag/src/cmd/cmd_set.c index 8fb04deb..fba5246f 100644 --- a/urjtag/src/cmd/cmd_set.c +++ b/urjtag/src/cmd/cmd_set.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_shell.c b/urjtag/src/cmd/cmd_shell.c index 691b36b1..4ae7b6ca 100644 --- a/urjtag/src/cmd/cmd_shell.c +++ b/urjtag/src/cmd/cmd_shell.c @@ -22,7 +22,7 @@ * shell.c added by djf */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_shift.c b/urjtag/src/cmd/cmd_shift.c index deef99f1..c8920480 100644 --- a/urjtag/src/cmd/cmd_shift.c +++ b/urjtag/src/cmd/cmd_shift.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_signal.c b/urjtag/src/cmd/cmd_signal.c index 7bbedff5..b635f5ca 100644 --- a/urjtag/src/cmd/cmd_signal.c +++ b/urjtag/src/cmd/cmd_signal.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_svf.c b/urjtag/src/cmd/cmd_svf.c index 405f0fa3..25cc6fd0 100644 --- a/urjtag/src/cmd/cmd_svf.c +++ b/urjtag/src/cmd/cmd_svf.c @@ -23,7 +23,7 @@ */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_test.c b/urjtag/src/cmd/cmd_test.c index cd449320..78673b74 100644 --- a/urjtag/src/cmd/cmd_test.c +++ b/urjtag/src/cmd/cmd_test.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/cmd/cmd_usleep.c b/urjtag/src/cmd/cmd_usleep.c index a12d7083..393ef02f 100644 --- a/urjtag/src/cmd/cmd_usleep.c +++ b/urjtag/src/cmd/cmd_usleep.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/cmd/cmd_writemem.c b/urjtag/src/cmd/cmd_writemem.c index 42848c0c..be080aa5 100644 --- a/urjtag/src/cmd/cmd_writemem.c +++ b/urjtag/src/cmd/cmd_writemem.c @@ -20,7 +20,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/flash/amd.c b/urjtag/src/flash/amd.c index 9f993ce8..a76313d5 100644 --- a/urjtag/src/flash/amd.c +++ b/urjtag/src/flash/amd.c @@ -32,13 +32,13 @@ * */ -#include "sysdep.h" +#include #include #include #include #include -#include +#include /* usleep */ #include #include @@ -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"), diff --git a/urjtag/src/flash/amd_flash.c b/urjtag/src/flash/amd_flash.c index 3f87eb21..0d20bb16 100644 --- a/urjtag/src/flash/amd_flash.c +++ b/urjtag/src/flash/amd_flash.c @@ -26,7 +26,7 @@ * [2] Spansion, Am29LV040B Data Sheet */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/flash/cfi.c b/urjtag/src/flash/cfi.c index b60aad55..8fd4137c 100644 --- a/urjtag/src/flash/cfi.c +++ b/urjtag/src/flash/cfi.c @@ -28,7 +28,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/flash/detectflash.c b/urjtag/src/flash/detectflash.c index 09c6f9ca..977b3c36 100644 --- a/urjtag/src/flash/detectflash.c +++ b/urjtag/src/flash/detectflash.c @@ -28,7 +28,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/flash/flash.c b/urjtag/src/flash/flash.c index 5c82ab3c..0f526c78 100644 --- a/urjtag/src/flash/flash.c +++ b/urjtag/src/flash/flash.c @@ -33,7 +33,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/flash/intel.c b/urjtag/src/flash/intel.c index e8dc8cc4..0cb72ce5 100644 --- a/urjtag/src/flash/intel.c +++ b/urjtag/src/flash/intel.c @@ -35,7 +35,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/global/urjtag.c b/urjtag/src/global/urjtag.c index ab685240..36143dc8 100644 --- a/urjtag/src/global/urjtag.c +++ b/urjtag/src/global/urjtag.c @@ -21,7 +21,7 @@ * Written by Rutger Hofman */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/lib/getdelim.c b/urjtag/src/lib/getdelim.c index aadb6e32..808ab56d 100644 --- a/urjtag/src/lib/getdelim.c +++ b/urjtag/src/lib/getdelim.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/lib/getline.c b/urjtag/src/lib/getline.c index d60fe891..4358ee23 100644 --- a/urjtag/src/lib/getline.c +++ b/urjtag/src/lib/getline.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/part/bsbit.c b/urjtag/src/part/bsbit.c index 82e1715a..4f2d79c7 100644 --- a/urjtag/src/part/bsbit.c +++ b/urjtag/src/part/bsbit.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/part/data_register.c b/urjtag/src/part/data_register.c index 88309b4c..68266908 100644 --- a/urjtag/src/part/data_register.c +++ b/urjtag/src/part/data_register.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/part/instruction.c b/urjtag/src/part/instruction.c index ef265c1f..88e0f939 100644 --- a/urjtag/src/part/instruction.c +++ b/urjtag/src/part/instruction.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/part/part.c b/urjtag/src/part/part.c index 7d11ce16..65a2f675 100644 --- a/urjtag/src/part/part.c +++ b/urjtag/src/part/part.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/part/signal.c b/urjtag/src/part/signal.c index 3d40b8bb..911705f0 100644 --- a/urjtag/src/part/signal.c +++ b/urjtag/src/part/signal.c @@ -22,11 +22,11 @@ * */ +#include + #include #include -#include "sysdep.h" - #include #include #include diff --git a/urjtag/src/svf/svf.c b/urjtag/src/svf/svf.c index 1f7c0e1b..de848ab6 100644 --- a/urjtag/src/svf/svf.c +++ b/urjtag/src/svf/svf.c @@ -26,6 +26,7 @@ * */ +#include #include #include @@ -39,8 +40,6 @@ #define SA_ONESHOT SA_RESETHAND #endif -#include "sysdep.h" - #include #include #include diff --git a/urjtag/src/svf/svf_flex.l b/urjtag/src/svf/svf_flex.l index 44d8f79e..7f1cb498 100644 --- a/urjtag/src/svf/svf_flex.l +++ b/urjtag/src/svf/svf_flex.l @@ -34,7 +34,7 @@ #include #include -#include +#include #ifdef ENABLE_NLS #include diff --git a/urjtag/src/tap/cable.c b/urjtag/src/tap/cable.c index f1e2d11d..75d4d8c4 100644 --- a/urjtag/src/tap/cable.c +++ b/urjtag/src/tap/cable.c @@ -26,7 +26,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/arcom.c b/urjtag/src/tap/cable/arcom.c index c81d725f..671f7ec4 100644 --- a/urjtag/src/tap/cable/arcom.c +++ b/urjtag/src/tap/cable/arcom.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/byteblaster.c b/urjtag/src/tap/cable/byteblaster.c index d2f8e8d3..b8fc39e7 100644 --- a/urjtag/src/tap/cable/byteblaster.c +++ b/urjtag/src/tap/cable/byteblaster.c @@ -31,7 +31,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/cmd_xfer.c b/urjtag/src/tap/cable/cmd_xfer.c index 0de315e8..af1f80ea 100644 --- a/urjtag/src/tap/cable/cmd_xfer.c +++ b/urjtag/src/tap/cable/cmd_xfer.c @@ -22,11 +22,11 @@ * */ +#include + #include #include -#include "sysdep.h" - #include "generic.h" #include "generic_usbconn.h" diff --git a/urjtag/src/tap/cable/cmd_xfer.h b/urjtag/src/tap/cable/cmd_xfer.h index 352e7a9c..dbacadbf 100644 --- a/urjtag/src/tap/cable/cmd_xfer.h +++ b/urjtag/src/tap/cable/cmd_xfer.h @@ -25,7 +25,7 @@ #ifndef URJ_TAP_CABLE_CMD_XFER_H #define URJ_TAP_CABLE_CMD_XFER_H -#include "sysdep.h" +#include #include diff --git a/urjtag/src/tap/cable/dlc5.c b/urjtag/src/tap/cable/dlc5.c index 9610eeb1..a82fc4ca 100644 --- a/urjtag/src/tap/cable/dlc5.c +++ b/urjtag/src/tap/cable/dlc5.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/ea253.c b/urjtag/src/tap/cable/ea253.c index 084cfbe9..8044171a 100644 --- a/urjtag/src/tap/cable/ea253.c +++ b/urjtag/src/tap/cable/ea253.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/ei012.c b/urjtag/src/tap/cable/ei012.c index 327893d0..9772ceda 100644 --- a/urjtag/src/tap/cable/ei012.c +++ b/urjtag/src/tap/cable/ei012.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/ft2232.c b/urjtag/src/tap/cable/ft2232.c index c9f08d40..8a2871bd 100644 --- a/urjtag/src/tap/cable/ft2232.c +++ b/urjtag/src/tap/cable/ft2232.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/generic.c b/urjtag/src/tap/cable/generic.c index de75cdea..7af4bf70 100644 --- a/urjtag/src/tap/cable/generic.c +++ b/urjtag/src/tap/cable/generic.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/generic_parport.c b/urjtag/src/tap/cable/generic_parport.c index da057b06..8a2a9d65 100644 --- a/urjtag/src/tap/cable/generic_parport.c +++ b/urjtag/src/tap/cable/generic_parport.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/generic_usbconn.c b/urjtag/src/tap/cable/generic_usbconn.c index 978b4708..182cca16 100644 --- a/urjtag/src/tap/cable/generic_usbconn.c +++ b/urjtag/src/tap/cable/generic_usbconn.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/jim.c b/urjtag/src/tap/cable/jim.c index 951b51b8..3a8b327a 100644 --- a/urjtag/src/tap/cable/jim.c +++ b/urjtag/src/tap/cable/jim.c @@ -21,7 +21,7 @@ * 02111-1307, USA. */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/jlink.c b/urjtag/src/tap/cable/jlink.c index 4e2d9fa7..99fdacf7 100644 --- a/urjtag/src/tap/cable/jlink.c +++ b/urjtag/src/tap/cable/jlink.c @@ -38,7 +38,7 @@ /* ---------------------------------------------------------------------- */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/keithkoep.c b/urjtag/src/tap/cable/keithkoep.c index 3ce232fc..5704887c 100644 --- a/urjtag/src/tap/cable/keithkoep.c +++ b/urjtag/src/tap/cable/keithkoep.c @@ -26,7 +26,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/lattice.c b/urjtag/src/tap/cable/lattice.c index b0b164dd..10d778a7 100644 --- a/urjtag/src/tap/cable/lattice.c +++ b/urjtag/src/tap/cable/lattice.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/mpcbdm.c b/urjtag/src/tap/cable/mpcbdm.c index d2e4b1e7..555c948e 100644 --- a/urjtag/src/tap/cable/mpcbdm.c +++ b/urjtag/src/tap/cable/mpcbdm.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/triton.c b/urjtag/src/tap/cable/triton.c index 108bcb8a..6a0e9002 100644 --- a/urjtag/src/tap/cable/triton.c +++ b/urjtag/src/tap/cable/triton.c @@ -36,7 +36,7 @@ * interface circuit, so all bets are off). */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/ts7800.c b/urjtag/src/tap/cable/ts7800.c index a3c2aebd..b1dee512 100644 --- a/urjtag/src/tap/cable/ts7800.c +++ b/urjtag/src/tap/cable/ts7800.c @@ -25,7 +25,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/usbblaster.c b/urjtag/src/tap/cable/usbblaster.c index 93d51356..cc01bf47 100644 --- a/urjtag/src/tap/cable/usbblaster.c +++ b/urjtag/src/tap/cable/usbblaster.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/vision_ep9307.c b/urjtag/src/tap/cable/vision_ep9307.c index ca8f738e..5a821ccb 100644 --- a/urjtag/src/tap/cable/vision_ep9307.c +++ b/urjtag/src/tap/cable/vision_ep9307.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/wiggler.c b/urjtag/src/tap/cable/wiggler.c index cce836d4..f5660f81 100644 --- a/urjtag/src/tap/cable/wiggler.c +++ b/urjtag/src/tap/cable/wiggler.c @@ -27,7 +27,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/wiggler2.c b/urjtag/src/tap/cable/wiggler2.c index ed011d60..1b2cae4a 100644 --- a/urjtag/src/tap/cable/wiggler2.c +++ b/urjtag/src/tap/cable/wiggler2.c @@ -34,7 +34,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/cable/xpc.c b/urjtag/src/tap/cable/xpc.c index 0e07d781..c239c6c8 100644 --- a/urjtag/src/tap/cable/xpc.c +++ b/urjtag/src/tap/cable/xpc.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/tap/chain.c b/urjtag/src/tap/chain.c index b75c1c1b..6efb0867 100644 --- a/urjtag/src/tap/chain.c +++ b/urjtag/src/tap/chain.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/detect.c b/urjtag/src/tap/detect.c index 9b6203cc..fe3602a3 100644 --- a/urjtag/src/tap/detect.c +++ b/urjtag/src/tap/detect.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/discovery.c b/urjtag/src/tap/discovery.c index 64867f98..17e6dd6f 100644 --- a/urjtag/src/tap/discovery.c +++ b/urjtag/src/tap/discovery.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/idcode.c b/urjtag/src/tap/idcode.c index 1f424608..aed8e5bc 100644 --- a/urjtag/src/tap/idcode.c +++ b/urjtag/src/tap/idcode.c @@ -21,7 +21,7 @@ * Written by Uwe Bonnes , 2008. * */ -#include "sysdep.h" +#include #include #include diff --git a/urjtag/src/tap/parport.c b/urjtag/src/tap/parport.c index f2289332..3f2a6975 100644 --- a/urjtag/src/tap/parport.c +++ b/urjtag/src/tap/parport.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/tap/parport/direct.c b/urjtag/src/tap/parport/direct.c index 431a7d5d..55936c53 100644 --- a/urjtag/src/tap/parport/direct.c +++ b/urjtag/src/tap/parport/direct.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #ifdef ENABLE_LOWLEVEL_DIRECT diff --git a/urjtag/src/tap/parport/ppdev.c b/urjtag/src/tap/parport/ppdev.c index 071ff072..9acb4b33 100644 --- a/urjtag/src/tap/parport/ppdev.c +++ b/urjtag/src/tap/parport/ppdev.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #ifdef ENABLE_LOWLEVEL_PPDEV diff --git a/urjtag/src/tap/parport/ppi.c b/urjtag/src/tap/parport/ppi.c index bac4475a..904e3311 100644 --- a/urjtag/src/tap/parport/ppi.c +++ b/urjtag/src/tap/parport/ppi.c @@ -23,7 +23,7 @@ * */ -#include "sysdep.h" +#include #ifdef HAVE_DEV_PPBUS_PPI_H diff --git a/urjtag/src/tap/tap.c b/urjtag/src/tap/tap.c index fbfda10c..cd6bfc25 100644 --- a/urjtag/src/tap/tap.c +++ b/urjtag/src/tap/tap.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/tap/usbconn.c b/urjtag/src/tap/usbconn.c index 9ccb5e06..367e5fae 100644 --- a/urjtag/src/tap/usbconn.c +++ b/urjtag/src/tap/usbconn.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include diff --git a/urjtag/src/tap/usbconn/libftd2xx.c b/urjtag/src/tap/usbconn/libftd2xx.c index 6be1edae..e5e41e97 100644 --- a/urjtag/src/tap/usbconn/libftd2xx.c +++ b/urjtag/src/tap/usbconn/libftd2xx.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #if __CYGWIN__ || __MINGW32__ diff --git a/urjtag/src/tap/usbconn/libftdi.c b/urjtag/src/tap/usbconn/libftdi.c index 7c0633f1..06d2c03c 100644 --- a/urjtag/src/tap/usbconn/libftdi.c +++ b/urjtag/src/tap/usbconn/libftdi.c @@ -22,7 +22,7 @@ * */ -#include "sysdep.h" +#include #include #if __CYGWIN__ || __MINGW32__ diff --git a/urjtag/src/tap/usbconn/libusb.c b/urjtag/src/tap/usbconn/libusb.c index 71861c94..7d817a8e 100644 --- a/urjtag/src/tap/usbconn/libusb.c +++ b/urjtag/src/tap/usbconn/libusb.c @@ -24,7 +24,7 @@ * */ -#include "sysdep.h" +#include #ifdef HAVE_LIBUSB