summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2008-01-26 20:21:59 +0000
committerlaforge <laforge@e0336214-984f-0b4b-a45f-81c69e1f0ede>2008-01-26 20:21:59 +0000
commitbe84ee238f448a5eab596b12efb86efc00f9e89d (patch)
treedc6be254302300e2b61579d0e0ce2274100ebbef /src
parent7cf71fab95056b3c812b21247a24bab74678980b (diff)
fix more compiler warnings, based on a patch by Rainer Keller
git-svn-id: https://svn.gnumonks.org/trunk/librfid@2052 e0336214-984f-0b4b-a45f-81c69e1f0ede
Diffstat (limited to 'src')
-rw-r--r--src/rfid_layer2_iso14443a.c6
-rw-r--r--src/rfid_layer2_iso15693.c2
-rw-r--r--src/rfid_protocol.c2
-rw-r--r--src/rfid_reader_openpcd.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/rfid_layer2_iso14443a.c b/src/rfid_layer2_iso14443a.c
index 66914db..cdd6b23 100644
--- a/src/rfid_layer2_iso14443a.c
+++ b/src/rfid_layer2_iso14443a.c
@@ -43,7 +43,7 @@ iso14443a_transceive_sf(struct rfid_layer2_handle *handle,
unsigned char cmd,
struct iso14443a_atqa *atqa)
{
- struct rfid_reader *rdr = handle->rh->reader;
+ const struct rfid_reader *rdr = handle->rh->reader;
return rdr->iso14443a.transceive_sf(handle->rh, cmd, atqa);
}
@@ -54,7 +54,7 @@ iso14443a_transceive_acf(struct rfid_layer2_handle *handle,
struct iso14443a_anticol_cmd *acf,
unsigned int *bit_of_col)
{
- struct rfid_reader *rdr = handle->rh->reader;
+ const struct rfid_reader *rdr = handle->rh->reader;
return rdr->iso14443a.transceive_acf(handle->rh, acf, bit_of_col);
}
@@ -289,7 +289,7 @@ iso14443a_setopt(struct rfid_layer2_handle *handle, int optname,
const void *optval, unsigned int optlen)
{
int ret = -EINVAL;
- struct rfid_reader *rdr = handle->rh->reader;
+ const struct rfid_reader *rdr = handle->rh->reader;
unsigned int speed;
switch (optname) {
diff --git a/src/rfid_layer2_iso15693.c b/src/rfid_layer2_iso15693.c
index 7c988db..1c1ee1c 100644
--- a/src/rfid_layer2_iso15693.c
+++ b/src/rfid_layer2_iso15693.c
@@ -95,7 +95,7 @@ iso15693_anticol(struct rfid_layer2_handle *handle)
static int
iso15693_getopt(struct rfid_layer2_handle *handle,
- int optname, void *optval, unsigned int optlen)
+ int optname, void *optval, unsigned int *optlen)
{
switch (optname) {
case RFID_OPT_15693_MOD_DEPTH:
diff --git a/src/rfid_protocol.c b/src/rfid_protocol.c
index 0cd4f66..9d70e90 100644
--- a/src/rfid_protocol.c
+++ b/src/rfid_protocol.c
@@ -33,7 +33,7 @@ static const struct rfid_protocol *rfid_protocols[] = {
struct rfid_protocol_handle *
rfid_protocol_init(struct rfid_layer2_handle *l2h, unsigned int id)
{
- struct rfid_protocol *p;
+ const struct rfid_protocol *p;
struct rfid_protocol_handle *ph = NULL;
if (id >= ARRAY_SIZE(rfid_protocols))
diff --git a/src/rfid_reader_openpcd.c b/src/rfid_reader_openpcd.c
index 8adf1ee..67b73b6 100644
--- a/src/rfid_reader_openpcd.c
+++ b/src/rfid_reader_openpcd.c
@@ -269,8 +269,8 @@ static int openpcd_get_environment(
static int openpcd_set_environment(
struct rfid_reader_handle *rh,
- const unsigned char num_bytes,
- unsigned char *buf)
+ unsigned char num_bytes,
+ const unsigned char *buf)
{
int ret;
personal git repositories of Harald Welte. Your mileage may vary