error: Parse ring name before gtt_offset

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2011-01-09 13:26:50 +00:00
parent d9ec63b1a0
commit 98eb5a5e24

View File

@ -223,12 +223,17 @@ read_data_file (FILE *file)
int is_batch = 1; int is_batch = 1;
while (getline (&line, &line_size, file) > 0) { while (getline (&line, &line_size, file) > 0) {
char *dashes;
line_number++; line_number++;
matched = sscanf (line, "--- gtt_offset = 0x%08x\n", &new_gtt_offset); dashes = strstr(line, "---");
if (dashes) {
matched = sscanf (dashes, "--- gtt_offset = 0x%08x\n",
&new_gtt_offset);
if (matched == 1) { if (matched == 1) {
if (count) { if (count) {
printf("%s at 0x%08x:\n", buffer_type[is_batch], gtt_offset); printf("%s at 0x%08x:\n",
buffer_type[is_batch], gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); intel_decode (data, count, gtt_offset, devid, 0);
count = 0; count = 0;
} }
@ -237,10 +242,12 @@ read_data_file (FILE *file)
continue; continue;
} }
matched = sscanf (line, "--- ringbuffer = 0x%08x\n", &new_gtt_offset); matched = sscanf (dashes, "--- ringbuffer = 0x%08x\n",
&new_gtt_offset);
if (matched == 1) { if (matched == 1) {
if (count) { if (count) {
printf("%s at 0x%08x:\n", buffer_type[is_batch], gtt_offset); printf("%s at 0x%08x:\n",
buffer_type[is_batch], gtt_offset);
intel_decode (data, count, gtt_offset, devid, 0); intel_decode (data, count, gtt_offset, devid, 0);
count = 0; count = 0;
} }
@ -248,6 +255,7 @@ read_data_file (FILE *file)
is_batch = 0; is_batch = 0;
continue; continue;
} }
}
matched = sscanf (line, "%08x : %08x", &offset, &value); matched = sscanf (line, "%08x : %08x", &offset, &value);
if (matched != 2) { if (matched != 2) {