vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/usb: Use the IEC binary prefix definitions 

It eases code review, unit is explicit.

Patch generated using:

  $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/

and modified manually.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180625124238.25339-36-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Philippe Mathieu-Daudé 2018-06-25 09:42:27 -03:00 committed by Paolo Bonzini
parent 872a2b7c4d
commit 246e195b52
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/usb/ccid-card-passthru.c
View File

@ -9,6 +9,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include <libcacard.h> #include <libcacard.h>
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
@ -40,7 +41,7 @@ static const uint8_t DEFAULT_ATR[] = {
0x13, 0x08 0x13, 0x08
}; };
#define VSCARD_IN_SIZE 65536 #define VSCARD_IN_SIZE (64 * KiB)
/* maximum size of ATR - from 7816-3 */ /* maximum size of ATR - from 7816-3 */
#define MAX_ATR_SIZE 40 #define MAX_ATR_SIZE 40
@ -275,8 +276,8 @@ static void ccid_card_vscard_read(void *opaque, const uint8_t *buf, int size)
VSCMsgHeader *hdr; VSCMsgHeader *hdr;
if (card->vscard_in_pos + size > VSCARD_IN_SIZE) { if (card->vscard_in_pos + size > VSCARD_IN_SIZE) {
error_report( error_report("no room for data: pos %u + size %d > %" PRId64 "."
"no room for data: pos %d + size %d > %d. dropping connection.", " dropping connection.",
card->vscard_in_pos, size, VSCARD_IN_SIZE); card->vscard_in_pos, size, VSCARD_IN_SIZE);
ccid_card_vscard_drop_connection(card); ccid_card_vscard_drop_connection(card);
return; return;

3
hw/usb/combined-packet.c
View File

@ -20,6 +20,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "qemu/iov.h" #include "qemu/iov.h"
@ -171,7 +172,7 @@ void usb_ep_combine_input_packets(USBEndpoint *ep)
if ((p->iov.size % ep->max_packet_size) != 0 || !p->short_not_ok || if ((p->iov.size % ep->max_packet_size) != 0 || !p->short_not_ok ||
next == NULL || next == NULL ||
/* Work around for Linux usbfs bulk splitting + migration */ /* Work around for Linux usbfs bulk splitting + migration */
(totalsize == 16348 && p->int_req)) { (totalsize == (16 * KiB - 36) && p->int_req)) {
usb_device_handle_data(ep->dev, first); usb_device_handle_data(ep->dev, first);
assert(first->status == USB_RET_ASYNC); assert(first->status == USB_RET_ASYNC);
if (first->combined) { if (first->combined) {

3
hw/usb/dev-smartcard-reader.c
View File

@ -35,6 +35,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
@ -63,7 +64,7 @@ do { \
* or handle the migration complexity - VMState doesn't handle this case. * or handle the migration complexity - VMState doesn't handle this case.
* sizes are expected never to be exceeded, unless guest misbehaves. * sizes are expected never to be exceeded, unless guest misbehaves.
*/ */
#define BULK_OUT_DATA_SIZE 65536 #define BULK_OUT_DATA_SIZE (64 * KiB)
#define PENDING_ANSWERS_NUM 128 #define PENDING_ANSWERS_NUM 128
#define BULK_IN_BUF_SIZE 384 #define BULK_IN_BUF_SIZE 384

3
hw/usb/redirect.c
View File

@ -26,6 +26,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/timer.h" #include "qemu/timer.h"
@ -1298,7 +1299,7 @@ static int usbredir_chardev_can_read(void *opaque)
} }
/* usbredir_parser_do_read will consume *all* data we give it */ /* usbredir_parser_do_read will consume *all* data we give it */
return 1024 * 1024; return 1 * MiB;
} }
static void usbredir_chardev_read(void *opaque, const uint8_t *buf, int size) static void usbredir_chardev_read(void *opaque, const uint8_t *buf, int size)