BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input/trace32_ad: Use only hex offsets

This commit is contained in:
Soeren Apel 2019-03-24 13:48:44 +01:00
parent d025fce937
commit 628dc330bc
1 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
src/input/trace32_ad.c
View File

@ -212,22 +212,22 @@ static int process_header(GString *buf, struct context *inc)
enum ad_format format; enum ad_format format;
/* /*
* 00-31 (0x00-1F) file format name * 0x00-1F file format name
* 32-39 (0x20-27) trigger timestamp u64 * 0x20 u64 trigger timestamp
* 40-47 (0x28-2F) unused * 0x28-2F unused
* 48 (0x30) compression * 0x30 u8 compression
* 49-53 (0x31-35) ?? * 0x31-35 ??
* 50 (0x32) 0x00 (PI), 0x01 (iprobe) * 0x32 u8 0x00 (PI), 0x01 (iprobe)
* 54 (0x36) 0x08 (PI 250/500), 0x0A (iprobe 250) * 0x36 u8 0x08 (PI 250/500), 0x0A (iprobe 250)
* 55 (0x37) 0x00 (250), 0x01 (500) * 0x37 u8 0x00 (250), 0x01 (500)
* 56 (0x38) record size u8 * 0x38 u8 record size
* 57-59 (0x39-3B) const 0x00 * 0x39-3B const 0x00
* 60-63 (0x3C-3F) number of records u32 * 0x3C u32 number of records
* 64-67 (0x40-43) id of last record s32 * 0x40 s32 id of last record
* 68-77 (0x44-4D) ?? * 0x44-4D ??
* 71 (0x47) const 0x80=128 * 0x47 u8 const 0x80=128
* 72 (0x48) const 0x01 * 0x48 u8 const 0x01
* 78-79 (0x4E-4F) ?? * 0x4E-4F ??
*/ */
/* /*
@ -283,7 +283,7 @@ static int process_header(GString *buf, struct context *inc)
sr_dbg("File says it's \"%s\" -> format type %u.", p, format); sr_dbg("File says it's \"%s\" -> format type %u.", p, format);
g_free(p); g_free(p);
record_size = R8(buf->str + 56); record_size = R8(buf->str + 0x38);
device_id = 0; device_id = 0;
if (g_strcmp0(format_name, "trace32 power integrator data") == 0) { if (g_strcmp0(format_name, "trace32 power integrator data") == 0) {
@ -310,12 +310,12 @@ static int process_header(GString *buf, struct context *inc)
inc->format = format; inc->format = format;
inc->device = device_id; inc->device = device_id;
inc->trigger_timestamp = RL64(buf->str + 32); inc->trigger_timestamp = RL64(buf->str + 0x20);
inc->compression = R8(buf->str + 48); /* Maps to the enum. */ inc->compression = R8(buf->str + 0x30); /* Maps to the enum. */
inc->record_mode = R8(buf->str + 55); /* Maps to the enum. */ inc->record_mode = R8(buf->str + 0x37); /* Maps to the enum. */
inc->record_size = record_size; inc->record_size = record_size;
inc->record_count = RL32(buf->str + 60); inc->record_count = RL32(buf->str + 0x3C);
inc->last_record = RL32S(buf->str + 64); inc->last_record = RL32S(buf->str + 0x40);
sr_dbg("Trigger occured at %lf s.", sr_dbg("Trigger occured at %lf s.",
inc->trigger_timestamp * TIMESTAMP_RESOLUTION); inc->trigger_timestamp * TIMESTAMP_RESOLUTION);
@ -417,36 +417,36 @@ static void process_record_pi(struct sr_input *in, gsize start)
buf = in->buf; buf = in->buf;
/* /*
* 00-07 timestamp * 0x00 u8 timestamp
* 08-09 A15..0 * 0x08 u16 A15..0
* 10-11 B15..0 * 0x0A u16 B15..0
* 12-13 C15..0 * 0x0C u16 C15..0
* 14-15 D15..0 * 0x0E u16 D15..0
* 16-17 E15..0 * 0x10 u16 E15..0
* 18-19 F15..0 * 0x12 u16 F15..0
* 20-23 ?? * 0x14 u32 ??
* 24-25 J15..0 Not present in 500MHz mode * 0x18 u16 J15..0 Not present in 500MHz mode
* 26-27 K15..0 Not present in 500MHz mode * 0x1A u16 K15..0 Not present in 500MHz mode
* 28-29 L15..0 Not present in 500MHz mode * 0x1C u16 L15..0 Not present in 500MHz mode
* 30-31 M15..0 Not present in 500MHz mode * 0x1E u16 M15..0 Not present in 500MHz mode
* 32-33 N15..0 Not present in 500MHz mode * 0x20 u16 N15..0 Not present in 500MHz mode
* 34-35 O15..0 Not present in 500MHz mode * 0x22 u16 O15..0 Not present in 500MHz mode
* 36-39 ?? Not present in 500MHz mode * 0x24 u32 ?? Not present in 500MHz mode
* 40/24 CLKF..A (32=CLKF, .., 1=CLKA) * 0x28/18 u8 CLKF..A (32=CLKF, .., 1=CLKA)
* 41 CLKO..J (32=CLKO, .., 1=CLKJ) Not present in 500MHz mode * 0x29/1A u8 CLKO..J (32=CLKO, .., 1=CLKJ) Not present in 500MHz mode
* 42/25 ?? * 0x2A/19 u8 ??
* 43/26 ?? * 0x2B/1A u8 ??
* 44/27 ?? * 0x2C/1B u8 ??
*/ */
timestamp = RL64(buf->str + start); timestamp = RL64(buf->str + start);
if (inc->record_mode == AD_MODE_500MHZ) { if (inc->record_mode == AD_MODE_500MHZ) {
pod_count = 6; pod_count = 6;
clk_offset = 24; clk_offset = 0x18;
} else { } else {
pod_count = 12; pod_count = 12;
clk_offset = 40; clk_offset = 0x28;
} }
payload_bit = 0; payload_bit = 0;
@ -459,52 +459,52 @@ static void process_record_pi(struct sr_input *in, gsize start)
switch (pod) { switch (pod) {
case 0: /* A */ case 0: /* A */
pod_data = RL16(buf->str + start + 8); pod_data = RL16(buf->str + start + 0x08);
pod_data |= (RL16(buf->str + start + clk_offset) & 1) << 16; pod_data |= (RL16(buf->str + start + clk_offset) & 1) << 16;
break; break;
case 1: /* B */ case 1: /* B */
pod_data = RL16(buf->str + start + 10); pod_data = RL16(buf->str + start + 0x0A);
pod_data |= (RL16(buf->str + start + clk_offset) & 2) << 15; pod_data |= (RL16(buf->str + start + clk_offset) & 2) << 15;
break; break;
case 2: /* C */ case 2: /* C */
pod_data = RL16(buf->str + start + 12); pod_data = RL16(buf->str + start + 0x0C);
pod_data |= (RL16(buf->str + start + clk_offset) & 4) << 14; pod_data |= (RL16(buf->str + start + clk_offset) & 4) << 14;
break; break;
case 3: /* D */ case 3: /* D */
pod_data = RL16(buf->str + start + 14); pod_data = RL16(buf->str + start + 0x0E);
pod_data |= (RL16(buf->str + start + clk_offset) & 8) << 13; pod_data |= (RL16(buf->str + start + clk_offset) & 8) << 13;
break; break;
case 4: /* E */ case 4: /* E */
pod_data = RL16(buf->str + start + 16); pod_data = RL16(buf->str + start + 0x10);
pod_data |= (RL16(buf->str + start + clk_offset) & 16) << 12; pod_data |= (RL16(buf->str + start + clk_offset) & 16) << 12;
break; break;
case 5: /* F */ case 5: /* F */
pod_data = RL16(buf->str + start + 18); pod_data = RL16(buf->str + start + 0x12);
pod_data |= (RL16(buf->str + start + clk_offset) & 32) << 11; pod_data |= (RL16(buf->str + start + clk_offset) & 32) << 11;
break; break;
case 6: /* J */ case 6: /* J */
pod_data = RL16(buf->str + start + 24); pod_data = RL16(buf->str + start + 0x18);
pod_data |= (RL16(buf->str + start + 41) & 1) << 16; pod_data |= (RL16(buf->str + start + 0x29) & 1) << 16;
break; break;
case 7: /* K */ case 7: /* K */
pod_data = RL16(buf->str + start + 26); pod_data = RL16(buf->str + start + 0x1A);
pod_data |= (RL16(buf->str + start + 41) & 2) << 15; pod_data |= (RL16(buf->str + start + 0x29) & 2) << 15;
break; break;
case 8: /* L */ case 8: /* L */
pod_data = RL16(buf->str + start + 28); pod_data = RL16(buf->str + start + 0x1C);
pod_data |= (RL16(buf->str + start + 41) & 4) << 14; pod_data |= (RL16(buf->str + start + 0x29) & 4) << 14;
break; break;
case 9: /* M */ case 9: /* M */
pod_data = RL16(buf->str + start + 30); pod_data = RL16(buf->str + start + 0x1E);
pod_data |= (RL16(buf->str + start + 41) & 8) << 13; pod_data |= (RL16(buf->str + start + 0x29) & 8) << 13;
break; break;
case 10: /* N */ case 10: /* N */
pod_data = RL16(buf->str + start + 32); pod_data = RL16(buf->str + start + 0x20);
pod_data |= (RL16(buf->str + start + 41) & 16) << 12; pod_data |= (RL16(buf->str + start + 0x29) & 16) << 12;
break; break;
case 11: /* O */ case 11: /* O */
pod_data = RL16(buf->str + start + 34); pod_data = RL16(buf->str + start + 0x22);
pod_data |= (RL16(buf->str + start + 41) & 32) << 11; pod_data |= (RL16(buf->str + start + 0x29) & 32) << 11;
break; break;
default: default:
sr_err("Don't know how to obtain data for pod %d.", pod); sr_err("Don't know how to obtain data for pod %d.", pod);
@ -575,15 +575,15 @@ static void process_record_iprobe(struct sr_input *in, gsize start)
inc = in->priv; inc = in->priv;
/* /*
* 00-07 timestamp * 0x00 u64 timestamp
* 08-09 IP15..0 * 0x08 u16 IP15..0
* 10 CLK * 0x0A u8 CLK
*/ */
timestamp = RL64(in->buf->str + start); timestamp = RL64(in->buf->str + start);
single_payload[0] = R8(in->buf->str + start + 8); single_payload[0] = R8(in->buf->str + start + 0x08);
single_payload[1] = R8(in->buf->str + start + 9); single_payload[1] = R8(in->buf->str + start + 0x09);
single_payload[2] = R8(in->buf->str + start + 10) & 1; single_payload[2] = R8(in->buf->str + start + 0x0A) & 1;
payload_len = 3; payload_len = 3;
if (timestamp == inc->trigger_timestamp && !inc->trigger_sent) { if (timestamp == inc->trigger_timestamp && !inc->trigger_sent) {