Version 1.16.11

This commit is contained in:
Ulf Frisk
2024-02-04 19:14:58 +01:00
parent aadc785a90
commit d68b85bb62
5 changed files with 17 additions and 15 deletions

View File

@@ -3,8 +3,8 @@
#define VERSION_MAJOR 2
#define VERSION_MINOR 16
#define VERSION_REVISION 10
#define VERSION_BUILD 61
#define VERSION_REVISION 11
#define VERSION_BUILD 62
#define VER_FILE_DESCRIPTION_STR "LeechAgent Memory Acquisition Service"
#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD

View File

@@ -3548,7 +3548,7 @@ BOOL DeviceFPGA_Open(_Inout_ PLC_CONTEXT ctxLC, _Out_opt_ PPLC_CONFIG_ERRORINFO
PLC_DEVICE_PARAMETER_ENTRY pParam;
BOOL fFT601 = FALSE, fCustomDriver = FALSE;
BYTE pb200[0x200];
WORD wDeviceVendorId, wDeviceDeviceId;
DWORD dwVIDPID;
if(ppLcCreateErrorInfo) { *ppLcCreateErrorInfo = NULL; }
ctx = LocalAlloc(LMEM_ZEROINIT, sizeof(DEVICE_CONTEXT_FPGA));
if(!ctx) { return FALSE; }
@@ -3617,10 +3617,9 @@ BOOL DeviceFPGA_Open(_Inout_ PLC_CONTEXT ctxLC, _Out_opt_ PPLC_CONFIG_ERRORINFO
if(ctxLC->fPrintf[LC_PRINTF_V]) {
*(PDWORD)pb200 = 0;
DeviceFPGA_PCIeCfgSpaceCoreRead(ctx, pb200, 0x80000000 | 0);
wDeviceVendorId = *(PWORD)pb200;
wDeviceDeviceId = *(PWORD)(pb200 + 2);
dwVIDPID = *(PDWORD)pb200;
lcprintfv(ctxLC,
"DEVICE: FPGA: %s PCIe gen%i x%i [%i,%i,%i] [v%i.%i,%04x] [%s,%s] [%04x:%04x]\n",
"DEVICE: FPGA: %s PCIe gen%i x%i [%i,%i,%i] [v%i.%i,%04x] [%s,%s%s]\n",
ctx->perf.SZ_DEVICE_NAME,
DeviceFPGA_PHY_GetPCIeGen(ctx),
DeviceFPGA_PHY_GetLinkWidth(ctx),
@@ -3632,8 +3631,7 @@ BOOL DeviceFPGA_Open(_Inout_ PLC_CONTEXT ctxLC, _Out_opt_ PPLC_CONFIG_ERRORINFO
ctx->wDeviceId,
(ctx->async2.fEnabled ? "ASYNC" : "SYNC"),
(ctx->fAlgorithmReadTiny ? "TINY" : "NORM"),
wDeviceVendorId,
wDeviceDeviceId
((!dwVIDPID || (dwVIDPID == 0x066610ee)) ? "" : ",FWCUST")
);
}
if(ctxLC->fPrintf[LC_PRINTF_VV]) {
@@ -3645,13 +3643,17 @@ fail:
DeviceFPGA_ConfigPrint(ctxLC, ctx);
}
if(szDeviceError && ctxLC->fPrintf[LC_PRINTF_V]) {
*(PDWORD)pb200 = 0;
DeviceFPGA_PCIeCfgSpaceCoreRead(ctx, pb200, 0x80000000 | 0);
dwVIDPID = *(PDWORD)pb200;
lcprintfv(ctxLC,
"DEVICE: FPGA: ERROR: %s [%i,v%i.%i,%04x]\n",
"DEVICE: FPGA: ERROR: %s [%i,v%i.%i,%04x%s]\n",
szDeviceError,
ctx->wFpgaID,
ctx->wFpgaVersionMajor,
ctx->wFpgaVersionMinor,
ctx->wDeviceId);
ctx->wDeviceId,
((!dwVIDPID || (dwVIDPID == 0x066610ee)) ? "" : ",FWCUST"));
}
DeviceFPGA_Close(ctxLC);
return FALSE;

View File

@@ -3,8 +3,8 @@
#define VERSION_MAJOR 2
#define VERSION_MINOR 16
#define VERSION_REVISION 10
#define VERSION_BUILD 61
#define VERSION_REVISION 11
#define VERSION_BUILD 62
#define VER_FILE_DESCRIPTION_STR "LeechCore Memory Acquisition Library"
#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD

View File

@@ -39,7 +39,7 @@ leechcorepyc = Extension(
setup(
name='leechcorepyc',
version='2.16.10', # VERSION_END
version='2.16.11', # VERSION_END
description='LeechCore for Python',
long_description='LeechCore for Python : native extension for physical memory access',
url='https://github.com/ufrisk/LeechCore',

View File

@@ -3,8 +3,8 @@
#define VERSION_MAJOR 2
#define VERSION_MINOR 16
#define VERSION_REVISION 10
#define VERSION_BUILD 61
#define VERSION_REVISION 11
#define VERSION_BUILD 62
#define VER_FILE_DESCRIPTION_STR "LeechCore Memory Acquisition Library : Python API"
#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD