Commit 6f0c4706 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180427-pull-request' into staging 



usb: ccid bugfix, misc small improvements.

# gpg: Signature made Fri 27 Apr 2018 11:20:18 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/usb-20180427-pull-request:
  ccid-card: include libcacard.h only
  Fix libusb-1.0.22 deprecated libusb_set_debug with libusb_set_option
  ccid: Fix dwProtocols advertisement of T=0

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 10f4718b 0f5c642d

configure

+1 −1
Original line number Diff line number Diff line
@@ -4478,7 +4478,7 @@ fi 


# check for smartcard support

if test "$smartcard" != "no"; then

    if $pkg_config libcacard; then

    if $pkg_config --atleast-version=2.5.1 libcacard; then

        libcacard_cflags=$($pkg_config --cflags libcacard)

        libcacard_libs=$($pkg_config --libs libcacard)

        smartcard="yes"

hw/usb/ccid-card-emulated.c

+1 −4
Original line number Diff line number Diff line
@@ -27,10 +27,7 @@ 
 */



#include "qemu/osdep.h"

#include <eventt.h>

#include <vevent.h>

#include <vreader.h>

#include <vcard_emul.h>

#include <libcacard.h>



#include "qemu/thread.h"

#include "qemu/main-loop.h"

hw/usb/ccid-card-passthru.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 */



#include "qemu/osdep.h"

#include <cacard/vscard_common.h>

#include <libcacard.h>

#include "chardev/char-fe.h"

#include "qemu/error-report.h"

#include "qemu/sockets.h"

hw/usb/dev-smartcard-reader.c

+2 −2
Original line number Diff line number Diff line
@@ -329,8 +329,8 @@ static const uint8_t qemu_ccid_descriptor[] = { 
                     */

        0x07,       /* u8  bVoltageSupport; 01h - 5.0v, 02h - 3.0, 03 - 1.8 */



        0x00, 0x00, /* u32 dwProtocols; RRRR PPPP. RRRR = 0000h.*/

        0x01, 0x00, /* PPPP: 0001h = Protocol T=0, 0002h = Protocol T=1 */

        0x01, 0x00, /* u32 dwProtocols; RRRR PPPP. RRRR = 0000h.*/

        0x00, 0x00, /* PPPP: 0001h = Protocol T=0, 0002h = Protocol T=1 */

                    /* u32 dwDefaultClock; in kHZ (0x0fa0 is 4 MHz) */

        0xa0, 0x0f, 0x00, 0x00,

                    /* u32 dwMaximumClock; */

hw/usb/host-libusb.c

+4 −0
Original line number Diff line number Diff line
@@ -247,7 +247,11 @@ static int usb_host_init(void) 
    if (rc != 0) {

        return -1;

    }

#if LIBUSB_API_VERSION >= 0x01000106

    libusb_set_option(ctx, LIBUSB_OPTION_LOG_LEVEL, loglevel);

#else

    libusb_set_debug(ctx, loglevel);

#endif

#ifdef CONFIG_WIN32

    /* FIXME: add support for Windows. */

#else