From 9d65df904859bfab6ce8572a7784d68cefb8fa74 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Thu, 4 Nov 2021 16:46:38 +0100
Subject: [PATCH] util.h has conflicting ioctl def on comma two

old-commit-hash: c2b95ca6a1c8df3ab3817e71f1d8f53e8ef8793a
---
 selfdrive/modeld/thneed/thneed.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/selfdrive/modeld/thneed/thneed.cc b/selfdrive/modeld/thneed/thneed.cc
index a3588f1d1f..a934094ecc 100644
--- a/selfdrive/modeld/thneed/thneed.cc
+++ b/selfdrive/modeld/thneed/thneed.cc
@@ -11,7 +11,6 @@
 
 #include "selfdrive/common/clutil.h"
 #include "selfdrive/common/timing.h"
-#include "selfdrive/common/util.h"
 //#define RUN_DISASSEMBLER
 //#define RUN_OPTIMIZER
 
@@ -24,7 +23,11 @@ map<cl_program, string> g_program_source;
 void hexdump(uint8_t *d, int len) {
   assert((len%4) == 0);
   printf("  dumping %p len 0x%x\n", d, len);
-  printf("%s\n", util::hexdump(d, len).c_str());
+  for (int i = 0; i < len/4; i++) {
+    if (i != 0 && (i%0x10) == 0) printf("\n");
+    printf("%8x ", d[i]);
+  }
+  printf("\n");
 }
 
 // *********** ioctl interceptor ***********