*/
#ifndef UTIL_H
-#define UTIL_H 1
+#define UTIL_H
#include <stdint.h>
#define XSTR(s) #s
-int bitpop(uint8_t bits);
-int biton(uint8_t bits);
+uint8_t bitpop(uint8_t bits);
+uint8_t bitpop16(uint16_t bits);
+uint8_t biton(uint8_t bits);
+uint8_t biton16(uint16_t bits);
#endif