From 214d9db2a3a2c28ee385454f80c53f7fab290bf8 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Mon, 24 Apr 2017 13:19:46 +0200
Subject: Use alternative device connection check

Do not use hid_enumarate under OSX
Hidapi: do not call event loop on OSX

Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
---
 device.cc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'device.cc')

diff --git a/device.cc b/device.cc
index 101ebd0..1c87f7f 100644
--- a/device.cc
+++ b/device.cc
@@ -145,16 +145,18 @@ bool Device::could_be_enumerated() {
   if (mp_devhandle==nullptr){
     return false;
   }
+#ifndef __APPLE__
   auto pInfo = hid_enumerate(m_vid, m_pid);
   if (pInfo != nullptr){
     hid_free_enumeration(pInfo);
     return true;
   }
   return false;
-
-//  alternative:
-//  unsigned char buf[1];
-//  return hid_read_timeout(mp_devhandle, buf, sizeof(buf), 20) != -1;
+#else
+//  alternative for OSX
+  unsigned char buf[1];
+  return hid_read_timeout(mp_devhandle, buf, sizeof(buf), 20) != -1;
+#endif
 }
 
 void Device::show_stats() {
-- 
cgit v1.2.1