Use C99 standard bool type instead of locally defined one.

Check for types in configure pass.
Fix a warning related to nfc_reader_select() (a length - uiInitDataLen - was set by NULL instead of 0).
This commit is contained in:
Romuald Conty 2009-05-27 14:05:07 +00:00
parent f34857487d
commit 1dcb53dc4d
8 changed files with 41 additions and 29 deletions

View file

@ -22,6 +22,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <stddef.h>
#include <stdint.h>
#include <stdbool.h>
#include <string.h>
#include "libnfc.h"

View file

@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _LIBNFC_DEV_ACR122_H_
#include <stdint.h>
#include <stdbool.h>
#include "defines.h"
#include "types.h"

View file

@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _LIBNFC_DEV_PN531_H_
#include <stdint.h>
#include <stdbool.h>
#include "defines.h"
#include "types.h"

View file

@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _LIBNFC_H_
#include <stdint.h>
#include <stdbool.h>
#include "defines.h"
#include "types.h"

View file

@ -59,7 +59,7 @@ int main(int argc, const char* argv[])
printf("\nConnected to NFC reader: %s\n\n",pdi->acName);
// Poll for a ISO14443A (MIFARE) tag
if (nfc_reader_select(pdi,IM_ISO14443A_106,NULL,NULL,&ti))
if (nfc_reader_select(pdi,IM_ISO14443A_106,NULL,0,&ti))
{
printf("The following (NFC) ISO14443A tag was found:\n\n");
printf(" ATQA (SENS_RES): "); print_hex(ti.tia.abtAtqa,2);
@ -81,14 +81,14 @@ int main(int argc, const char* argv[])
}
// Poll for a ISO14443B tag
if (nfc_reader_select(pdi,IM_ISO14443B_106,NULL,NULL,&ti))
if (nfc_reader_select(pdi,IM_ISO14443B_106,NULL,0,&ti))
{
// No test results yet
printf("iso14443b\n");
}
// Poll for a Jewel tag
if (nfc_reader_select(pdi,IM_JEWEL_106,NULL,NULL,&ti))
if (nfc_reader_select(pdi,IM_JEWEL_106,NULL,0,&ti))
{
// No test results yet
printf("jewel\n");

View file

@ -22,6 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdlib.h>
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
#include <string.h>
#include <ctype.h>
@ -74,7 +75,7 @@ bool read_card()
{
printf("x");
// When a failure occured we need to redo the anti-collision
if (!nfc_reader_select(pdi,IM_ISO14443A_106,NULL,NULL,&ti))
if (!nfc_reader_select(pdi,IM_ISO14443A_106,NULL,0,&ti))
{
printf("!\nError: tag was removed\n");
return 1;
@ -157,7 +158,7 @@ bool write_card()
{
printf("x");
// When a failure occured we need to redo the anti-collision
if (!nfc_reader_select(pdi,IM_ISO14443A_106,NULL,NULL,&ti))
if (!nfc_reader_select(pdi,IM_ISO14443A_106,NULL,0,&ti))
{
printf("!\nError: tag was removed\n");
return false;
@ -312,7 +313,7 @@ int main(int argc, const char* argv[])
printf("Connected to NFC reader: %s\n",pdi->acName);
// Try to find a MIFARE Classic tag
if (!nfc_reader_select(pdi,IM_ISO14443A_106,NULL,NULL,&ti))
if (!nfc_reader_select(pdi,IM_ISO14443A_106,NULL,0,&ti))
{
printf("Error: no tag was found\n");
nfc_disconnect(pdi);

View file

@ -22,17 +22,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define _LIBNFC_TYPES_H_
#include <stdint.h>
#include <stdbool.h>
#include "defines.h"
// Compiler directive, set struct alignment to 1 byte for compatibility
#pragma pack(1)
typedef enum {
false = 0x00,
true = 0x01
} bool;
typedef enum {
CT_PN531 = 0x10,
CT_PN532 = 0x20,