remove autogenerated file

[librfid] / src / rfid_layer2_iso14443b.c

diff --git a/src/rfid_layer2_iso14443b.c b/src/rfid_layer2_iso14443b.c
index 8227a32..df2f95d 100644 (file)
--- a/src/rfid_layer2_iso14443b.c
+++ b/src/rfid_layer2_iso14443b.c
@@ -16,7 +16,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
@@ -162,29 +162,22 @@ static int
 transceive_attrib(struct rfid_layer2_handle *h, const unsigned char *inf,
            unsigned int inf_len, unsigned char *rx_data, unsigned int *rx_len)
 {
-       struct iso14443b_attrib_hdr *attrib;
-       unsigned int attrib_size = sizeof(*attrib) + inf_len;
-       unsigned char *rx_buf;
+       struct {
+               struct iso14443b_attrib_hdr attrib;
+               char buf[256-3];
+       } _attrib_buf;
+
+       struct iso14443b_attrib_hdr *attrib = &_attrib_buf.attrib;
+       unsigned char rx_buf[256];
        unsigned char fsdi;
        int ret = 0;
        
        DEBUGP("fsd is %u\n", h->priv.iso14443b.fsd);
-       attrib = malloc(attrib_size);
-       if (!attrib) {
-               perror("attrib_alloc");
-               return -1;
-       }
-
-       DEBUGP("fsd is %u\n", h->priv.iso14443b.fsd);
-       rx_buf = malloc(*rx_len+1);
-       if (!rx_buf) {
-               perror("rx_buf malloc");
-               ret = -1;
-               goto out_attrib;
-       }
+       if (rx_len >= rx_len-1)
+               return -EINVAL;
 
        /* initialize attrib frame */
-       memset(attrib, 0, attrib_size);
+       memset(&_attrib_buf, 0, sizeof(_attrib_buf));
        if (inf_len)
                memcpy((unsigned char *)attrib+sizeof(*attrib), inf, inf_len);
 
@@ -235,9 +228,7 @@ transceive_attrib(struct rfid_layer2_handle *h, const unsigned char *inf,
        memcpy(rx_data, rx_buf+1, *rx_len);
 
 out_rx:
-       free(rx_buf);
 out_attrib:
-       free(attrib);
 
        return ret;
 }
@@ -295,7 +286,7 @@ static struct rfid_layer2_handle *
 iso14443b_init(struct rfid_reader_handle *rh)
 {
        int ret;
-       struct rfid_layer2_handle *h = malloc(sizeof(*h));
+       struct rfid_layer2_handle *h = malloc_layer2_handle(sizeof(*h));
        if (!h)
                return NULL;
 
@@ -314,10 +305,10 @@ iso14443b_init(struct rfid_reader_handle *rh)
        h->priv.iso14443b.tr0 = (256/ISO14443_FREQ_SUBCARRIER)*10e6;
        h->priv.iso14443b.tr1 = (200/ISO14443_FREQ_SUBCARRIER)*10e6;
 
-       ret = h->rh->reader->iso14443b.init(h->rh);
+       ret = h->rh->reader->init(h->rh, RFID_LAYER2_ISO14443B);
        if (ret < 0) {
                DEBUGP("error during reader 14443b init\n");
-               free(h);
+               free_layer2_handle(h);
                return NULL;
        }
 
@@ -327,7 +318,7 @@ iso14443b_init(struct rfid_reader_handle *rh)
 static int
 iso14443b_fini(struct rfid_layer2_handle *handle)
 {
-       free(handle);
+       free_layer2_handle(handle);
        return 0;
 }
 
@@ -346,7 +337,7 @@ iso14443b_transceive(struct rfid_layer2_handle *handle,
 
 static int
 iso14443b_getopt(struct rfid_layer2_handle *handle,
-                int optname, void *optval, unsigned int optlen)
+                int optname, void *optval, unsigned int *optlen)
 {
        unsigned int *opt_ui = optval;
 
@@ -394,7 +385,7 @@ iso14443b_setopt(struct rfid_layer2_handle *handle,
 }
 
 
-struct rfid_layer2 rfid_layer2_iso14443b = {
+const struct rfid_layer2 rfid_layer2_iso14443b = {
        .id     = RFID_LAYER2_ISO14443B,
        .name   = "ISO 14443-3 B",
        .fn     = {