[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 11/14] Passthru CCID card: QOMify
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 11/14] Passthru CCID card: QOMify |
Date: |
Thu, 11 Feb 2016 15:19:00 +0300 |
From: Cao jin <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/usb/ccid-card-passthru.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 2e4d95f..c0e90e5 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -39,8 +39,6 @@ static const uint8_t DEFAULT_ATR[] = {
0x13, 0x08
};
-
-#define PASSTHRU_DEV_NAME "ccid-card-passthru"
#define VSCARD_IN_SIZE 65536
/* maximum size of ATR - from 7816-3 */
@@ -59,6 +57,10 @@ struct PassthruState {
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.
@@ -317,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)
{
- 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);
@@ -328,7 +330,7 @@ static void passthru_apdu_from_guest(
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;
@@ -336,7 +338,7 @@ static const uint8_t *passthru_get_atr(CCIDCardState *base,
uint32_t *len)
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;
@@ -400,7 +402,7 @@ static void passthru_class_initfn(ObjectClass *klass, void
*data)
}
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,
--
2.1.4
- [Qemu-trivial] [PULL 00/14] Trivial patches for 2016-02-11, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 11/14] Passthru CCID card: QOMify,
Michael Tokarev <=
- [Qemu-trivial] [PULL 02/14] man: virtfs-proxy-helper: Rework awkward sentence, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 08/14] char: fix parameter name / type in BSD codepath, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 03/14] qom: Correct object_property_get_int() description, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 07/14] qmp-spec: fix index in doc, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 13/14] Adds keycode 86 to the hid_usage_keys translation table., Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 12/14] s390x: remove s390-zipl.rom, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 14/14] w32: include winsock2.h before windows.h, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 06/14] rdma: remove check on time_spent when calculating mbs, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 10/14] Emulated CCID card: QOMify, Michael Tokarev, 2016/02/11
- [Qemu-trivial] [PULL 05/14] qemu-sockets: simplify error handling, Michael Tokarev, 2016/02/11