Revision ba79c886
| b/libcacard/vscclient.c | ||
|---|---|---|
| 66 | 66 |
qemu_mutex_lock(&write_lock); |
| 67 | 67 |
|
| 68 | 68 |
if (verbose > 10) {
|
| 69 |
printf("sending type=%d id=%d, len =%d (0x%x)\n",
|
|
| 69 |
printf("sending type=%d id=%u, len =%u (0x%x)\n",
|
|
| 70 | 70 |
type, reader_id, length, length); |
| 71 | 71 |
} |
| 72 | 72 |
|
| ... | ... | |
| 167 | 167 |
case VEVENT_READER_REMOVE: |
| 168 | 168 |
/* future, tell qemu that an old CCID reader has been removed */ |
| 169 | 169 |
if (verbose > 10) {
|
| 170 |
printf(" READER REMOVE: %d\n", reader_id);
|
|
| 170 |
printf(" READER REMOVE: %u\n", reader_id);
|
|
| 171 | 171 |
} |
| 172 | 172 |
send_msg(VSC_ReaderRemove, reader_id, NULL, 0); |
| 173 | 173 |
break; |
| ... | ... | |
| 178 | 178 |
vreader_power_on(event->reader, atr, &atr_len); |
| 179 | 179 |
/* ATR call functions as a Card Insert event */ |
| 180 | 180 |
if (verbose > 10) {
|
| 181 |
printf(" CARD INSERT %d: ", reader_id);
|
|
| 181 |
printf(" CARD INSERT %u: ", reader_id);
|
|
| 182 | 182 |
print_byte_array(atr, atr_len); |
| 183 | 183 |
} |
| 184 | 184 |
send_msg(VSC_ATR, reader_id, atr, atr_len); |
| ... | ... | |
| 186 | 186 |
case VEVENT_CARD_REMOVE: |
| 187 | 187 |
/* Card removed */ |
| 188 | 188 |
if (verbose > 10) {
|
| 189 |
printf(" CARD REMOVE %d:\n", reader_id);
|
|
| 189 |
printf(" CARD REMOVE %u:\n", reader_id);
|
|
| 190 | 190 |
} |
| 191 | 191 |
send_msg(VSC_CardRemove, reader_id, NULL, 0); |
| 192 | 192 |
break; |
| ... | ... | |
| 256 | 256 |
reader ? vreader_get_name(reader) |
| 257 | 257 |
: "invalid reader", error); |
| 258 | 258 |
} else {
|
| 259 |
printf("no reader by id %d found\n", reader_id);
|
|
| 259 |
printf("no reader by id %u found\n", reader_id);
|
|
| 260 | 260 |
} |
| 261 | 261 |
} else if (strncmp(string, "remove", 6) == 0) {
|
| 262 | 262 |
if (string[6] == ' ') {
|
| ... | ... | |
| 269 | 269 |
reader ? vreader_get_name(reader) |
| 270 | 270 |
: "invalid reader", error); |
| 271 | 271 |
} else {
|
| 272 |
printf("no reader by id %d found\n", reader_id);
|
|
| 272 |
printf("no reader by id %u found\n", reader_id);
|
|
| 273 | 273 |
} |
| 274 | 274 |
} else if (strncmp(string, "select", 6) == 0) {
|
| 275 | 275 |
if (string[6] == ' ') {
|
| ... | ... | |
| 280 | 280 |
reader = vreader_get_reader_by_id(reader_id); |
| 281 | 281 |
} |
| 282 | 282 |
if (reader) {
|
| 283 |
printf("Selecting reader %d, %s\n", reader_id,
|
|
| 283 |
printf("Selecting reader %u, %s\n", reader_id,
|
|
| 284 | 284 |
vreader_get_name(reader)); |
| 285 | 285 |
default_reader_id = reader_id; |
| 286 | 286 |
} else {
|
| 287 |
printf("Reader with id %d not found\n", reader_id);
|
|
| 287 |
printf("Reader with id %u not found\n", reader_id);
|
|
| 288 | 288 |
} |
| 289 | 289 |
} else if (strncmp(string, "debug", 5) == 0) {
|
| 290 | 290 |
if (string[5] == ' ') {
|
| ... | ... | |
| 303 | 303 |
if (reader_id == -1) {
|
| 304 | 304 |
continue; |
| 305 | 305 |
} |
| 306 |
printf("%3d %s %s\n", reader_id,
|
|
| 306 |
printf("%3u %s %s\n", reader_id,
|
|
| 307 | 307 |
vreader_card_is_present(reader) == VREADER_OK ? |
| 308 | 308 |
"CARD_PRESENT" : " ", |
| 309 | 309 |
vreader_get_name(reader)); |
| ... | ... | |
| 563 | 563 |
mhHeader.reader_id = ntohl(mhHeader.reader_id); |
| 564 | 564 |
mhHeader.length = ntohl(mhHeader.length); |
| 565 | 565 |
if (verbose) {
|
| 566 |
printf("Header: type=%d, reader_id=%d length=%d (0x%x)\n",
|
|
| 566 |
printf("Header: type=%d, reader_id=%u length=%d (0x%x)\n",
|
|
| 567 | 567 |
mhHeader.type, mhHeader.reader_id, mhHeader.length, |
| 568 | 568 |
mhHeader.length); |
| 569 | 569 |
} |
Also available in: Unified diff