← Back to branch summary

~ubuntu-branches/ubuntu/precise/qemu-kvm/precise

« back to all changes in this revision

Viewing changes to hw/bt-hid.c

  • Committer: Serge Hallyn
  • Date: 2011-10-19 07:37:43 UTC
  • mfrom: (1.2.7)
  • Revision ID: serge.hallyn@ubuntu.com-20111019073743-7i7n9irsxlm38wic
Tags: 0.15.0+noroms-0ubuntu1
https://launchpad.net/bugs/878162
* New upstream release
* Remaining changes from upstream:
  - removed all binary roms and tests/pi_10.com
* Removed Detect-and-use-GCC-atomic-builtins-for-locking.patch - non-NPTL
  implementations were removed with commit
  02615337ef295443daa03233e492194e289a807e
* Drop spice-qxl-locking-fix-for-qemu-kvm.patch - should be unnecessary
  as of commit 196a778428989217b82de042725dc8eb29c8f8d8
* drop patches applied upstream:
  - CVE-2011-1751.diff
  - virtio-guard-against-negative-vq-notifies-CVE-2011-2512.diff
  - CVE-2011-2527.patch
  - fix-pa-configure.patch
* Refreshed the remaining patches:
  - larger_default_ram_size.patch
  - CVE-2011-2212-virtqueue-indirect-overflow.patch
  - qemuifup-fix-paths.patch
  - vpc.patch
* e1000-Dont-set-the-Capabilities-List-bit.patch - switched to the
  cherrypicked upstream patch (as the source file changed quite a bit,
  and the hand-ported patch backported to 0.14.1 does not apply).
* Drop qemu-kvm-spice (all changes from 0.14.1+noroms-0ubuntu7), it will
  need its own source package (LP: #878162)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/bt-hid.c
323
323
            break;
324
324
        }
325
325
        s->proto = parameter;
326
 
        s->usbdev->info->handle_control(s->usbdev, SET_PROTOCOL, s->proto, 0, 0,
 
326
        s->usbdev->info->handle_control(s->usbdev, NULL, SET_PROTOCOL, s->proto, 0, 0,
327
327
                                        NULL);
328
328
        ret = BT_HS_SUCCESSFUL;
329
329
        break;
333
333
            ret = BT_HS_ERR_INVALID_PARAMETER;
334
334
            break;
335
335
        }
336
 
        s->usbdev->info->handle_control(s->usbdev, GET_IDLE, 0, 0, 1,
 
336
        s->usbdev->info->handle_control(s->usbdev, NULL, GET_IDLE, 0, 0, 1,
337
337
                        s->control->sdu_out(s->control, 1));
338
338
        s->control->sdu_submit(s->control);
339
339
        break;
346
346
 
347
347
        /* We don't need to know about the Idle Rate here really,
348
348
         * so just pass it on to the device.  */
349
 
        ret = s->usbdev->info->handle_control(s->usbdev,
 
349
        ret = s->usbdev->info->handle_control(s->usbdev, NULL,
350
350
                        SET_IDLE, data[1], 0, 0, NULL) ?
351
351
                BT_HS_SUCCESSFUL : BT_HS_ERR_INVALID_PARAMETER;
352
352
        /* XXX: Does this generate a handshake? */