[Spice-devel] [PATCH 4/5] usbdk: Add UsbDk hider interface wrapper

Christophe Fergeau cfergeau at redhat.com
Tue Jun 2 02:16:37 PDT 2015


On Mon, Jun 01, 2015 at 11:47:40AM -0500, Jonathon Jongsma wrote:
> On Thu, 2015-05-28 at 13:24 +0300, Kirill Moizik wrote:
> > From: Dmitry Fleytman <dmitry at daynix.com>
> > 
> > add UsbDkDataHider.h UsbDkHelperHider.h usbdk_api.h usbdk_api.c files
> > to allow hide devices according  auto redirect rule functionality
> > 
> > Signed-off-by: Kirill Moizik <kirill at daynix.com>
> > Signed-off-by: Dmitry Fleytman <dmitry at daynix.com>
> > ---
> >  gtk/Makefile.am              |   2 +
> >  gtk/UsbDk/UsbDkDataHider.h   |  35 +++++++++++++++
> >  gtk/UsbDk/UsbDkHelperHider.h | 105 +++++++++++++++++++++++++++++++++++++++++++
> >  gtk/usbdk_api.c              |  77 +++++++++++++++++++++++++++++++
> >  gtk/usbdk_api.h              |  42 +++++++++++++++++
> >  5 files changed, 261 insertions(+)
> >  create mode 100644 gtk/UsbDk/UsbDkDataHider.h
> >  create mode 100644 gtk/UsbDk/UsbDkHelperHider.h
> >  create mode 100644 gtk/usbdk_api.c
> >  create mode 100644 gtk/usbdk_api.h
> > 
> > diff --git a/gtk/Makefile.am b/gtk/Makefile.am
> > index ed35f47..83473ac 100644
> > --- a/gtk/Makefile.am
> > +++ b/gtk/Makefile.am
> > @@ -369,6 +369,8 @@ WIN_USB_FILES= \
> >  	win-usb-clerk.h			\
> >  	win-usb-driver-install.h	\
> >  	win-usb-driver-install.c	\
> > +	usbdk_api.h			\
> > +	usbdk_api.c			\
> >  	$(NULL)
> >  
> >  if OS_WIN32
> > diff --git a/gtk/UsbDk/UsbDkDataHider.h b/gtk/UsbDk/UsbDkDataHider.h
> > new file mode 100644
> > index 0000000..b2a7e55
> > --- /dev/null
> > +++ b/gtk/UsbDk/UsbDkDataHider.h
> > @@ -0,0 +1,35 @@
> > +/**********************************************************************
> > +* Copyright (c) 2013-2014  Red Hat, Inc.
> > +*
> > +* Developed by Daynix Computing LTD.
> > +*
> > +* Authors:
> > +*     Dmitry Fleytman <dmitry at daynix.com>
> > +*     Kirill Moizik <kirill at daynix.com>
> > +*
> > +* Licensed under the Apache License, Version 2.0 (the "License");
> > +* you may not use this file except in compliance with the License.
> > +* You may obtain a copy of the License at
> > +*
> > +* http://www.apache.org/licenses/LICENSE-2.0
> > +*
> > +* Unless required by applicable law or agreed to in writing, software
> > +* distributed under the License is distributed on an "AS IS" BASIS,
> > +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
> > +* See the License for the specific language governing permissions and
> > +* limitations under the License.
> > +*
> > +**********************************************************************/
> 
> Is there a reason that you chose an Apache license for this code? The
> rest of spice-gtk is licensed under the LGPL. I'm not an expert in
> licensing, so I don't really know whether Apache 2.0 is compatible with
> LGPL. But it would be simpler if we didn't have to spend the time
> figuring it out ;)

Looking at these 2 files, it seems only

typedef struct tag_USB_DK_HIDE_RULE
{
    ULONG64 Hide;
    ULONG64 Class;
    ULONG64 VID;
    ULONG64 PID;
    ULONG64 BCD;
} USB_DK_HIDE_RULE, *PUSB_DK_HIDE_RULE;

is used by the rest of the code, I guess I'd just get rid of this header file, and
add that structure definition to usbdk_wrapper.h

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150602/6042a4f5/attachment.sig>


More information about the Spice-devel mailing list