ext/nfc/nfc_iso14443a.c in nfc-2.0.1 vs ext/nfc/nfc_iso14443a.c in nfc-2.1.0

@@ -2,74 +2,74 @@
 
 VALUE cNfcISO14443A;
 
 /*
  * call-seq:
- *  uiUidLen
+ *  szUidLen
  *
- * Get the uiUidLen
+ * Get the szUidLen
  */
-static VALUE uiUidLen(VALUE self)
+static VALUE szUidLen(VALUE self)
 {
-  tag_info_iso14443a * tag;
-  Data_Get_Struct(self, tag_info_iso14443a, tag);
+  nfc_iso14443a_info_t * tag;
+  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
 
-  return INT2NUM(tag->uiUidLen);
+  return INT2NUM(tag->szUidLen);
 }
 
 /*
  * call-seq:
- *  uiAtsLen
+ *  szAtsLen
  *
- * Get the uiAtsLen
+ * Get the szAtsLen
  */
-static VALUE uiAtsLen(VALUE self)
+static VALUE szAtsLen(VALUE self)
 {
-  tag_info_iso14443a * tag;
-  Data_Get_Struct(self, tag_info_iso14443a, tag);
+  nfc_iso14443a_info_t * tag;
+  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
 
-  return INT2NUM(tag->uiAtsLen);
+  return INT2NUM(tag->szAtsLen);
 }
 
 /*
  * call-seq:
  *  abtUid
  *
  * Get the abtUid
  */
 static VALUE abtUid(VALUE self)
 {
-  tag_info_iso14443a * tag;
-  Data_Get_Struct(self, tag_info_iso14443a, tag);
+  nfc_iso14443a_info_t * tag;
+  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
 
-  return rb_str_new(tag->abtUid, tag->uiUidLen);
+  return rb_str_new(tag->abtUid, tag->szUidLen);
 }
 
 /*
  * call-seq:
  *  abtAts
  *
  * Get the abtAts
  */
 static VALUE abtAts(VALUE self)
 {
-  tag_info_iso14443a * tag;
-  Data_Get_Struct(self, tag_info_iso14443a, tag);
+  nfc_iso14443a_info_t * tag;
+  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
 
-  return rb_str_new(tag->abtAts, tag->uiAtsLen);
+  return rb_str_new(tag->abtAts, tag->szAtsLen);
 }
 
 /*
  * call-seq:
  *  abtAtqa
  *
  * Get the abtAtqa
  */
 static VALUE abtAtqa(VALUE self)
 {
-  tag_info_iso14443a * tag;
-  Data_Get_Struct(self, tag_info_iso14443a, tag);
+  nfc_iso14443a_info_t * tag;
+  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
 
   return rb_str_new(tag->abtAtqa, 2);
 }
 
 /*
@@ -78,21 +78,21 @@
  *
  * Get the btSak
  */
 static VALUE btSak(VALUE self)
 {
-  tag_info_iso14443a * tag;
-  Data_Get_Struct(self, tag_info_iso14443a, tag);
+  nfc_iso14443a_info_t * tag;
+  Data_Get_Struct(self, nfc_iso14443a_info_t, tag);
 
   return INT2NUM(tag->btSak);
 }
 
 void init_iso14443a()
 {
   cNfcISO14443A = rb_define_class_under(cNfc, "ISO14443A", rb_cObject);
 
-  rb_define_method(cNfcISO14443A, "uiUidLen", uiUidLen, 0);
-  rb_define_method(cNfcISO14443A, "uiAtsLen", uiAtsLen, 0);
+  rb_define_method(cNfcISO14443A, "szUidLen", szUidLen, 0);
+  rb_define_method(cNfcISO14443A, "szAtsLen", szAtsLen, 0);
   rb_define_method(cNfcISO14443A, "btSak", btSak, 0);
 
   rb_define_private_method(cNfcISO14443A, "abtUid", abtUid, 0);
   rb_define_private_method(cNfcISO14443A, "abtAts", abtAts, 0);
   rb_define_private_method(cNfcISO14443A, "abtAtqa", abtAtqa, 0);