X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=82dcb2b3036cf410f72c778e54e1d4a0d23a1fef;hb=6dddd902244f314eba721a0d8804731ea9c9912d;hp=9b0df152b9d3e38bb3a002e8b497a855a6011d24;hpb=cfe064d8e74d86ab6a65779663ca1fb82e36260a;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index 9b0df152..82dcb2b3 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -34,7 +34,7 @@ SR_API struct sr_hwcap_option sr_hwcap_options[] = { {SR_HWCAP_SAMPLERATE, SR_T_UINT64, "Sample rate", "samplerate"}, {SR_HWCAP_CAPTURE_RATIO, SR_T_UINT64, "Pre-trigger capture ratio", "captureratio"}, - {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "patternmode"}, + {SR_HWCAP_PATTERN_MODE, SR_T_CHAR, "Pattern generator mode", "pattern"}, {SR_HWCAP_RLE, SR_T_BOOL, "Run Length Encoding", "rle"}, {0, 0, NULL, NULL}, }; @@ -307,15 +307,15 @@ SR_API struct sr_hwcap_option *sr_hw_hwcap_get(int hwcap) return NULL; } -/* unnecessary level of indirection follows. */ +/* Unnecessary level of indirection follows. */ -SR_PRIV void sr_source_remove(int fd) +SR_PRIV int sr_source_remove(int fd) { - sr_session_source_remove(fd); + return sr_session_source_remove(fd); } -SR_PRIV void sr_source_add(int fd, int events, int timeout, - sr_receive_data_callback rcv_cb, void *user_data) +SR_PRIV int sr_source_add(int fd, int events, int timeout, + sr_receive_data_callback_t cb, void *cb_data) { - sr_session_source_add(fd, events, timeout, rcv_cb, user_data); + return sr_session_source_add(fd, events, timeout, cb, cb_data); }