From 35681d4e1d171117c9d4c2c4fd7d474b5871f81f Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Thu, 17 Mar 2011 11:44:08 +0100 Subject: Rename struct_name_t to struct_name and create typedefs --- src/cameras/pf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/cameras/pf.c') diff --git a/src/cameras/pf.c b/src/cameras/pf.c index 1ea3d3c..7f6ad0f 100644 --- a/src/cameras/pf.c +++ b/src/cameras/pf.c @@ -39,9 +39,9 @@ static struct uca_pf_map uca_to_pf[] = { { -1, NULL } }; -static uint32_t uca_pf_set_property(struct uca_camera_t *cam, enum uca_property_ids property, void *data) +static uint32_t uca_pf_set_property(struct uca_camera *cam, enum uca_property_ids property, void *data) { - struct uca_grabber_t *grabber = cam->grabber; + struct uca_grabber *grabber = cam->grabber; TOKEN t = INVALID_TOKEN; int i = 0; @@ -107,7 +107,7 @@ static uint32_t uca_pf_set_property(struct uca_camera_t *cam, enum uca_property_ } -static uint32_t uca_pf_get_property(struct uca_camera_t *cam, enum uca_property_ids property, void *data, size_t num) +static uint32_t uca_pf_get_property(struct uca_camera *cam, enum uca_property_ids property, void *data, size_t num) { TOKEN t; /* You gotta love developers who name types capitalized... */ PFValue value; @@ -161,17 +161,17 @@ static uint32_t uca_pf_get_property(struct uca_camera_t *cam, enum uca_property_ return UCA_NO_ERROR; } -uint32_t uca_pf_start_recording(struct uca_camera_t *cam) +uint32_t uca_pf_start_recording(struct uca_camera *cam) { return cam->grabber->acquire(cam->grabber, -1); } -uint32_t uca_pf_stop_recording(struct uca_camera_t *cam) +uint32_t uca_pf_stop_recording(struct uca_camera *cam) { return UCA_NO_ERROR; } -uint32_t uca_pf_grab(struct uca_camera_t *cam, char *buffer) +uint32_t uca_pf_grab(struct uca_camera *cam, char *buffer) { uint16_t *frame; uint32_t err = cam->grabber->grab(cam->grabber, (void **) &frame, &cam->current_frame); @@ -182,13 +182,13 @@ uint32_t uca_pf_grab(struct uca_camera_t *cam, char *buffer) return UCA_NO_ERROR; } -static uint32_t uca_pf_destroy(struct uca_camera_t *cam) +static uint32_t uca_pf_destroy(struct uca_camera *cam) { pfDeviceClose(0); return UCA_NO_ERROR; } -uint32_t uca_pf_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber) +uint32_t uca_pf_init(struct uca_camera **cam, struct uca_grabber *grabber) { int num_ports; if ((grabber == NULL) || (pfPortInit(&num_ports) < 0) || (pfDeviceOpen(0) < 0)) @@ -197,7 +197,7 @@ uint32_t uca_pf_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber) /* We could check if a higher baud rate is supported, but... forget about * it. We don't need high speed configuration. */ - struct uca_camera_t *uca = (struct uca_camera_t *) malloc(sizeof(struct uca_camera_t)); + struct uca_camera *uca = (struct uca_camera *) malloc(sizeof(struct uca_camera)); uca->grabber = grabber; uca->grabber->asynchronous = true; -- cgit v1.2.3