diff options
author | Lutz Mueller <lutz@users.sourceforge.net> | 2001-10-20 12:36:15 +0000 |
---|---|---|
committer | Lutz Mueller <lutz@users.sourceforge.net> | 2001-10-20 12:36:15 +0000 |
commit | 76a19b0b5338df68ffd17cd88aaae4259620111c (patch) | |
tree | efeffca6eb511676eecf711279ea60da333ce534 /camlibs/sonydscf1 | |
parent | 56fd54e16e0d4188a21b05c932dc5cf7ab348553 (diff) | |
download | libgphoto2-76a19b0b5338df68ffd17cd88aaae4259620111c.tar.gz |
2001-10-20 Lutz M�ller <urc8@rz.uni-karlsruhe.de>
* camlibs: Instead of camera->port_info->speed, use
settings.serial.speed. That lets us ...
* libgphoto2/gphoto2-camera.[c,h]: ... remove camera->port_info
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2653 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sonydscf1')
-rw-r--r-- | camlibs/sonydscf1/sonydscf1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 092ce967c..399c5a9ef 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -170,13 +170,13 @@ int camera_init (Camera *camera) { //FIXME: This won't work with several frontends. NO GLOBALS PLEASE! dev = camera->port; - gp_port_timeout_set(camera->port, 5000); + /* Configure the port */ + gp_port_timeout_set (camera->port, 5000); gp_port_settings_get (camera->port, &settings); - settings.serial.speed = camera->port_info->speed; settings.serial.bits = 8; settings.serial.parity = 0; settings.serial.stopbits= 1; - gp_port_settings_set(camera->port, settings); + gp_port_settings_set (camera->port, settings); /* Set up the filesystem */ gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera); |