From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ7i6-0001We-3m for qemu-devel@nongnu.org; Fri, 22 Mar 2013 15:33:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ7i4-0006mo-GP for qemu-devel@nongnu.org; Fri, 22 Mar 2013 15:33:06 -0400 Received: from mx4-phx2.redhat.com ([209.132.183.25]:57153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ7i4-0006mk-8X for qemu-devel@nongnu.org; Fri, 22 Mar 2013 15:33:04 -0400 Date: Fri, 22 Mar 2013 15:33:02 -0400 (EDT) From: Alon Levy Message-ID: <2123552139.13535377.1363980782691.JavaMail.root@redhat.com> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 24/26] libcacard: move atr setting from macro to function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: mlureau@redhat.com, qemu-devel@nongnu.org > Hi, >=20 > review below >=20 > On Mon, Mar 18, 2013 at 2:11 PM, Alon Levy wrote: > > Only because qemu's checkpatch complains about it. > > > > Signed-off-by: Alon Levy > > --- > > Makefile.objs | 1 + > > libcacard/vcard_emul_nss.c | 11 ++++++++--- > > libcacard/vcardt.c | 40 > > ++++++++++++++++++++++++++++++++++++++++ > > libcacard/vcardt.h | 15 ++------------- > > 4 files changed, 51 insertions(+), 16 deletions(-) > > create mode 100644 libcacard/vcardt.c > > > > diff --git a/Makefile.objs b/Makefile.objs > > index f99841c..6d47567 100644 > > --- a/Makefile.objs > > +++ b/Makefile.objs > > @@ -41,6 +41,7 @@ libcacard-y +=3D libcacard/vcard.o > > libcacard/vreader.o > > libcacard-y +=3D libcacard/vcard_emul_nss.o > > libcacard-y +=3D libcacard/vcard_emul_type.o > > libcacard-y +=3D libcacard/card_7816.o > > +libcacard-y +=3D libcacard/vcardt.o > > > > ###################################################################### > > # Target independent part of system emulation. The long term path > > is to > > diff --git a/libcacard/vcard_emul_nss.c > > b/libcacard/vcard_emul_nss.c > > index 21d4689..6bad0b9 100644 > > --- a/libcacard/vcard_emul_nss.c > > +++ b/libcacard/vcard_emul_nss.c > > @@ -519,18 +519,23 @@ vcard_emul_reader_get_slot(VReader *vreader) > > } > > > > /* > > - * Card ATR's map to physical cards. VCARD_ATR_PREFIX will set > > appropriate > > + * Card ATR's map to physical cards. vcard_alloc_atr will set > > appropriate > > * historical bytes for any software emulated card. The remaining > > bytes can be > > * used to indicate the actual emulator > > */ > > -static const unsigned char nss_atr[] =3D { VCARD_ATR_PREFIX(3), 'N', > > 'S', 'S' }; > > +static unsigned char *nss_atr; > > +static int nss_atr_len; > > > > void > > vcard_emul_get_atr(VCard *card, unsigned char *atr, int *atr_len) > > { > > - int len =3D MIN(sizeof(nss_atr), *atr_len); > > + int len; > > assert(atr !=3D NULL); > > > > + if (nss_atr =3D=3D NULL) { > > + nss_atr =3D vcard_alloc_atr("NSS", &nss_atr_len); > > + } > > + len =3D MIN(nss_atr_len, *atr_len); > > memcpy(atr, nss_atr, len); > > *atr_len =3D len; > > } > > diff --git a/libcacard/vcardt.c b/libcacard/vcardt.c > > new file mode 100644 > > index 0000000..f64c343 > > --- /dev/null > > +++ b/libcacard/vcardt.c > > @@ -0,0 +1,40 @@ > > +#include > > +#include > > +#include > > + > > +#include "libcacard/vcardt.h" > > + > > +/* create an ATR with appropriate historical bytes */ > > +#define ATR_TS_DIRECT_CONVENTION 0x3b > > +#define ATR_TA_PRESENT 0x10 > > +#define ATR_TB_PRESENT 0x20 > > +#define ATR_TC_PRESENT 0x40 > > +#define ATR_TD_PRESENT 0x80 > > + > > +unsigned char *vcard_alloc_atr(const char *postfix, int *atr_len) > > +{ > > + int postfix_len; > > + const char prefix[] =3D "VCARD_"; > > + const int prefix_len =3D strlen(prefix); >=20 > or sizeof(prefix) -1 >=20 > > + int total_len; > > + unsigned char *atr; > > + > > + if (postfix =3D=3D NULL) { >=20 > I would make postfix mandatory. >=20 > > + postfix_len =3D 0; > > + } else { > > + postfix_len =3D strlen(postfix); > > + } > > + total_len =3D 3 + prefix_len + postfix_len; > > + atr =3D g_malloc(total_len); > > + atr[0] =3D ATR_TS_DIRECT_CONVENTION; > > + atr[1] =3D ATR_TD_PRESENT + prefix_len + postfix_len; > > + atr[2] =3D 0x00; > > + memcpy(&atr[3], prefix, prefix_len); > > + if (postfix) { > > + memcpy(&atr[3 + prefix_len], postfix, postfix_len); > > + } > > + if (atr_len) { > > + *atr_len =3D total_len; > > + } > > + return atr; > > +} > > diff --git a/libcacard/vcardt.h b/libcacard/vcardt.h > > index 3b9a619..e8e651f 100644 > > --- a/libcacard/vcardt.h > > +++ b/libcacard/vcardt.h > > @@ -25,19 +25,6 @@ typedef struct VCardEmulStruct VCardEmul; > > > > #define MAX_CHANNEL 4 > > > > -/* create an ATR with appropriate historical bytes */ > > -#define TS_DIRECT_CONVENTION 0x3b > > -#define TA_PRESENT 0x10 > > -#define TB_PRESENT 0x20 > > -#define TC_PRESENT 0x40 > > -#define TD_PRESENT 0x80 > > - > > -#define VCARD_ATR_PREFIX(size) \ > > - TS_DIRECT_CONVENTION, \ > > - TD_PRESENT + (6 + size), \ > > - 0x00, \ > > - 'V', 'C', 'A', 'R', 'D', '_' > > - > > typedef enum { > > VCARD_DONE, > > VCARD_NEXT, > > @@ -69,4 +56,6 @@ struct VCardBufferResponseStruct { > > int len; > > }; > > > > +unsigned char *vcard_alloc_atr(const char *postfix, int *atr_len); > > + >=20 > If the function is exposed in public header, it should also be > exported (in libcacard.syms), but I am not sure it's useful for > libcacard user. It is purely internal, I could add a private header for this. >=20 >=20 > -- > Marc-Andr=C3=A9 Lureau >=20 >=20