diff options
| author | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2005-10-22 20:20:21 +0000 |
|---|---|---|
| committer | laforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede> | 2005-10-22 20:20:21 +0000 |
| commit | 5fc01ff6f98d72219420bc29fb59d2d6eb93e887 (patch) | |
| tree | 1cf64c994346c29e0a143bacf6ce69d8ae3bc2be /rfid_layer2_iso14443b.c | |
| parent | 073fc3dcce216782501b12113704b6256d15670c (diff) | |
- add mifare classic support
- move uid/pupi from l2 private data into l2 global data
- various cleanups
git-svn-id: https://svn.gnumonks.org/trunk/librfid@1555 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'rfid_layer2_iso14443b.c')
| -rw-r--r-- | rfid_layer2_iso14443b.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rfid_layer2_iso14443b.c b/rfid_layer2_iso14443b.c index 8424fde..c5ff592 100644 --- a/rfid_layer2_iso14443b.c +++ b/rfid_layer2_iso14443b.c @@ -89,8 +89,8 @@ parse_atqb(struct rfid_layer2_handle *h, struct iso14443b_atqb *atqb) /* FIXME: speed capability */ - memcpy(h->priv.iso14443b.pupi, atqb->pupi, - sizeof(h->priv.iso14443b.pupi)); + memcpy(h->uid, atqb->pupi, sizeof(atqb->pupi)); + h->uid_len = sizeof(atqb->pupi); return 0; } @@ -181,7 +181,7 @@ transcieve_attrib(struct rfid_layer2_handle *h, const unsigned char *inf, memcpy((unsigned char *)attrib+sizeof(*attrib), inf, inf_len); attrib->one_d = 0x1d; - memcpy(attrib->identifier, h->priv.iso14443b.pupi, 4); + memcpy(attrib->identifier, h->uid, 4); /* FIXME: do we want to change TR0/TR1 from its default ? */ /* FIXME: do we want to change SOF/EOF from its default ? */ @@ -240,7 +240,7 @@ iso14443b_hltb(struct rfid_layer2_handle *h) unsigned int hltb_len = 1; hltb[0] = 0x50; - memcpy(hltb+1, h->priv.iso14443b.pupi, 4); + memcpy(hltb+1, h->uid, 4); ret = h->rh->reader->transcieve(h->rh, hltb, 5, hltb_resp, &hltb_len, |