diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index 7565b24d6..4d0dab97c 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -23,7 +23,9 @@ int sierra_valid_type (char b) (byte == TYPE_DATA) || (byte == TYPE_DATA_END)) return (GP_OK); - return (GP_ERROR); + + gp_debug_printf (GP_DEBUG_HIGH, "sierra", "* invalid type!"); + return (GP_ERROR_CORRUPTED_DATA); } int sierra_valid_packet (Camera *camera, char *packet) { @@ -44,7 +46,7 @@ int sierra_valid_packet (Camera *camera, char *packet) { return (GP_ERROR); } - switch((unsigned char)packet[0]) { + switch ((unsigned char)packet[0]) { case NUL: case ENQ: case ACK: @@ -77,10 +79,10 @@ int sierra_write_packet (Camera *camera, char *packet) { /* Generate the checksum */ if (length > 1) { - for (x=4; x> 8) & 0xff; + packet[length-2] = checksum & 0xff; + packet[length-1] = (checksum >> 8) & 0xff; } /* USB */ @@ -398,34 +400,35 @@ int sierra_get_int_register (Camera *camera, int reg, int *value) packet[4] = 0x01; packet[5] = reg; - while (r++2048? 2048 : length+2; + size = (length + 2 - x) > 2048? 2048 : length + 2; } else { - size = (length-x)>2048? 2048 : length; - if (x+size < length) + size = (length - x) > 2048? 2048 : length; + if (x + size < length) type = TYPE_DATA; else type = TYPE_DATA_END; } - sierra_build_packet(camera, type, seq, size, packet); + CHECK (sierra_build_packet (camera, type, seq, size, packet)); if (type == TYPE_COMMAND) { packet[4] = 0x03; packet[5] = reg; - memcpy(&packet[6], &s[x], size-2); + memcpy (&packet[6], &s[x], size-2); x += size - 2; } else { packet[1] = seq++; - memcpy(&packet[4], &s[x], size); + memcpy (&packet[4], &s[x], size); x += size; } r = 0; done = 0; - while ((r++size. */ - - gp_file_append(file, &packet[4], packlength); - - /* 2) Call gp_frontend_progress to let the front-end know */ - /* the current transfer status. The front-end has */ - /* the option of reading the data that was just */ - /* transferred by using gp_file_chunk */ - + gp_file_append (file, &packet[4], packlength); if (do_percent) - gp_frontend_progress (camera, file, + gp_frontend_progress (camera, file, (float)(100.0*(float)x/(float)(l))); } @@ -588,8 +579,10 @@ int sierra_get_string_register (Camera *camera, int reg, int file_number, if (packet[0] == TYPE_DATA_END) done = 1; } + if (length) *length = x; + return (GP_OK); } @@ -597,35 +590,33 @@ int sierra_delete (Camera *camera, int picture_number) { char packet[4096], buf[4096]; int r, done; - int ret; gp_debug_printf (GP_DEBUG_HIGH, "sierra", "* sierra_delete"); gp_debug_printf (GP_DEBUG_HIGH, "sierra", "* picture: %i", picture_number); - ret = sierra_set_int_register (camera, 4, picture_number); - if (ret != GP_OK) - return (ret); + CHECK (sierra_set_int_register (camera, 4, picture_number)); + + CHECK (sierra_build_packet (camera, TYPE_COMMAND, 0, 3, packet)); - sierra_build_packet(camera, TYPE_COMMAND, 0, 3, packet); packet[4] = 0x02; packet[5] = 0x07; packet[6] = 0x00; - r=0; done=0; - while ((!done)&&(r++ RETRIES) @@ -817,6 +808,7 @@ int sierra_capture (Camera *camera, int capture_type, CameraFilePath *filepath) CHECK (sierra_get_int_register (camera, 4, &picnum)); //FIXME: In which folder??? + strcpy (filepath->folder, "/"); /* Get the picture filename */ gp_debug_printf (GP_DEBUG_LOW, "sierra", @@ -832,6 +824,7 @@ int sierra_capture (Camera *camera, int capture_type, CameraFilePath *filepath) /* Filename not supported. */ //FIXME: Which filename??? + strcpy (filepath->name, ""); } return (GP_OK); diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index 0142f8b6d..72735b0da 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -169,6 +169,7 @@ int camera_init (Camera *camera) switch (camera->port->type) { case GP_PORT_SERIAL: + ret = gp_port_new (&(fd->dev), GP_PORT_SERIAL); if (ret != GP_OK) { free (fd); @@ -181,6 +182,7 @@ int camera_init (Camera *camera) settings.serial.parity = 0; settings.serial.stopbits = 1; break; + case GP_PORT_USB: /* Lookup the USB information */ @@ -194,8 +196,10 @@ int camera_init (Camera *camera) } /* Couldn't find the usb information */ - if ((vendor == 0) && (product == 0)) - return (GP_ERROR); + if ((vendor == 0) && (product == 0)) { + free (fd); + return (GP_ERROR_MODEL_NOT_FOUND); + } ret = gp_port_new (&(fd->dev), GP_PORT_USB); if (ret != GP_OK) { @@ -217,7 +221,9 @@ int camera_init (Camera *camera) settings.usb.interface = 0; settings.usb.altsetting = 0; break; + default: + free (fd); return (GP_ERROR_IO_UNKNOWN_PORT); } @@ -239,8 +245,8 @@ int camera_init (Camera *camera) return (ret); } - switch (camera->port->type) { - case GP_PORT_SERIAL: + /* If it is a serial camera, check if it's really there. */ + if (camera->port->type == GP_PORT_SERIAL) { ret = sierra_ping (camera); if (ret != GP_OK) { @@ -257,13 +263,10 @@ int camera_init (Camera *camera) } fd->speed = camera->port->speed; - break; - case GP_PORT_USB: - gp_port_usb_clear_halt (fd->dev, GP_PORT_USB_ENDPOINT_IN); - break; - default: - break; } + + if (camera->port->type == GP_PORT_USB) + gp_port_usb_clear_halt (fd->dev, GP_PORT_USB_ENDPOINT_IN); ret = sierra_get_int_register (camera, 1, &value); if (ret != GP_OK) { @@ -272,6 +275,7 @@ int camera_init (Camera *camera) return (ret); } + /* FIXME??? What's that for? */ ret = sierra_set_int_register (camera, 83, -1); if (ret != GP_OK) { gp_debug_printf (GP_DEBUG_LOW, "sierra", "*** Could not set "