diff --git a/camlibs/fujitsu/fujitsu.c b/camlibs/fujitsu/fujitsu.c index 80400bb09..54c8747d8 100644 --- a/camlibs/fujitsu/fujitsu.c +++ b/camlibs/fujitsu/fujitsu.c @@ -3,45 +3,46 @@ #include "fujitsu.h" #include "library.h" +int glob_first_packet = 1; + void fujitsu_dump_packet (char *packet) { - /* packet is assumed to have gone through ntohs() already */ int x, length=0; char buf[4096]; - if ((packet[0] == TYPE_COMMAND) || (packet[0] == TYPE_SEQUENCE) || (packet[0] == TYPE_END)) { - length = 6 + packet[2]; + length = ((unsigned char)packet[2] & 0xff) | ((unsigned char)packet[3] << 8); + length += 6; } else { switch((unsigned char)packet[0]) { case NUL: - strcpy(buf, " packet: NUL"); + strcpy(buf, " packet: NUL"); break; case ENQ: - strcpy(buf, " packet: ENQ"); + strcpy(buf, " packet: ENQ"); break; case ACK: - strcpy(buf, " packet: ACK"); + strcpy(buf, " packet: ACK"); break; case DC1: - strcpy(buf, " packet: DC1"); + strcpy(buf, " packet: DC1"); break; case NAK: - strcpy(buf, " packet: NAK (Camera Signature)"); + strcpy(buf, " packet: NAK (Camera Signature)"); break; case TRM: - strcpy(buf, " packet: TRM"); + strcpy(buf, " packet: TRM"); break; default: - sprintf(buf, " packet: 0x%02x (UNKNOWN!)", packet[0]); + sprintf(buf, " packet: 0x%02x (UNKNOWN!)", packet[0]); } debug_print(buf); return; } - strcpy(buf, " packet:"); + strcpy(buf, " packet:"); for (x=0; x> 8) & 0xff; } + + /* Dump packet if debug */ fujitsu_dump_packet(packet); - strncpy(p, packet, length); + ret = gpio_write(dev, packet, length); - /* Convert to network order */ - if (length > 1) { - for (x=2; x> 8; @@ -224,6 +219,14 @@ int fujitsu_write_ack(gpio_device *dev) { return (fujitsu_write_packet(dev, buf)); } +int fujitsu_write_nak(gpio_device *dev) { + + char buf[4096]; + + buf[0] = NAK; + return (fujitsu_write_packet(dev, buf)); +} + int fujitsu_ping(gpio_device *dev) { int r=0; @@ -248,6 +251,48 @@ int fujitsu_ping(gpio_device *dev) { return (GP_ERROR); } +int fujitsu_set_speed(gpio_device *dev, int speed) { + + gpio_device_settings settings; + char buf[1024]; + + sprintf(buf, "Setting speed to %i", speed); + debug_print(buf); + + glob_first_packet = 1; + + gpio_get_settings(dev, &settings); + settings.serial.speed = speed; + switch (speed) { + case 9600: + speed = 1; + break; + case 19200: + speed = 2; + break; + case 38400: + speed = 3; + break; + case 57600: + speed = 4; + break; + case 0: /* Default speed */ + case 115200: + speed = 5; + break; + default: + return (GP_ERROR); + } + + if (fujitsu_set_int_register(dev, 17, speed)==GP_ERROR) + return (GP_ERROR); + sleep(1); + if (gpio_set_settings(dev, settings)==GPIO_ERROR) + return (GP_ERROR); + + return (GP_OK); +} + int fujitsu_set_int_register (gpio_device *dev, int reg, int value) { int l=0, r=0; @@ -257,7 +302,7 @@ int fujitsu_set_int_register (gpio_device *dev, int reg, int value) { sprintf(buf, "Setting register #%i to %i", reg, value); debug_print(buf); - fujitsu_build_packet(TYPE_COMMAND, SUBTYPE_COMMAND_FIRST,6, p); + fujitsu_build_packet(TYPE_COMMAND, 0, 6, p); /* Fill in the data */ p[4] = 0x00; @@ -281,31 +326,41 @@ int fujitsu_set_int_register (gpio_device *dev, int reg, int value) { int fujitsu_get_int_register (gpio_device *dev, int reg) { - int l=0, r=0, do_ack; + int l=0, r=0, write_nak=0; char packet[4096]; char buf[4096]; sprintf(buf, "Getting register #%i value", reg); debug_print(buf); - fujitsu_build_packet(TYPE_COMMAND, SUBTYPE_COMMAND_FIRST,2, packet); + fujitsu_build_packet(TYPE_COMMAND, 0, 2, packet); /* Fill in the data */ packet[4] = 0x01; packet[5] = reg; while (r++speed) -// settings.serial.speed = init->port_settings.speed; -// else - settings.serial.speed = 57600; - gpio_set_settings(glob_dev, settings); - sleep(2); - value = fujitsu_get_int_register(glob_dev, 1); if (value == GP_ERROR) { interface_message("Can not get the quality setting"); return (GP_ERROR); } -/* if (fujitsu_set_int_register(glob_dev, 1, 2)==GP_ERROR) { interface_message("Can not set camera quality"); return (GP_ERROR); } +/* if (fujitsu_ping(glob_dev)==GP_ERROR) { interface_message("Can not talk to camera after speed change"); return (GP_ERROR);