Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Renaming jtag->prog

  • Loading branch information...
commit 614e41f9f4506b145cdf3551d9b452ef1b18620e 1 parent ab71623
@makestuff authored
View
8 firmware/fx2/Makefile
@@ -40,7 +40,7 @@ CC := sdcc
AS := asx8051
CCFLAGS := -mmcs51 --code-size 0x1e00 --xram-loc 0xe000 --xram-size 0x0200 -Wl"-b DSCR_AREA=0x1e00" -Wl"-b INT2JT=0x1f00" $(FLAGS)
-all: date.inc jtagOffsets.h $(TARGET).hex
+all: date.inc progOffsets.h $(TARGET).hex
foo: FORCE
@echo $(AS_OBJS)
@@ -54,8 +54,8 @@ $(TARGET).hex: $(CC_OBJS) $(AS_OBJS) $(TARGET).rel
%.rel: %.a51
$(AS) -logs $?
-jtagOffsets.h: jtag.rel
- cat jtag.lst | ./lstParse.pl > jtagOffsets.h
+progOffsets.h: prog.rel
+ cat prog.lst | ./lstParse.pl > progOffsets.h
date.inc:
echo DATE=0x$(MAKESTUFF_TODAY_DATE) > $@
@@ -64,6 +64,6 @@ firmware.c: $(FX2LIBDIR)/fw/fw.c
cp $(FX2LIBDIR)/fw/fw.c firmware.c
clean: FORCE
- rm -f *.iic *.asm *.hex *.lnk *.lst *.map *.mem *.rel *.rst *.sym firmware.c jtagOffsets.h date.inc
+ rm -f *.iic *.asm *.hex *.lnk *.lst *.map *.mem *.rel *.rst *.sym firmware.c progOffsets.h date.inc
FORCE:
View
2  firmware/fx2/app.c
@@ -22,7 +22,7 @@
#include <makestuff.h>
#include "../../vendorCommands.h"
#include "prom.h"
-#include "jtag.h"
+#include "prog.h"
#include "defs.h"
#include "debug.h"
View
2  firmware/fx2/livePatch.c
@@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <makestuff.h>
-#include "jtagOffsets.h"
+#include "progOffsets.h"
const uint16 *xdata classList[] = {tdoList, tdiList, tmsList, tckList, ioaList};
View
4 firmware/fx2/jtag.c → firmware/fx2/prog.c
@@ -17,8 +17,8 @@
#include <fx2regs.h>
#include <fx2macros.h>
#include <delay.h>
-#include "jtag.h"
-#include "prom.h"
+#include "prog.h"
+//#include "prom.h"
#include "defs.h"
#include "../../vendorCommands.h"
#include "debug.h"
View
17 firmware/fx2/jtag.h → firmware/fx2/prog.h
@@ -14,14 +14,14 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef JTAG_H
-#define JTAG_H
+#ifndef PROG_H
+#define PROG_H
#include <makestuff.h>
#include "../../vendorCommands.h"
// Default TDO=PD0, TDI=PD1, TMS=PD2 & TCK=PD3. In reality this is overwritten
-// at runtime by jtagPatch().
+// at runtime by livePatch().
#define JTAG_PORT 3
#define TDO_BIT 0
#define TDI_BIT 1
@@ -38,10 +38,6 @@ sbit at (0x80 + 16*JTAG_PORT + TCK_BIT) TCK; // Port bit to use for TCK
// Macros for NeroJTAG implementation
#define ENDPOINT_SIZE 64
-// Error codes for jtagCsvfPlay(void);
-#define ERROR_CSVF_FAILED_COMPARE 1
-#define ERROR_CSVF_BAD_COMMAND 2
-
// Kick off a shift operation. Next time jtagExecuteShift() runs, it will execute the shift.
void jtagShiftBegin(uint32 numBits, ProgOp progOp, uint8 flagByte);
@@ -59,11 +55,4 @@ void jtagClockFSM(uint32 bitPattern, uint8 transitionCount);
// Keep TMS and TDI as they are, and clock the JTAG state machine "numClocks" times.
void jtagClocks(uint32 numClocks);
-// Initialise the CSVF reader (assume previous call to promStartRead(addr) to position the EEPROM
-// reader at the start of the CSVF stream).
-void jtagCsvfInit(void);
-
-// Play the CSVF stream into the JTAG lines.
-uint8 jtagCsvfPlay(void);
-
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.