add missing spidev reader driver (missing from last commit)

[librfid] / src / rfid_layer2.c

diff --git a/src/rfid_layer2.c b/src/rfid_layer2.c
index a6ee43f..bc5a4ec 100644 (file)
--- a/src/rfid_layer2.c
+++ b/src/rfid_layer2.c
@@ -14,29 +14,35 @@
  *
  *  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>
 #include <stdio.h>
 #include <errno.h>
+#include <string.h> /* for memcpy */
 
 #include <librfid/rfid.h>
 #include <librfid/rfid_layer2.h>
 
-static struct rfid_layer2 *rfid_layer2_list;
+static const struct rfid_layer2 *rfid_layer2s[] = {
+       [RFID_LAYER2_ISO14443A] = &rfid_layer2_iso14443a,
+       [RFID_LAYER2_ISO14443B] = &rfid_layer2_iso14443b,
+       [RFID_LAYER2_ISO15693]  = &rfid_layer2_iso15693,
+};
 
 struct rfid_layer2_handle *
 rfid_layer2_init(struct rfid_reader_handle *rh, unsigned int id)
 {
        struct rfid_layer2 *p;
 
-       for (p = rfid_layer2_list; p; p = p->next)
-               if (p->id == id)
-                       return p->fn.init(rh);
+       if (id >= ARRAY_SIZE(rfid_layer2s)) {
+               DEBUGP("unable to find matching layer2 protocol\n");
+               return NULL;
+       }
 
-       DEBUGP("unable to find matching layer2 protocol\n");
-       return NULL;
+       p = rfid_layer2s[id];
+       return p->fn.init(rh);
 }
 
 int
@@ -79,15 +85,6 @@ rfid_layer2_close(struct rfid_layer2_handle *ph)
        return ph->l2->fn.close(ph);
 }
 
-int
-rfid_layer2_register(struct rfid_layer2 *p)
-{
-       p->next = rfid_layer2_list;
-       rfid_layer2_list = p;
-
-       return 0;
-}
-
 int
 rfid_layer2_getopt(struct rfid_layer2_handle *ph, int optname,
                   void *optval, unsigned int *optlen)