projects
/
librfid
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add missing spidev reader driver (missing from last commit)
[librfid]
/
src
/
rfid_reader.c
diff --git
a/src/rfid_reader.c
b/src/rfid_reader.c
index
a5dbeb2
..
39a4a07
100644
(file)
--- 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
*
* 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., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA
*/
#include <stdlib.h>
*/
#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.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[] = {
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,
[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 *
};
struct rfid_reader_handle *
@@
-43,6
+49,8
@@
rfid_reader_open(void *data, unsigned int id)
}
p = rfid_readers[id];
}
p = rfid_readers[id];
+ if (!p)
+ return NULL;
return p->open(data);
}
return p->open(data);
}