dc796a2091
- Log output handlers now get a "const char *line"
- Added "const" to parameter.
src/helper/command.c
src/helper/command.h
- New function: 'command_output_text()'
- Log output handlers now get a "const char *line"
src/helper/options.c
- Log output handlers now get a "const char *line"
src/server/telnet_server.c
- DO not transmit NULL bytes via TELNET.
- Log output handlers now get a "const char *line"
src/server/gdb_server.c
- Log output handlers now get a "const char *line"
*** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent
previously to the mailing list for TCL users try
src/target/target.c
*** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent
previously to the mailing list for TCL users try
src/target/target.h
*** THIS INCLUDES PORTIONS OF A PATCH FROM Oyvind sent
previously to the mailing list for TCL users try
src/openocd.c
- **MAJOR** Work: New TCL/Jim function: mem2array
- **MAJOR** Work: Redirect Tcl/Jim stdio output to remote users.
- Previously: TCL output did not go to GDB.
- Previously: TCL output did not go to TELNET
- Previously: TCL output only goes to control console.
- This fixes that problem.
+ Created callbacks:
+openocd_jim_fwrite()
+openocd_jim_fread()
+openocd_jim_vfprintf()
+openocd_jim_fflush()
+openocd_jim_fgets()
src/Makefile.am
- New TCL files.
- Future note: This should be more automated. As the list of
'tcl' files grows maintaning this list will suck.
src/Jim.c
- ** THIS INCLUDES A PREVIOUS PATCH I SENT EARLIER **
- that impliments many [format] specifies JIM did not support.
- Jim_FormatString() - **MAJOR** work.
- Previously only supported "%s" "%d" and "%c"
- And what support existed had bugs.
- NEW: *MANY* formating parameters are now supported.
- TODO: The "precision" specifier is not supported.
** NEW ** This patch.
- Jim_StringToWide() test if no conversion occured.
- Jim_StringToIndex() test if no conversion occured.
- Jim_StringToDouble() test if no conversion occured.
** NEW ** This Patch. Major Work.
- Previously output from JIM did not get sent to GDB
- Ditto: Output to Telnet session.
- Above items are now fixed - By introducing callbacks
new function pointers in the "interp" structure.
- Helpers that call the callbacks.
- New function: Jim_fprintf()
- New function: Jim_vfprintf()
- New function: Jim_fwrite()
- New function: Jim_fread()
- New function: Jim_fflush()
- New function: Jim_fgets()
By default: the output is to STDIO as previous.
The "openocd.c" - redirects the output as needed.
- Jim_Panic() - Send panic to both STDERR and the interps
specified STDERR output as a 2nd choice.
- Now JIM's "stdin/stdout/stderr" paramters are "void *"
and are no longer "FILE *".
src/Jim.h
- **MAJOR**
- New JIM STDIO callbacks in the "interp" structure.
- change: "stdin/stdout/stderr" are now "void *" cookies.
- New JIM stdio helper functions.
git-svn-id: svn://svn.berlios.de/openocd/trunk@755 b42882b7-edfa-0310-969c-e2dbd0fdcd60
101 lines
2.0 KiB
Makefile
101 lines
2.0 KiB
Makefile
bin_PROGRAMS = openocd
|
|
|
|
if ECOSBOARD
|
|
MAINFILE = ecosboard.c
|
|
else
|
|
MAINFILE = openocd.c
|
|
endif
|
|
|
|
|
|
openocd_SOURCES = $(MAINFILE) jim.c
|
|
|
|
# set the include path found by configure
|
|
INCLUDES = -I$(top_srcdir)/src/helper \
|
|
-I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/server \
|
|
-I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
|
|
|
|
# pass path to prefix path
|
|
openocd_CPPFLAGS = \
|
|
-DPKGLIBDIR=\"$(pkglibdir)\" \
|
|
-DPKGBLDDATE=\"`date +%F-%R`\" \
|
|
-DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \
|
|
@CPPFLAGS@
|
|
|
|
# the library search path.
|
|
openocd_LDFLAGS = $(all_libraries)
|
|
SUBDIRS = helper jtag xsvf target server flash pld
|
|
|
|
if IS_MINGW
|
|
MINGWLDADD = -lwsock32
|
|
else
|
|
MINGWLDADD =
|
|
endif
|
|
|
|
if FT2232_LIBFTDI
|
|
FTDI2232LIB = -lftdi -lusb
|
|
else
|
|
if PRESTO_LIBFTDI
|
|
FTDI2232LIB = -lftdi -lusb
|
|
else
|
|
FTDI2232LIB =
|
|
endif
|
|
endif
|
|
|
|
if USBPROG
|
|
LIBUSB = -lusb
|
|
else
|
|
if JLINK
|
|
LIBUSB = -lusb
|
|
else
|
|
LIBUSB =
|
|
endif
|
|
endif
|
|
|
|
if IS_WIN32
|
|
if FTD2XXDIR
|
|
FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib
|
|
else
|
|
FTD2XXLDADD = -lftd2xx
|
|
endif
|
|
else
|
|
FTD2XXLDADD = -lftd2xx
|
|
endif
|
|
|
|
if FT2232_FTD2XX
|
|
FTD2XXLIB = $(FTD2XXLDADD)
|
|
else
|
|
if PRESTO_FTD2XX
|
|
FTD2XXLIB = $(FTD2XXLDADD)
|
|
else
|
|
FTD2XXLIB =
|
|
endif
|
|
endif
|
|
|
|
openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
|
|
$(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
|
|
$(top_builddir)/src/helper/libhelper.a \
|
|
$(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
|
|
$(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
|
|
$(top_builddir)/src/pld/libpld.a \
|
|
$(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
|
|
|
|
|
|
|
|
nobase_dist_pkglib_DATA = \
|
|
tcl/commands.tcl \
|
|
tcl/bitsbytes.tcl \
|
|
tcl/chip/atmel/at91/aic.tcl \
|
|
tcl/chip/atmel/at91/at91sam7x128.tcl \
|
|
tcl/chip/atmel/at91/at91sam7x256.tcl \
|
|
tcl/chip/atmel/at91/pmc.tcl \
|
|
tcl/chip/atmel/at91/rtt.tcl \
|
|
tcl/chip/atmel/at91/usarts.tcl \
|
|
tcl/cpu/arm/arm7tdmi.tcl \
|
|
tcl/cpu/arm/arm920.tcl \
|
|
tcl/cpu/arm/arm946.tcl \
|
|
tcl/cpu/arm/arm966.tcl \
|
|
tcl/memory.tcl \
|
|
tcl/mmr_helpers.tcl \
|
|
tcl/readable.tcl
|
|
|