Fix up build

diff --git a/configure.ac b/configure.ac
index 64bc08b0c3b251518bf637cc611acb8168e97c78..5aaae7b50051d5bdb2a52d65f58fb298b565ad87 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,4 +7,6 @@ AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 
+PKG_CHECK_MODULES([YUBIYUBO],[libhid])
+
 AC_OUTPUT([Makefile src/Makefile])

diff --git a/src/Makefile.am b/src/Makefile.am
index de04696b4fec2cc7f9606e4e8bfdb4c6fb71a9be..c43ff09a0587239aace9ddcf8ae50768dcec0410 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,3 +7,5 @@ yubiyubo_SOURCES = \
        crc13239.c \
        yubiyubo.c
 
+yubiyubo_LDADD =  @YUBIYUBO_LIBS@
+AM_CFLAGS = @YUBIYUBO_CFLAGS@

diff --git a/src/crc13239.c b/src/crc13239.c
index cd654419c3cd8c634679d4188c5dbd20bb34b88b..eef65d4f6579e6c6a47d5ffd221ace692124f62b 100644 (file)
--- a/src/crc13239.c
+++ b/src/crc13239.c
@@ -22,13 +22,14 @@ void crc_init(unsigned short *c) {
        *c = 0xffff;
 }
 
-void crc_update(unsigned short *c, unsigned char val) {
+void crc_update(unsigned short *m_crc, unsigned char val) {
        int i, j;
-       m_crc ^= val;
+       *m_crc ^= val;
        for (i = 0; i < 8; i++) {
-               j = m_crc & 1;
-               m_crc >>= 1;
-               if (j) m_crc ^= 0x8408;
+               j = *m_crc & 1;
+               *m_crc >>= 1;
+               if (j)
+                       *m_crc ^= 0x8408;
        }
 
 }
@@ -36,12 +37,12 @@ void crc_update(unsigned short *c, unsigned char val) {
 unsigned short crc_get_full(unsigned char *data, size_t len, bool onecomp) {
        unsigned short c;
        crc_init(&c);
-       while (bcnt--)
-               crc_update(&c, *bp++);
+       while (len--)
+               crc_update(&c, *(data++));
        return onecomp ? ~c : c;
 }
 
 bool crc_check(unsigned short *c, char *crc) {
-       return (((c & 0xff) == crc[0]) &&
-               ((c >> 8) == crc[1]));
+       return (((*c & 0xff) == crc[0]) &&
+               ((*c >> 8) == crc[1]));
 }

diff --git a/src/crc13239.h b/src/crc13239.h
index 266a8e047f93f1ff888f014a35f65645125ba3d9..d420f5635546d77c54c5f293d2f783d69a7a4930 100644 (file)
--- a/src/crc13239.h
+++ b/src/crc13239.h
@@ -15,12 +15,15 @@
  *
  */
 
+#include <sys/types.h>
+#include <stdbool.h>
+
 #ifndef _CRC13239_H
 #define _CRC13239_H
 #define CRC_OK_RESIDUE  0xf0b8
 
 void crc_init(unsigned short *c);
-void crc_update(unsigned short *c, unsigned char *val);
+void crc_update(unsigned short *c, unsigned char val);
 unsigned short crc_get_full(unsigned char *data, size_t len, bool onecomp);
 bool crc_check(unsigned short *c, char *crc);
 

diff --git a/src/yubiyubo.c b/src/yubiyubo.c
index e01e492297440893ce75f59db9dae186aa4c49bc..d2cb63fcbd5c7d41e5162698e83119025d823890 100644 (file)
--- a/src/yubiyubo.c
+++ b/src/yubiyubo.c
@@ -67,6 +67,3 @@ int main(int argc, char **argv)
 
        return 0;
 }
-
-
-}