Permalink
Browse files

Merged prog.h into vendorCommands.h

  • Loading branch information...
1 parent c8f5445 commit 9ade2a26c0cb1c101e890c3ad4aeda3dad4d7bc5 makestuff committed Mar 18, 2013
Showing with 22 additions and 44 deletions.
  1. +0 −1 firmware/fx2/jtag.c
  2. +1 −1 firmware/fx2/jtag.h
  3. +0 −1 jtag.c
  4. +0 −41 prog.h
  5. +21 −0 vendorCommands.h
View
@@ -22,7 +22,6 @@
#include "defs.h"
#include "../../vendorCommands.h"
#include "debug.h"
-#include "../../prog.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// NeroJTAG Stuff
View
@@ -18,7 +18,7 @@
#define JTAG_H
#include <makestuff.h>
-#include "../../prog.h"
+#include "../../vendorCommands.h"
// Default TDO=PD0, TDI=PD1, TMS=PD2 & TCK=PD3. In reality this is overwritten
// at runtime by jtagPatch().
View
@@ -23,7 +23,6 @@
#include "private.h"
#include "csvfplay.h"
#include "vendorCommands.h"
-#include "prog.h"
static FLStatus beginShift(
struct FLContext *handle, uint32 numBits, ProgOp progOp, uint8 mode, const char **error);
View
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2009-2012 Chris McClelland
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * 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 PROG_H
-#define PROG_H
-
-typedef enum {
- PATCH_TDO,
- PATCH_TDI,
- PATCH_TMS,
- PATCH_TCK,
- PATCH_D8
-} PatchOp;
-
-typedef enum {
- PROG_NOP,
- PROG_JTAG_ISSENDING_ISRECEIVING,
- PROG_JTAG_ISSENDING_NOTRECEIVING,
- PROG_JTAG_NOTSENDING_ISRECEIVING,
- PROG_JTAG_NOTSENDING_NOTRECEIVING,
- PROG_PARALLEL,
- PROG_SERIAL
-} ProgOp;
-
-#define bmISLAST (1<<0)
-#define bmSENDONES (1<<1)
-
-#endif
View
@@ -34,4 +34,25 @@
// Bits in the mode word
#define MODE_JTAG (1<<0)
+typedef enum {
+ PATCH_TDO,
+ PATCH_TDI,
+ PATCH_TMS,
+ PATCH_TCK,
+ PATCH_D8
+} PatchOp;
+
+typedef enum {
+ PROG_NOP,
+ PROG_JTAG_ISSENDING_ISRECEIVING,
+ PROG_JTAG_ISSENDING_NOTRECEIVING,
+ PROG_JTAG_NOTSENDING_ISRECEIVING,
+ PROG_JTAG_NOTSENDING_NOTRECEIVING,
+ PROG_PARALLEL,
+ PROG_SERIAL
+} ProgOp;
+
+#define bmISLAST (1<<0)
+#define bmSENDONES (1<<1)
+
#endif

0 comments on commit 9ade2a2

Please sign in to comment.