bvl: OS/2 Updates

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2207 67ed7778-7388-44ab-90cf-0a291f65f57c

2 files changed, 8 insertions, 6 deletions

diff --git a/camlibs/sonydscf1/chotplay.c b/camlibs/sonydscf1/chotplay.c
index 2d899468e..eb9734eba 100644
--- a/camlibs/sonydscf1/chotplay.c
+++ b/camlibs/sonydscf1/chotplay.c
@@ -266,6 +266,7 @@ long get_file(char *name, char **data, int format, int verbose)
   u_char jpeg_comment[256];
 
   //verbose=1;
+  gp_frontend_progress(NULL, NULL, 0);
   F1ok();
 
   F1status(0);
@@ -296,6 +297,7 @@ long get_file(char *name, char **data, int format, int verbose)
     if(len < 0)
       return(0);
     total = total + len;
+    gp_frontend_progress(NULL, NULL, ((float)total / (float)filelen)*100);
     if(verbose){
       fprintf(stderr, "%6u/", total);
       fprintf(stderr, "%6u", filelen);
@@ -311,6 +313,7 @@ long get_file(char *name, char **data, int format, int verbose)
   F1fclose();
   if(verbose)
     fprintf(stderr, "\n");
+  gp_frontend_progress(NULL, NULL, 100);
   return(total);
 }
 
diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c
index 97dd36fcb..1fb2f6c66 100644
--- a/camlibs/sonydscf1/command.c
+++ b/camlibs/sonydscf1/command.c
@@ -39,7 +39,7 @@ void wbyte(u_char c)
   //if (writetty(F1fd, &c, 1) < 0) {
   if( gp_port_write(dev, (char*)temp, 1) <0) {
     perror("wbyte");
-    Exit(1);
+    //Exit(1);
   }
 }
 
@@ -49,7 +49,7 @@ u_char rbyte()
   //if (readtty(F1fd, &c, 1) < 0) {
   if (gp_port_read(dev,c, 1) <0) {
     perror("rbtyte");
-    Exit(1);
+    //Exit(1);
   }
   dprintf((stderr, "< %02x\n", c));
 
@@ -63,7 +63,7 @@ wstr(u_char *p, int len)
   //if (writetty(F1fd, p, len) < 0) {
   if( gp_port_write(dev, p, len) <0) {
     perror("wstr");
-    Exit(1);
+    //Exit(1);
   }
 }
 
@@ -74,7 +74,7 @@ inline void rstr(u_char *p, int len)
   //if (readtty(F1fd, p, len) < 0) {
   if (gp_port_read(dev,p, len) <0) {
     perror("rstr");
-    Exit(1);
+    //Exit(1);
   }
 }
 
@@ -336,7 +336,6 @@ long F1fread(u_char *data, long len)
 
   buf[6] = (len >> 8) & 0xff;
   buf[7] = 0xff & len;
-  fprintf(stderr, "x");
   sendcommand(buf, 8);
   rstr(buf, 9);
   if((buf[2] != 0x02) || (buf[3] != 0x0C) || (buf[4] != 0x00)){
@@ -586,5 +585,5 @@ void Exit(code)
     F1reset();
     closetty(F1getfd());
   } */
-  exit(code);
+  //exit(code);
 }