Merge changes

1 files changed, 19 insertions, 4 deletions

diff --git a/tools.h b/tools.h
index 718d8df..747fc37 100644
--- a/tools.h
+++ b/tools.h
@@ -1,9 +1,24 @@
 #ifndef _PCITOOL_TOOLS_H
 #define _PCITOOL_TOOLS_H
 
-void * memcpy8(void * dst, void const * src, size_t len);
-void * memcpy32(void * dst, void const * src, size_t len);
-void * memcpy64(void * dst, void const * src, size_t len);
-int get_page_mask();
+#include <stdio.h>
+#include <stdint.h>
+
+#include "pci.h"
+
+int pcilib_isnumber(const char *str);
+int pcilib_isxnumber(const char *str);
+
+uint16_t pcilib_swap16(uint16_t x);
+uint32_t pcilib_swap32(uint32_t x);
+uint64_t pcilib_swap64(uint64_t x);
+void pcilib_swap(void *dst, void *src, size_t size, size_t n);
+
+void * pcilib_memcpy8(void * dst, void const * src, size_t len);
+void * pcilib_memcpy32(void * dst, void const * src, size_t len);
+void * pcilib_memcpy64(void * dst, void const * src, size_t len);
+void * pcilib_datacpy32(void * dst, void const * src, uint8_t size, size_t n, pcilib_endianess_t big_endian);
+
+int pcilib_get_page_mask();
 
 #endif /* _PCITOOL_TOOS_H */