diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-01-14 09:39:11 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-01-14 09:39:11 +0000 |
| commit | d06c9437a05d0b9da68c7f1a22e1e37e4ce88a69 (patch) | |
| tree | 8f7aa7d611442f9916ad6d12fa606550bf37ce71 /os/various | |
| parent | ecd03e17cec7c9d2d928314d59e9d4ed427f74c3 (diff) | |
| download | ChibiOS-d06c9437a05d0b9da68c7f1a22e1e37e4ce88a69.tar.gz ChibiOS-d06c9437a05d0b9da68c7f1a22e1e37e4ce88a69.tar.bz2 ChibiOS-d06c9437a05d0b9da68c7f1a22e1e37e4ce88a69.zip | |
Merged last WolfSSL patch.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11269 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/various')
| -rw-r--r-- | os/various/wolfssl_bindings/wolfssl_chibios.c | 2 | ||||
| -rw-r--r-- | os/various/wolfssl_bindings/wolfssl_chibios.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/os/various/wolfssl_bindings/wolfssl_chibios.c b/os/various/wolfssl_bindings/wolfssl_chibios.c index 2c0594517..f73ddf095 100644 --- a/os/various/wolfssl_bindings/wolfssl_chibios.c +++ b/os/various/wolfssl_bindings/wolfssl_chibios.c @@ -188,7 +188,7 @@ int wolfssl_recv_cb(WOLFSSL *ssl, char *buf, int sz, void *ctx) #endif -uint32_t LowResTimer(void) +word32 LowResTimer(void) { systime_t t = chVTGetSystemTimeX(); return ST2S(t); diff --git a/os/various/wolfssl_bindings/wolfssl_chibios.h b/os/various/wolfssl_bindings/wolfssl_chibios.h index ae150af09..18f7781be 100644 --- a/os/various/wolfssl_bindings/wolfssl_chibios.h +++ b/os/various/wolfssl_bindings/wolfssl_chibios.h @@ -39,6 +39,7 @@ #ifndef WOLFSSL_SK_H #define WOLFSSL_SK_H #include "wolfssl/ssl.h" +#include "wolfssl/wolfcrypt/types.h" #include "lwip/opt.h" #include "lwip/arch.h" #include "lwip/api.h" @@ -63,5 +64,6 @@ int wolfssl_recv_cb(WOLFSSL *ssl, char *buf, int sz, void *ctx); void *chibios_alloc(void *heap, int size); void chibios_free(void *ptr); +word32 LowResTimer(void); #endif |