char: rename CharDriverState Chardev

[qemu.git] / hw / usb / ccid-card-passthru.c

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index c0e90e501c996bd510ee22a3dbcc7da0a9712757..daab0d56cf33e3cbe3f40f3b9887590b727fa10e 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -48,7 +48,7 @@ typedef struct PassthruState PassthruState;
 
 struct PassthruState {
     CCIDCardState base;
 
 struct PassthruState {
     CCIDCardState base;

-    CharDriverState *cs;
+    CharBackend cs;

     uint8_t  vscard_in_data[VSCARD_IN_SIZE];
     uint32_t vscard_in_pos;
     uint32_t vscard_in_hdr;
     uint8_t  vscard_in_data[VSCARD_IN_SIZE];
     uint32_t vscard_in_pos;
     uint32_t vscard_in_hdr;


@@ -75,8 +75,11 @@ static void ccid_card_vscard_send_msg(PassthruState *s,
     scr_msg_header.type = htonl(type);
     scr_msg_header.reader_id = htonl(reader_id);
     scr_msg_header.length = htonl(length);
     scr_msg_header.type = htonl(type);
     scr_msg_header.reader_id = htonl(reader_id);
     scr_msg_header.length = htonl(length);

-    qemu_chr_fe_write(s->cs, (uint8_t *)&scr_msg_header, sizeof(VSCMsgHeader));
-    qemu_chr_fe_write(s->cs, payload, length);
+    /* XXX this blocks entire thread. Rewrite to use
+     * qemu_chr_fe_write and background I/O callbacks */
+    qemu_chr_fe_write_all(&s->cs, (uint8_t *)&scr_msg_header,
+                          sizeof(VSCMsgHeader));
+    qemu_chr_fe_write_all(&s->cs, payload, length);

 }
 
 static void ccid_card_vscard_send_apdu(PassthruState *s,
 }
 
 static void ccid_card_vscard_send_apdu(PassthruState *s,


@@ -261,7 +264,10 @@ static void ccid_card_vscard_handle_message(PassthruState *card,
 
 static void ccid_card_vscard_drop_connection(PassthruState *card)
 {
 
 static void ccid_card_vscard_drop_connection(PassthruState *card)
 {

-    qemu_chr_delete(card->cs);
+    Chardev *chr = qemu_chr_fe_get_driver(&card->cs);
+
+    qemu_chr_fe_deinit(&card->cs);
+    qemu_chr_delete(chr);

     card->vscard_in_pos = card->vscard_in_hdr = 0;
 }
 
     card->vscard_in_pos = card->vscard_in_hdr = 0;
 }
 


@@ -306,8 +312,6 @@ static void ccid_card_vscard_event(void *opaque, int event)
     case CHR_EVENT_BREAK:
         card->vscard_in_pos = card->vscard_in_hdr = 0;
         break;
     case CHR_EVENT_BREAK:
         card->vscard_in_pos = card->vscard_in_hdr = 0;
         break;

-    case CHR_EVENT_FOCUS:
-        break;

     case CHR_EVENT_OPENED:
         DPRINTF(card, D_INFO, "%s: CHR_EVENT_OPENED\n", __func__);
         break;
     case CHR_EVENT_OPENED:
         DPRINTF(card, D_INFO, "%s: CHR_EVENT_OPENED\n", __func__);
         break;


@@ -321,7 +325,7 @@ static void passthru_apdu_from_guest(
 {
     PassthruState *card = PASSTHRU_CCID_CARD(base);
 
 {
     PassthruState *card = PASSTHRU_CCID_CARD(base);
 

-    if (!card->cs) {
+    if (!qemu_chr_fe_get_driver(&card->cs)) {

         printf("ccid-passthru: no chardev, discarding apdu length %d\n", len);
         return;
     }
         printf("ccid-passthru: no chardev, discarding apdu length %d\n", len);
         return;
     }


@@ -342,12 +346,12 @@ static int passthru_initfn(CCIDCardState *base)
 
     card->vscard_in_pos = 0;
     card->vscard_in_hdr = 0;
 
     card->vscard_in_pos = 0;
     card->vscard_in_hdr = 0;

-    if (card->cs) {
+    if (qemu_chr_fe_get_driver(&card->cs)) {

         DPRINTF(card, D_INFO, "initing chardev\n");
         DPRINTF(card, D_INFO, "initing chardev\n");

-        qemu_chr_add_handlers(card->cs,
+        qemu_chr_fe_set_handlers(&card->cs,

             ccid_card_vscard_can_read,
             ccid_card_vscard_read,
             ccid_card_vscard_can_read,
             ccid_card_vscard_read,

-            ccid_card_vscard_event, card);
+            ccid_card_vscard_event, card, NULL, true);

         ccid_card_vscard_send_init(card);
     } else {
         error_report("missing chardev");
         ccid_card_vscard_send_init(card);
     } else {
         error_report("missing chardev");


@@ -361,11 +365,6 @@ static int passthru_initfn(CCIDCardState *base)
     return 0;
 }
 
     return 0;
 }
 

-static int passthru_exitfn(CCIDCardState *base)
-{
-    return 0;
-}
-

 static VMStateDescription passthru_vmstate = {
     .name = "ccid-card-passthru",
     .version_id = 1,
 static VMStateDescription passthru_vmstate = {
     .name = "ccid-card-passthru",
     .version_id = 1,


@@ -392,7 +391,6 @@ static void passthru_class_initfn(ObjectClass *klass, void *data)
     CCIDCardClass *cc = CCID_CARD_CLASS(klass);
 
     cc->initfn = passthru_initfn;
     CCIDCardClass *cc = CCID_CARD_CLASS(klass);
 
     cc->initfn = passthru_initfn;

-    cc->exitfn = passthru_exitfn;

     cc->get_atr = passthru_get_atr;
     cc->apdu_from_guest = passthru_apdu_from_guest;
     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
     cc->get_atr = passthru_get_atr;
     cc->apdu_from_guest = passthru_apdu_from_guest;
     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);