Permalink
Browse files

Removed nero.h

  • Loading branch information...
1 parent def02c3 commit c8f5445d629056f7af4d694167523bc55600b884 makestuff committed Mar 18, 2013
Showing with 31 additions and 59 deletions.
  1. +1 −1 csvfplay.c
  2. +0 −1 jtag.c
  3. +0 −57 nero.h
  4. +30 −0 private.h
View
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <makestuff.h>
#include <liberror.h>
-#include "nero.h"
+#include "private.h"
#include "vendorCommands.h"
#include "xsvf.h"
#include "csvfplay.h"
View
1 jtag.c
@@ -19,7 +19,6 @@
#include <makestuff.h>
#include <libusbwrap.h>
#include <liberror.h>
-#include "nero.h"
#include "libfpgalink.h"
#include "private.h"
#include "csvfplay.h"
View
57 nero.h
@@ -1,57 +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 NERO_H
-#define NERO_H
-
-#include <makestuff.h>
-#include "libfpgalink.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
- // Return the number of bytes necessary to store x number of bits
- #define bitsToBytes(x) ((x>>3) + (x&7 ? 1 : 0))
-
- // Shift "numBits" bits from "inData" into TDI, at the same time shifting the same number of
- // bits from TDO into "outData". If "isLast" is true, leave Shift-DR state on final bit. If you
- // want inData to be all zeros or all ones, you can use ZEROS or ONES respectively. This is more
- // efficient than physically sending an array containing all zeros or all 0xFFs.
- FLStatus neroShift(
- struct FLContext *handle, uint32 numBits, const uint8 *inData, uint8 *outData, bool isLast,
- const char **error
- ) WARN_UNUSED_RESULT;
-
- // Special values for inData parameter of neroShift() declared above
- #define ZEROS (const uint8*)NULL
- #define ONES (ZEROS - 1)
-
- // Clock "transitionCount" bits from "bitPattern" into TMS, starting with the LSB.
- FLStatus neroClockFSM(
- struct FLContext *handle, uint32 bitPattern, uint8 transitionCount, const char **error
- ) WARN_UNUSED_RESULT;
-
- // Toggle TCK "numClocks" times.
- FLStatus neroClocks(
- struct FLContext *handle, uint32 numClocks, const char **error
- ) WARN_UNUSED_RESULT;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
View
@@ -128,6 +128,36 @@ extern "C" {
struct Buffer *dest, const char **error
) WARN_UNUSED_RESULT;
+ // ----------------------------------------------------------------------------------------------
+ // NeroPROG JTAG stuff
+ // ----------------------------------------------------------------------------------------------
+
+ // Return the number of bytes necessary to store x number of bits
+ #define bitsToBytes(x) ((x>>3) + (x&7 ? 1 : 0))
+
+ // Shift "numBits" bits from "inData" into TDI, at the same time shifting the same number of
+ // bits from TDO into "outData". If "isLast" is true, leave Shift-DR state on final bit. If you
+ // want inData to be all zeros or all ones, you can use ZEROS or ONES respectively. This is more
+ // efficient than physically sending an array containing all zeros or all 0xFFs.
+ FLStatus neroShift(
+ struct FLContext *handle, uint32 numBits, const uint8 *inData, uint8 *outData, bool isLast,
+ const char **error
+ ) WARN_UNUSED_RESULT;
+
+ // Special values for inData parameter of neroShift() declared above
+ #define ZEROS (const uint8*)NULL
+ #define ONES (ZEROS - 1)
+
+ // Clock "transitionCount" bits from "bitPattern" into TMS, starting with the LSB.
+ FLStatus neroClockFSM(
+ struct FLContext *handle, uint32 bitPattern, uint8 transitionCount, const char **error
+ ) WARN_UNUSED_RESULT;
+
+ // Toggle TCK "numClocks" times.
+ FLStatus neroClocks(
+ struct FLContext *handle, uint32 numClocks, const char **error
+ ) WARN_UNUSED_RESULT;
+
#ifdef __cplusplus
}
#endif

0 comments on commit c8f5445

Please sign in to comment.