Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
hw
/
usb
/
ccid-card-passthru.c
diff --git
a/qemu/hw/usb/ccid-card-passthru.c
b/qemu/hw/usb/ccid-card-passthru.c
index
85a4fc3
..
c0e90e5
100644
(file)
--- a/
qemu/hw/usb/ccid-card-passthru.c
+++ b/
qemu/hw/usb/ccid-card-passthru.c
@@
-8,11
+8,12
@@
* See the COPYING file in the top-level directory.
*/
* See the COPYING file in the top-level directory.
*/
+#include "qemu/osdep.h"
#include "sysemu/char.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
#include "ccid.h"
#include "sysemu/char.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
#include "ccid.h"
-#include "
lib
cacard/vscard_common.h"
+#include "cacard/vscard_common.h"
#define DPRINTF(card, lvl, fmt, ...) \
do { \
#define DPRINTF(card, lvl, fmt, ...) \
do { \
@@
-38,8
+39,6
@@
static const uint8_t DEFAULT_ATR[] = {
0x13, 0x08
};
0x13, 0x08
};
-
-#define PASSTHRU_DEV_NAME "ccid-card-passthru"
#define VSCARD_IN_SIZE 65536
/* maximum size of ATR - from 7816-3 */
#define VSCARD_IN_SIZE 65536
/* maximum size of ATR - from 7816-3 */
@@
-58,6
+57,10
@@
struct PassthruState {
uint8_t debug;
};
uint8_t debug;
};
+#define TYPE_CCID_PASSTHRU "ccid-card-passthru"
+#define PASSTHRU_CCID_CARD(obj) \
+ OBJECT_CHECK(PassthruState, (obj), TYPE_CCID_PASSTHRU)
+
/*
* VSCard protocol over chardev
* This code should not depend on the card type.
/*
* VSCard protocol over chardev
* This code should not depend on the card type.
@@
-316,7
+319,7
@@
static void ccid_card_vscard_event(void *opaque, int event)
static void passthru_apdu_from_guest(
CCIDCardState *base, const uint8_t *apdu, uint32_t len)
{
static void passthru_apdu_from_guest(
CCIDCardState *base, const uint8_t *apdu, uint32_t len)
{
- PassthruState *card =
DO_UPCAST(PassthruState, base,
base);
+ PassthruState *card =
PASSTHRU_CCID_CARD(
base);
if (!card->cs) {
printf("ccid-passthru: no chardev, discarding apdu length %d\n", len);
if (!card->cs) {
printf("ccid-passthru: no chardev, discarding apdu length %d\n", len);
@@
-327,7
+330,7
@@
static void passthru_apdu_from_guest(
static const uint8_t *passthru_get_atr(CCIDCardState *base, uint32_t *len)
{
static const uint8_t *passthru_get_atr(CCIDCardState *base, uint32_t *len)
{
- PassthruState *card =
DO_UPCAST(PassthruState, base,
base);
+ PassthruState *card =
PASSTHRU_CCID_CARD(
base);
*len = card->atr_length;
return card->atr;
*len = card->atr_length;
return card->atr;
@@
-335,7
+338,7
@@
static const uint8_t *passthru_get_atr(CCIDCardState *base, uint32_t *len)
static int passthru_initfn(CCIDCardState *base)
{
static int passthru_initfn(CCIDCardState *base)
{
- PassthruState *card =
DO_UPCAST(PassthruState, base,
base);
+ PassthruState *card =
PASSTHRU_CCID_CARD(
base);
card->vscard_in_pos = 0;
card->vscard_in_hdr = 0;
card->vscard_in_pos = 0;
card->vscard_in_hdr = 0;
@@
-399,7
+402,7
@@
static void passthru_class_initfn(ObjectClass *klass, void *data)
}
static const TypeInfo passthru_card_info = {
}
static const TypeInfo passthru_card_info = {
- .name =
PASSTHRU_DEV_NAME
,
+ .name =
TYPE_CCID_PASSTHRU
,
.parent = TYPE_CCID_CARD,
.instance_size = sizeof(PassthruState),
.class_init = passthru_class_initfn,
.parent = TYPE_CCID_CARD,
.instance_size = sizeof(PassthruState),
.class_init = passthru_class_initfn,