X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2Frfid_reader.c;h=39a4a073e99efdff2a6bcb4b937b84d8ddfc484a;hb=8e67325682fa1300e3c75917fb29e6c8719ac5f8;hp=a5dbeb2cdcd6df85b6c810502f08e64ff5a4cf70;hpb=fb488a0210b1c694dba762ba086f43a5d4655c4f;p=librfid

diff --git a/src/rfid_reader.c b/src/rfid_reader.c
index a5dbeb2..39a4a07 100644
--- a/src/rfid_reader.c
+++ b/src/rfid_reader.c
@@ -14,7 +14,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>
@@ -24,12 +24,18 @@
 #include <librfid/rfid_reader.h>
 #include <librfid/rfid_reader_cm5121.h>
 #include <librfid/rfid_reader_openpcd.h>
+#include <librfid/rfid_reader_spidev.h>
 
 static const struct rfid_reader *rfid_readers[] = {
-#ifndef LIBRFID_FIRMWARE
+#ifdef HAVE_LIBUSB
+#ifdef ENABLE_CM5121
 	[RFID_READER_CM5121]	= &rfid_reader_cm5121,
 #endif
 	[RFID_READER_OPENPCD]	= &rfid_reader_openpcd,
+#endif
+#ifdef ENABLE_SPIDEV
+	[RFID_READER_SPIDEV]	= &rfid_reader_spidev,
+#endif
 };
 
 struct rfid_reader_handle *
@@ -43,6 +49,8 @@ rfid_reader_open(void *data, unsigned int id)
 	}
 
 	p = rfid_readers[id];
+	if (!p)
+		return NULL;
 
 	return p->open(data);
 }