crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mark functions parameters as `const' when applicable.

Browse source
This commit is contained in:
Romain Tartiere 2009-12-19 22:55:50 +00:00
parent 7ed4561f74
commit f9c2b6e9e3
3 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -23,6 +23,7 @@ AC_TYPE_SIZE_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_MALLOC AC_FUNC_MALLOC
AC_FUNC_REALLOC AC_FUNC_REALLOC
AC_CHECK_FUNCS([memset])
# Checks for pkg-config modules. # Checks for pkg-config modules.
PKG_CHECK_MODULES([LIBNFC], [libnfc], [], [AC_MSG_ERROR([libnfc is mandatory.])]) PKG_CHECK_MODULES([LIBNFC], [libnfc], [], [AC_MSG_ERROR([libnfc is mandatory.])])

30
mifare_classic.c
View file

@ -137,7 +137,7 @@ uint16_t mifare_trailer_access_permissions[] = {
* Private functions * Private functions
*/ */
int get_block_access_bits (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicAccessBits *block_access_bits); int get_block_access_bits (MifareClassicTag tag, const MifareClassicBlockNumber block, MifareClassicAccessBits *block_access_bits);
/* /*
@ -282,7 +282,7 @@ mifare_classic_disconnect (MifareClassicTag tag)
* Send an authentification command to the provided MIFARE target. * Send an authentification command to the provided MIFARE target.
*/ */
int int
mifare_classic_authenticate (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicKey key, MifareClassicKeyType key_type) mifare_classic_authenticate (MifareClassicTag tag, const MifareClassicBlockNumber block, const MifareClassicKey key, const MifareClassicKeyType key_type)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -314,7 +314,7 @@ mifare_classic_authenticate (MifareClassicTag tag, MifareClassicBlockNumber bloc
* Read data from the provided MIFARE target. * Read data from the provided MIFARE target.
*/ */
int int
mifare_classic_read (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicBlock *data) mifare_classic_read (MifareClassicTag tag, const MifareClassicBlockNumber block, MifareClassicBlock *data)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -336,7 +336,7 @@ mifare_classic_read (MifareClassicTag tag, MifareClassicBlockNumber block, Mifar
} }
int int
mifare_classic_init_value (MifareClassicTag tag, MifareClassicBlockNumber block, int32_t value, MifareClassicBlockNumber adr) mifare_classic_init_value (MifareClassicTag tag, const MifareClassicBlockNumber block, const int32_t value, const MifareClassicBlockNumber adr)
{ {
union mifare_classic_block b; union mifare_classic_block b;
@ -356,7 +356,7 @@ mifare_classic_init_value (MifareClassicTag tag, MifareClassicBlockNumber block,
} }
int int
mifare_classic_read_value (MifareClassicTag tag, MifareClassicBlockNumber block, int32_t *value, MifareClassicBlockNumber *adr) mifare_classic_read_value (MifareClassicTag tag, const MifareClassicBlockNumber block, int32_t *value, MifareClassicBlockNumber *adr)
{ {
MifareClassicBlock data; MifareClassicBlock data;
if (mifare_classic_read (tag, block, &data) < 0) if (mifare_classic_read (tag, block, &data) < 0)
@ -388,7 +388,7 @@ mifare_classic_read_value (MifareClassicTag tag, MifareClassicBlockNumber block,
* Write data to the provided MIFARE target. * Write data to the provided MIFARE target.
*/ */
int int
mifare_classic_write (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicBlock data) mifare_classic_write (MifareClassicTag tag, const MifareClassicBlockNumber block, const MifareClassicBlock data)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -416,7 +416,7 @@ mifare_classic_write (MifareClassicTag tag, MifareClassicBlockNumber block, Mifa
* data register. * data register.
*/ */
int int
mifare_classic_increment (MifareClassicTag tag, MifareClassicBlockNumber block, uint32_t amount) mifare_classic_increment (MifareClassicTag tag, const MifareClassicBlockNumber block, const uint32_t amount)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -445,7 +445,7 @@ mifare_classic_increment (MifareClassicTag tag, MifareClassicBlockNumber block,
* data register. * data register.
*/ */
int int
mifare_classic_decrement (MifareClassicTag tag, MifareClassicBlockNumber block, uint32_t amount) mifare_classic_decrement (MifareClassicTag tag, const MifareClassicBlockNumber block, const uint32_t amount)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -473,7 +473,7 @@ mifare_classic_decrement (MifareClassicTag tag, MifareClassicBlockNumber block,
* Store the provided block to the internal data register. * Store the provided block to the internal data register.
*/ */
int int
mifare_classic_restore (MifareClassicTag tag, MifareClassicBlockNumber block) mifare_classic_restore (MifareClassicTag tag, const MifareClassicBlockNumber block)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -500,7 +500,7 @@ mifare_classic_restore (MifareClassicTag tag, MifareClassicBlockNumber block)
* Store the internal data register to the provided block. * Store the internal data register to the provided block.
*/ */
int int
mifare_classic_transfer (MifareClassicTag tag, MifareClassicBlockNumber block) mifare_classic_transfer (MifareClassicTag tag, const MifareClassicBlockNumber block)
{ {
if (!tag->active) { if (!tag->active) {
errno = EINVAL; errno = EINVAL;
@ -537,7 +537,7 @@ mifare_classic_transfer (MifareClassicTag tag, MifareClassicBlockNumber block)
* block. * block.
*/ */
int int
get_block_access_bits (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicAccessBits *block_access_bits) get_block_access_bits (MifareClassicTag tag, const MifareClassicBlockNumber block, MifareClassicAccessBits *block_access_bits)
{ {
/* /*
* The first block which holds the manufacturer block seems to have * The first block which holds the manufacturer block seems to have
@ -604,7 +604,7 @@ get_block_access_bits (MifareClassicTag tag, MifareClassicBlockNumber block, Mif
* Get information about the trailer block. * Get information about the trailer block.
*/ */
int int
mifare_classic_get_trailer_block_permission (MifareClassicTag tag, MifareClassicBlockNumber block, uint16_t permission, MifareClassicKeyType key_type) mifare_classic_get_trailer_block_permission (MifareClassicTag tag, const MifareClassicBlockNumber block, const uint16_t permission, const MifareClassicKeyType key_type)
{ {
MifareClassicAccessBits access_bits; MifareClassicAccessBits access_bits;
if (get_block_access_bits (tag, block, &access_bits) < 0) { if (get_block_access_bits (tag, block, &access_bits) < 0) {
@ -623,7 +623,7 @@ mifare_classic_get_trailer_block_permission (MifareClassicTag tag, MifareClassic
* Get information about data blocks. * Get information about data blocks.
*/ */
int int
mifare_classic_get_data_block_permission (MifareClassicTag tag, MifareClassicBlockNumber block, unsigned char permission, MifareClassicKeyType key_type) mifare_classic_get_data_block_permission (MifareClassicTag tag, const MifareClassicBlockNumber block, const unsigned char permission, const MifareClassicKeyType key_type)
{ {
MifareClassicAccessBits access_bits; MifareClassicAccessBits access_bits;
if (get_block_access_bits (tag, block, &access_bits) < 0) { if (get_block_access_bits (tag, block, &access_bits) < 0) {
@ -647,7 +647,7 @@ mifare_classic_get_data_block_permission (MifareClassicTag tag, MifareClassicBlo
* Reset a MIFARE target sector to factory default. * Reset a MIFARE target sector to factory default.
*/ */
int int
mifare_classic_format_sector (MifareClassicTag tag, MifareClassicBlockNumber block) mifare_classic_format_sector (MifareClassicTag tag, const MifareClassicBlockNumber block)
{ {
MifareClassicBlockNumber first_sector_block = (block / 4) * 4; MifareClassicBlockNumber first_sector_block = (block / 4) * 4;
/* /*
@ -688,7 +688,7 @@ mifare_classic_format_sector (MifareClassicTag tag, MifareClassicBlockNumber blo
* Generates a MIFARE trailer block. * Generates a MIFARE trailer block.
*/ */
void void
mifare_classic_trailer_block (MifareClassicBlock *block, MifareClassicKey key_a, uint8_t ab_0, uint8_t ab_1, uint8_t ab_2, uint8_t ab_tb, uint8_t gpb, MifareClassicKey key_b) mifare_classic_trailer_block (MifareClassicBlock *block, const MifareClassicKey key_a, const uint8_t ab_0, const uint8_t ab_1, const uint8_t ab_2, const uint8_t ab_tb, const uint8_t gpb, const MifareClassicKey key_b)
{ {
union mifare_classic_block *b = (union mifare_classic_block *)block; // *((union mifare_classic_block *)(&block)); union mifare_classic_block *b = (union mifare_classic_block *)block; // *((union mifare_classic_block *)(&block));

31
mifare_classic.h
View file

@ -20,6 +20,9 @@
#ifndef __MIFARE_CLASSIC_H__ #ifndef __MIFARE_CLASSIC_H__
#define __MIFARE_CLASSIC_H__ #define __MIFARE_CLASSIC_H__
#include <nfc/nfc.h>
#include <sys/types.h>
struct mifare_classic_tag; struct mifare_classic_tag;
typedef struct mifare_classic_tag *MifareClassicTag; typedef struct mifare_classic_tag *MifareClassicTag;
@ -32,27 +35,25 @@ typedef unsigned char MifareClassicKey[6];
MifareClassicTag *mifare_classic_get_tags (nfc_device_t *device); MifareClassicTag *mifare_classic_get_tags (nfc_device_t *device);
void mifare_classic_free_tags (MifareClassicTag *tags); void mifare_classic_free_tags (MifareClassicTag *tags);
int mifare_classic_connect (MifareClassicTag tag); int mifare_classic_connect (MifareClassicTag tag);
int mifare_classic_disconnect (MifareClassicTag tag); int mifare_classic_disconnect (MifareClassicTag tag);
int mifare_classic_authenticate (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicKey key, MifareClassicKeyType key_type); int mifare_classic_authenticate (MifareClassicTag tag, const MifareClassicBlockNumber block, const MifareClassicKey key, const MifareClassicKeyType key_type);
int mifare_classic_read (MifareClassicTag tag, const MifareClassicBlockNumber block, MifareClassicBlock *data);
int mifare_classic_init_value (MifareClassicTag tag, const MifareClassicBlockNumber block, const int32_t value, const MifareClassicBlockNumber adr);
int mifare_classic_read_value (MifareClassicTag tag, const MifareClassicBlockNumber block, int32_t *value, MifareClassicBlockNumber *adr);
int mifare_classic_write (MifareClassicTag tag, const MifareClassicBlockNumber block, const MifareClassicBlock data);
int mifare_classic_read (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicBlock *data); int mifare_classic_increment (MifareClassicTag tag, const MifareClassicBlockNumber block, const uint32_t amount);
int mifare_classic_init_value (MifareClassicTag tag, MifareClassicBlockNumber block, int32_t value, MifareClassicBlockNumber adr); int mifare_classic_decrement (MifareClassicTag tag, const MifareClassicBlockNumber block, const uint32_t amount);
int mifare_classic_read_value (MifareClassicTag tag, MifareClassicBlockNumber block, int32_t *value, MifareClassicBlockNumber *adr); int mifare_classic_restore (MifareClassicTag tag, const MifareClassicBlockNumber block);
int mifare_classic_write (MifareClassicTag tag, MifareClassicBlockNumber block, MifareClassicBlock data); int mifare_classic_transfer (MifareClassicTag tag, const MifareClassicBlockNumber block);
int mifare_classic_get_trailer_block_permission (MifareClassicTag tag, const MifareClassicBlockNumber block, const uint16_t permission, const MifareClassicKeyType key_type);
int mifare_classic_get_data_block_permission (MifareClassicTag tag, const MifareClassicBlockNumber block, const unsigned char permission, const MifareClassicKeyType key_type);
int mifare_classic_get_trailer_block_permission (MifareClassicTag tag, MifareClassicBlockNumber block, uint16_t permission, MifareClassicKeyType key_type); int mifare_classic_format_sector (MifareClassicTag tag, const MifareClassicBlockNumber block);
int mifare_classic_get_data_block_permission (MifareClassicTag tag, MifareClassicBlockNumber block, unsigned char permission, MifareClassicKeyType key_type); void mifare_classic_trailer_block (MifareClassicBlock *block, const MifareClassicKey key_a, const uint8_t ab_0, const uint8_t ab_1, const uint8_t ab_2, const uint8_t ab_tb, const uint8_t gpb, const MifareClassicKey key_b);
int mifare_classic_increment (MifareClassicTag tag, MifareClassicBlockNumber block, uint32_t amount);
int mifare_classic_decrement (MifareClassicTag tag, MifareClassicBlockNumber block, uint32_t amount);
int mifare_classic_restore (MifareClassicTag tag, MifareClassicBlockNumber block);
int mifare_classic_transfer (MifareClassicTag tag, MifareClassicBlockNumber block);
int mifare_classic_format_sector (MifareClassicTag tag, MifareClassicBlockNumber block);
void mifare_classic_trailer_block (MifareClassicBlock *block, MifareClassicKey key_a, uint8_t ab_0, uint8_t ab_1, uint8_t ab_2, uint8_t ab_tb, uint8_t gpb, MifareClassicKey key_b);
/* MIFARE Classic Access Bits */ /* MIFARE Classic Access Bits */
#define MCAB_R 0x8 #define MCAB_R 0x8