summaryrefslogtreecommitdiff
path: root/camlibs/barbie
diff options
context:
space:
mode:
authorScott Fritzinger <scottf@unr.edu>2000-07-14 20:14:31 +0000
committerScott Fritzinger <scottf@unr.edu>2000-07-14 20:14:31 +0000
commitf61d773170837ea7d837aa3da6cfcd845df36948 (patch)
tree44f8812d8c6c0ab7290231b2445494d1dd043cd2 /camlibs/barbie
parentfdb6c84fb4ef714eebec7f08c94b11b7270bb753 (diff)
downloadlibgphoto2-f61d773170837ea7d837aa3da6cfcd845df36948.tar.gz
remove camera_debug_set function, moved to CameraInit flag
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@673 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/barbie')
-rw-r--r--camlibs/barbie/barbie.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/camlibs/barbie/barbie.c b/camlibs/barbie/barbie.c
index 61cb339d8..7a428865c 100644
--- a/camlibs/barbie/barbie.c
+++ b/camlibs/barbie/barbie.c
@@ -259,13 +259,6 @@ int camera_id (char *id) {
return (GP_OK);
}
-int camera_debug_set (int value) {
-
- glob_debug=value;
-
- return (GP_OK);
-}
-
int camera_abilities (CameraAbilities *abilities, int *count) {
*count = 3;
@@ -297,6 +290,8 @@ int camera_abilities (CameraAbilities *abilities, int *count) {
int camera_init(CameraInit *init) {
+ glob_debug = init->debug;
+
if (glob_debug)
printf("barbie: Initializing the camera\n");
@@ -304,6 +299,8 @@ int camera_init(CameraInit *init) {
gpio_close(dev);
gpio_free(dev);
}
+
+
dev = gpio_new(GPIO_DEVICE_SERIAL);
gpio_set_timeout(dev, 5000);
strcpy(settings.serial.port, init->port_settings.path);
@@ -313,12 +310,14 @@ int camera_init(CameraInit *init) {
settings.serial.parity = 0;
settings.serial.stopbits= 1;
+
gpio_set_settings(dev, settings);
gpio_open(dev);
strcpy(glob_camera_model, init->model);
+
return (barbie_ping());
}