diff options
| author | Lutz Mueller <lutz@users.sourceforge.net> | 2001-01-09 18:58:09 +0000 |
|---|---|---|
| committer | Lutz Mueller <lutz@users.sourceforge.net> | 2001-01-09 18:58:09 +0000 |
| commit | 7dd3b982423739023b353903502ff2ab01e007ad (patch) | |
| tree | 54c1e87e66634490e4f53518486c5a5468baf849 /camlibs/digita/serial.c | |
| parent | d29ab36672747add8f202d07e9bc28f68c54a77a (diff) | |
| download | libgphoto2-7dd3b982423739023b353903502ff2ab01e007ad.tar.gz | |
API change: gp_camera_init (Camera *camera, CameraInit *init) -> gp_camera_init (Camera *camera).
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1504 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/digita/serial.c')
| -rw-r--r-- | camlibs/digita/serial.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/camlibs/digita/serial.c b/camlibs/digita/serial.c index f936d0a0c..0054a1ab6 100644 --- a/camlibs/digita/serial.c +++ b/camlibs/digita/serial.c @@ -168,8 +168,7 @@ static int digita_serial_read(struct digita_device *dev, void *_buffer, int len) return received; } -int digita_serial_open(struct digita_device *dev, Camera *camera, - CameraInit *init) +int digita_serial_open(struct digita_device *dev, Camera *camera) { gpio_device_settings settings; struct beacon beacon; @@ -180,7 +179,7 @@ int digita_serial_open(struct digita_device *dev, Camera *camera, if (!dev->gpdev) return -1; - strcpy(settings.serial.port,init->port.path); + strcpy(settings.serial.port,camera->port->path); settings.serial.speed = 9600; settings.serial.bits = 8; @@ -203,7 +202,7 @@ int digita_serial_open(struct digita_device *dev, Camera *camera, usleep(50); - dev->gpdev->settings.serial.speed = init->port.speed; + dev->gpdev->settings.serial.speed = camera->port->speed; gpio_serial_set_baudrate(dev->gpdev); usleep(2000); @@ -223,7 +222,7 @@ printf("%04X %04X %04X %02X\n", beacon_ack.cf_reserved = 0; beacon_ack.cf_pod_receive_mode = 0; beacon_ack.cf_host_receive_mode = 0; - beacon_ack.dataspeed = htonl(init->port.speed); + beacon_ack.dataspeed = htonl(camera->port->speed); beacon_ack.deviceframesize = htons(1023); beacon_ack.hostframesize = htons(1023); beacon_ack.checksum = 0; |