diff options
| author | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-07-06 02:34:39 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@dside.dyndns.org> | 2011-07-06 02:34:39 +0200 |
| commit | aeb8640bfb36a27cf31945a8b479f833aebf8fdc (patch) | |
| tree | bb2414f85cab6075604461f727a733c88a97924d /ipecamera | |
| parent | 82ef73c3fe424f95da3638ceb836386c4588b5c7 (diff) | |
| download | pcitool-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.tar.gz pcitool-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.tar.bz2 pcitool-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.tar.xz pcitool-aeb8640bfb36a27cf31945a8b479f833aebf8fdc.zip | |
A bit of renaming
Diffstat (limited to 'ipecamera')
| -rw-r--r-- | ipecamera/image.c | 4 | ||||
| -rw-r--r-- | ipecamera/image.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ipecamera/image.c b/ipecamera/image.c index d9a19cc..bf5faf9 100644 --- a/ipecamera/image.c +++ b/ipecamera/image.c @@ -53,7 +53,7 @@ struct ipecamera_s { char *data; size_t size; - pcilib_callback_t cb; + pcilib_event_callback_t cb; void *cb_user; pcilib_event_id_t event_id; @@ -259,7 +259,7 @@ int ipecamera_reset(pcilib_context_t *vctx) { return 0; } -int ipecamera_start(pcilib_context_t *vctx, pcilib_event_t event_mask, pcilib_callback_t cb, void *user) { +int ipecamera_start(pcilib_context_t *vctx, pcilib_event_t event_mask, pcilib_event_callback_t cb, void *user) { int err = 0; ipecamera_t *ctx = (ipecamera_t*)vctx; pcilib_t *pcilib = ctx->pcilib; diff --git a/ipecamera/image.h b/ipecamera/image.h index 0418be4..6863d09 100644 --- a/ipecamera/image.h +++ b/ipecamera/image.h @@ -10,7 +10,7 @@ pcilib_context_t *ipecamera_init(pcilib_t *pcilib); void ipecamera_free(pcilib_context_t *ctx); int ipecamera_reset(pcilib_context_t *ctx); -int ipecamera_start(pcilib_context_t *ctx, pcilib_event_t event_mask, pcilib_callback_t cb, void *user); +int ipecamera_start(pcilib_context_t *ctx, pcilib_event_t event_mask, pcilib_event_callback_t cb, void *user); int ipecamera_stop(pcilib_context_t *ctx); int ipecamera_trigger(pcilib_context_t *ctx, pcilib_event_t event, size_t trigger_size, void *trigger_data); pcilib_event_id_t ipecamera_next_event(pcilib_context_t *ctx, pcilib_event_t event_mask, const struct timespec *timeout); |