utils/openzwave/patches/901_no-hidcontroller.patch

   1 --- a/cpp/src/Driver.cpp
   2 +++ b/cpp/src/Driver.cpp
   3 @@ -37,11 +37,6 @@
   4  #include "platform/Event.h"
   5  #include "platform/Mutex.h"
   6  #include "platform/SerialController.h"
   7 -#ifdef WINRT
   8 -#include "platform/winRT/HidControllerWinRT.h"
   9 -#else
  10 -#include "platform/HidController.h"
  11 -#endif
  12  #include "platform/Thread.h"
  13  #include "platform/Log.h"
  14  #include "platform/TimeStamp.h"
  15 @@ -223,14 +218,7 @@ m_nonceReportSentAttempt( 0 )
  16
  17         initNetworkKeys(false);
  18
  19 -       if( ControllerInterface_Hid == _interface )
  20 -       {
  21 -               m_controller = new HidController();
  22 -       }
  23 -       else
  24 -       {
  25 -               m_controller = new SerialController();
  26 -       }
  27 +       m_controller = new SerialController();
  28         m_controller->SetSignalThreshold( 1 );
  29
  30         Options::Get()->GetOptionAsBool( "NotifyTransactions", &m_notifytransactions );
  31 --- a/cpp/build/Makefile
  32 +++ b/cpp/build/Makefile
  33 @@ -66,16 +66,7 @@ CFLAGS  += $(CPPFLAGS)
  34  #where to put the temporary library
  35  LIBDIR ?= $(top_builddir)
  36
  37 -INCLUDES       := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/
  38 -
  39 -ifeq ($(UNAME),Darwin)
  40 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
  41 -else ifeq ($(UNAME),FreeBSD)
  42 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
  43 -else
  44 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
  45 -endif
  46 -
  47 +INCLUDES       := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/
  48
  49  SOURCES                := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \
  50         $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
  51 @@ -85,14 +76,6 @@ VPATH = $(top_srcdir)/cpp/src:$(top_srcd
  52
  53  tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
  54
  55 -ifeq ($(UNAME),Darwin)
  56 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/mac/*.c))
  57 -else ifeq ($(UNAME),FreeBSD)
  58 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
  59 -else
  60 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/linux/*.c)) # we do not want the libusb version
  61 -endif
  62 -
  63  cclasses := $(notdir $(wildcard $(top_srcdir)/cpp/src/command_classes/*.cpp))
  64  vclasses := $(notdir $(wildcard $(top_srcdir)/cpp/src/value_classes/*.cpp))
  65  pform := $(notdir $(wildcard $(top_srcdir)/cpp/src/platform/*.cpp)) \
  66 @@ -111,7 +94,6 @@ printversion:
  67
  68
  69  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(tinyxml))
  70 --include $(patsubst %.c,$(DEPDIR)/%.d,$(hidapi))
  71  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(cclasses))
  72  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(vclasses))
  73  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(pform))
  74 @@ -131,7 +113,6 @@ $(top_srcdir)/cpp/src/vers.cpp:
  75  #$(OBJDIR)/vers.o:     $(top_builddir)/vers.cpp
  76
  77  $(LIBDIR)/libopenzwave.a:      $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
  78 -                       $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
  79                         $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
  80                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
  81                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
  82 @@ -143,7 +124,6 @@ $(LIBDIR)/libopenzwave.a:   $(patsubst %.c
  83         @$(RANLIB) $@
  84
  85  $(LIBDIR)/$(SHARED_LIB_NAME):  $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
  86 -                       $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
  87                         $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
  88                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
  89                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \