lf: restore the graph buffer length along with its contents
restore_bufferS32() returns the length it put back and every graph-buffer caller dropped it, so g_GraphTraceLen kept whatever value the code between save and restore had left. In try_detect_modulation() that is the 160 sample psk antenna-settle trim: `data modulation` gave the buffer's samples back but left it 160 short, and a following demod lost round(160 / clk) bits off the end. check_chiptype() loses the same way through the acquisitions its detections make, on the `lf search` path, and for g_DemodBuffer too. demodTI() loses convLen + 16 on its error path. save_graphbuffer() / restore_graphbuffer() pair the length and grid offset with the contents so no call site has to remember them. The visa2000 and zx8211 sites do not change the length, so converting them is a no-op today and keeps the next one from being a bug. Regression test in tools/pm3_tests.sh: `data modulation` on a saved psk1 trace must leave all 20000 samples. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
1 parent
0884083530
commit
782d28932c
9 files changed
+39
-29
No files matched your search
@@ -2778,8 +2778,7 @@ static int try_detect_modulation(void) {
|
||||
clk = GetPskClock("", false);
|
||||
if (clk > 0) {
|
||||
// allow undo
|
||||
buffer_savestate_t saveState = save_bufferS32(g_GraphBuffer, g_GraphTraceLen);
|
||||
saveState.offset = g_GridOffset;
|
||||
buffer_savestate_t saveState = save_graphbuffer();
|
||||
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
|
||||
CmdLtrim("-i 160");
|
||||
if ((PSKDemod(0, 0, 6, false) == PM3_SUCCESS)) {
|
||||
@@ -2791,8 +2790,7 @@ static int try_detect_modulation(void) {
|
||||
tests[hits].carrier = GetPskCarrier(false);
|
||||
}
|
||||
//undo trim samples
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-5
@@ -1609,8 +1609,7 @@ static bool check_chiptype(bool getDeviceData) {
|
||||
}
|
||||
|
||||
//Save the state of the Graph and Demod Buffers
|
||||
buffer_savestate_t saveState_gb = save_bufferS32(g_GraphBuffer, g_GraphTraceLen);
|
||||
saveState_gb.offset = g_GridOffset;
|
||||
buffer_savestate_t saveState_gb = save_graphbuffer();
|
||||
buffer_savestate_t saveState_db = save_buffer8(g_DemodBuffer, g_DemodBufferLen);
|
||||
saveState_db.clock = g_DemodClock;
|
||||
saveState_db.offset = g_DemodStartIdx;
|
||||
@@ -1683,12 +1682,12 @@ static bool check_chiptype(bool getDeviceData) {
|
||||
|
||||
PrintAndLogEx(INFO, "Couldn't identify a chipset");
|
||||
out:
|
||||
restore_buffer8(saveState_db, g_DemodBuffer);
|
||||
// the detections above demodulate, so the length comes back with the contents
|
||||
g_DemodBufferLen = restore_buffer8(saveState_db, g_DemodBuffer);
|
||||
g_DemodClock = saveState_db.clock;
|
||||
g_DemodStartIdx = saveState_db.offset;
|
||||
|
||||
restore_bufferS32(saveState_gb, g_GraphBuffer);
|
||||
g_GridOffset = saveState_gb.offset;
|
||||
restore_graphbuffer(saveState_gb);
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
@@ -89,8 +89,7 @@ int demodTI(bool verbose) {
|
||||
1, 1, 1, 1, 1, 1, 1, 1
|
||||
};
|
||||
|
||||
buffer_savestate_t saveState = save_bufferS32(g_GraphBuffer, g_GraphTraceLen);
|
||||
saveState.offset = g_GridOffset;
|
||||
buffer_savestate_t saveState = save_graphbuffer();
|
||||
|
||||
int lowLen = ARRAYLEN(LowTone);
|
||||
int highLen = ARRAYLEN(HighTone);
|
||||
@@ -278,8 +277,7 @@ int demodTI(bool verbose) {
|
||||
|
||||
out:
|
||||
if (retval != PM3_SUCCESS) {
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
}
|
||||
|
||||
return retval;
|
||||
|
||||
@@ -84,8 +84,7 @@ static uint8_t visa_parity(uint32_t id) {
|
||||
//see ASKDemod for what args are accepted
|
||||
int demodVisa2k(bool verbose) {
|
||||
(void) verbose; // unused so far
|
||||
buffer_savestate_t saveState = save_bufferS32(g_GraphBuffer, g_GraphTraceLen);
|
||||
saveState.offset = g_GridOffset;
|
||||
buffer_savestate_t saveState = save_graphbuffer();
|
||||
|
||||
//CmdAskEdgeDetect("");
|
||||
|
||||
@@ -93,8 +92,7 @@ int demodVisa2k(bool verbose) {
|
||||
bool st = true;
|
||||
if (ASKDemod_ext(64, 0, 0, 0, false, false, false, 1, &st) != PM3_SUCCESS) {
|
||||
PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ASK/Manchester Demod failed");
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
size_t size = g_DemodBufferLen;
|
||||
@@ -109,8 +107,7 @@ int demodVisa2k(bool verbose) {
|
||||
else
|
||||
PrintAndLogEx(DEBUG, "DEBUG: Error - Visa2k: ans: %d", ans);
|
||||
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
setDemodBuff(g_DemodBuffer, 96, ans);
|
||||
@@ -128,8 +125,7 @@ int demodVisa2k(bool verbose) {
|
||||
// test checksums
|
||||
if (chk != calc) {
|
||||
PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 checksum (%s) %x - %x\n", _RED_("fail"), chk, calc);
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
// parity
|
||||
@@ -137,8 +133,7 @@ int demodVisa2k(bool verbose) {
|
||||
uint8_t chk_par = (raw3 & 0xFF0) >> 4;
|
||||
if (calc_par != chk_par) {
|
||||
PrintAndLogEx(DEBUG, "DEBUG: error: Visa2000 parity (%s) %x - %x\n", _RED_("fail"), chk_par, calc_par);
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
PrintAndLogEx(SUCCESS, "Visa2000 - Card " _GREEN_("%u") ", Raw: %08X%08X%08X", raw2, raw1, raw2, raw3);
|
||||
|
||||
@@ -41,8 +41,7 @@ static int CmdHelp(const char *Cmd);
|
||||
// see ASKDemod for what args are accepted
|
||||
int demodzx(bool verbose) {
|
||||
(void) verbose; // unused so far
|
||||
buffer_savestate_t saveState = save_bufferS32(g_GraphBuffer, g_GraphTraceLen);
|
||||
saveState.offset = g_GridOffset;
|
||||
buffer_savestate_t saveState = save_graphbuffer();
|
||||
|
||||
// CmdAskEdgeDetect("");
|
||||
|
||||
@@ -50,8 +49,7 @@ int demodzx(bool verbose) {
|
||||
bool st = true;
|
||||
if (ASKDemod_ext(64, 0, 0, 0, false, false, false, 1, &st) != PM3_SUCCESS) {
|
||||
PrintAndLogEx(DEBUG, "DEBUG: Error - ZX: ASK/Manchester Demod failed");
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
size_t size = g_DemodBufferLen;
|
||||
@@ -66,8 +64,7 @@ int demodzx(bool verbose) {
|
||||
else
|
||||
PrintAndLogEx(DEBUG, "DEBUG: Error - ZX: ans: %d", ans);
|
||||
|
||||
restore_bufferS32(saveState, g_GraphBuffer);
|
||||
g_GridOffset = saveState.offset;
|
||||
restore_graphbuffer(saveState);
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
setDemodBuff(g_DemodBuffer, 96, ans);
|
||||
|
||||
@@ -648,3 +648,21 @@ size_t restore_buffer8(buffer_savestate_t saveState, uint8_t *dest) {
|
||||
|
||||
return index;
|
||||
}
|
||||
|
||||
// Save/restore the graph buffer as a unit: contents, length and grid offset.
|
||||
// A caller that drops restore_bufferS32()'s return leaves g_GraphTraceLen short.
|
||||
buffer_savestate_t save_graphbuffer(void) {
|
||||
buffer_savestate_t saveState = save_bufferS32(g_GraphBuffer, g_GraphTraceLen);
|
||||
saveState.offset = g_GridOffset;
|
||||
return saveState;
|
||||
}
|
||||
|
||||
void restore_graphbuffer(buffer_savestate_t saveState) {
|
||||
size_t len = restore_bufferS32(saveState, g_GraphBuffer);
|
||||
if (len == 0) {
|
||||
// nothing was restored, so leave the buffer and its length alone
|
||||
return;
|
||||
}
|
||||
g_GraphTraceLen = len;
|
||||
g_GridOffset = saveState.offset;
|
||||
}
|
||||
@@ -67,6 +67,9 @@ size_t restore_buffer32(buffer_savestate_t saveState, uint32_t *dest);
|
||||
size_t restore_bufferS32(buffer_savestate_t saveState, int32_t *dest);
|
||||
size_t restore_buffer8(buffer_savestate_t saveState, uint8_t *dest);
|
||||
|
||||
buffer_savestate_t save_graphbuffer(void);
|
||||
void restore_graphbuffer(buffer_savestate_t saveState);
|
||||
|
||||
#define MAX_GRAPH_TRACE_LEN (40000 * 32)
|
||||
#define GRAPH_SAVE 1
|
||||
#define GRAPH_RESTORE 0
|
||||
|
||||
Reference in new issue
Block a user