mirror of
https://github.com/preble/libpinproc
synced 2026-02-22 18:15:25 +01:00
Merge branch 'dev' of github.com:preble/libpinproc into dev
Conflicts: utils/pinprocfw/pinprocfw.cpp
This commit is contained in:
@@ -3,9 +3,11 @@
|
||||
/* abstract: This file contains a description of the */
|
||||
/* data structure "lenval". */
|
||||
/*******************************************************/
|
||||
|
||||
#ifndef lenval_dot_h
|
||||
#define lenval_dot_h
|
||||
#ifndef PINPROCFW_LENVAL_H
|
||||
#define PINPROCFW_LENVAL_H
|
||||
#if !defined(__GNUC__) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4) // GCC supports "pragma once" correctly since 3.4
|
||||
#pragma once
|
||||
#endif
|
||||
|
||||
/* the lenVal structure is a byte oriented type used to store an */
|
||||
/* arbitrary length binary value. As an example, the hex value */
|
||||
@@ -90,5 +92,4 @@ extern void SetBit(lenVal *lv, int byte, int bit, short val);
|
||||
/* read from XSVF numBytes bytes of data into x */
|
||||
extern void readVal(lenVal *x, short numBytes);
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* PINPROCFW_LENVAL_H */
|
||||
|
||||
@@ -1271,7 +1271,7 @@ int xsvfDoXSIR2( SXsvfInfo* pXsvfInfo )
|
||||
readVal( &(pXsvfInfo->lvTdi), 2 );
|
||||
lShiftIrBits = value( &(pXsvfInfo->lvTdi) );
|
||||
sShiftIrBytes = xsvfGetAsNumBytes( lShiftIrBits );
|
||||
XSVFDBG_PRINTF1( 3, " XSIR2 length = %d\n", (int)lShiftIrBits);
|
||||
XSVFDBG_PRINTF1( 3, " XSIR2 length = %ld\n", lShiftIrBits);
|
||||
|
||||
if ( sShiftIrBytes > MAX_LEN )
|
||||
{
|
||||
|
||||
@@ -10,8 +10,11 @@
|
||||
* in the readByte() function.
|
||||
* FINALLY - Call xsvfExecute().
|
||||
*****************************************************************************/
|
||||
#ifndef PINPROCFW_H
|
||||
#define PINPROCFW_H
|
||||
#ifndef PINPROCFW_PINPROCFW_H
|
||||
#define PINPROCFW_PINPROCFW_H
|
||||
#if !defined(__GNUC__) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || (__GNUC__ >= 4) // GCC supports "pragma once" correctly since 3.4
|
||||
#pragma once
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__) || defined(_WIN32)
|
||||
#include <windows.h>
|
||||
@@ -67,5 +70,4 @@ void readByte(unsigned char *data);
|
||||
void waitTime(long microsec);
|
||||
|
||||
|
||||
#endif /* PINPROCFW_H */
|
||||
|
||||
#endif /* PINPROCFW_PINPROCFW_H */
|
||||
|
||||
Reference in New Issue
Block a user