You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Makefile.am 2.3 KiB

src/helper/configuration.h - 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
15 years ago
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104
  1. bin_PROGRAMS = bin2char openocd
  2. bin2char_SOURCES = bin2char.c
  3. if ECOSBOARD
  4. MAINFILE = ecosboard.c
  5. else
  6. MAINFILE = main.c jim.c
  7. endif
  8. openocd_SOURCES = $(MAINFILE) openocd.c startup_tcl.c
  9. # set the include path found by configure
  10. INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \
  11. -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/server \
  12. -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
  13. # pass path to prefix path
  14. openocd_CPPFLAGS = \
  15. -DPKGLIBDIR=\"$(pkglibdir)\" \
  16. -DPKGBLDDATE=\"`date +%F-%R`\" \
  17. -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \
  18. @CPPFLAGS@
  19. # the library search path.
  20. openocd_LDFLAGS = $(all_libraries)
  21. SUBDIRS = helper jtag xsvf target server flash pld
  22. if IS_MINGW
  23. MINGWLDADD = -lwsock32
  24. else
  25. MINGWLDADD =
  26. endif
  27. if FT2232_LIBFTDI
  28. FTDI2232LIB = -lftdi -lusb
  29. else
  30. if PRESTO_LIBFTDI
  31. FTDI2232LIB = -lftdi -lusb
  32. else
  33. FTDI2232LIB =
  34. endif
  35. endif
  36. if USBPROG
  37. LIBUSB = -lusb
  38. else
  39. if JLINK
  40. LIBUSB = -lusb
  41. else
  42. LIBUSB =
  43. endif
  44. endif
  45. if IS_WIN32
  46. if FTD2XXDIR
  47. FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib
  48. else
  49. FTD2XXLDADD = -lftd2xx
  50. endif
  51. else
  52. FTD2XXLDADD = -lftd2xx
  53. endif
  54. if FT2232_FTD2XX
  55. FTD2XXLIB = $(FTD2XXLDADD)
  56. else
  57. if PRESTO_FTD2XX
  58. FTD2XXLIB = $(FTD2XXLDADD)
  59. else
  60. FTD2XXLIB =
  61. endif
  62. endif
  63. openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \
  64. $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
  65. $(top_builddir)/src/helper/libhelper.a \
  66. $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
  67. $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
  68. $(top_builddir)/src/pld/libpld.a \
  69. $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB)
  70. nobase_dist_pkglib_DATA = \
  71. tcl/bitsbytes.tcl \
  72. tcl/chip/atmel/at91/aic.tcl \
  73. tcl/chip/atmel/at91/at91sam7x128.tcl \
  74. tcl/chip/atmel/at91/at91sam7x256.tcl \
  75. tcl/chip/atmel/at91/pmc.tcl \
  76. tcl/chip/atmel/at91/rtt.tcl \
  77. tcl/chip/atmel/at91/usarts.tcl \
  78. tcl/cpu/arm/arm7tdmi.tcl \
  79. tcl/cpu/arm/arm920.tcl \
  80. tcl/cpu/arm/arm946.tcl \
  81. tcl/cpu/arm/arm966.tcl \
  82. tcl/memory.tcl \
  83. tcl/mmr_helpers.tcl \
  84. tcl/readable.tcl
  85. # Convert .tcl to cfile
  86. startup_tcl.c: bin2char startup.tcl
  87. ./bin2char startup_tcl < $(srcdir)/startup.tcl > startup_tcl.c
  88. # add startup_tcl.c to make clean list
  89. CLEANFILES = startup_tcl.c