diff options
Diffstat (limited to 'camlibs')
36 files changed, 246 insertions, 242 deletions
diff --git a/camlibs/casio/casio-qv-commands.c b/camlibs/casio/casio-qv-commands.c index a6ec5e060..5a33cbc54 100644 --- a/camlibs/casio/casio-qv-commands.c +++ b/camlibs/casio/casio-qv-commands.c @@ -45,8 +45,8 @@ QVping (Camera *camera) /* Send ENQ and wait for ACK */ while (1) { c = ENQ; - CR (gp_port_write (camera->port, &c, 1)); - result = gp_port_read (camera->port, &c, 1); + CR (gp_port_write (camera->port, (char *)&c, 1)); + result = gp_port_read (camera->port, (char *)&c, 1); /* If we got ACK, everything is fine. */ if (result >= 0) { @@ -78,11 +78,11 @@ QVping (Camera *camera) * ACKs, and finally with UNKNOWN1 and * UNKNOWN2. */ - while (gp_port_read (camera->port, &c, 1) >= 0); + while (gp_port_read (camera->port, (char *)&c, 1) >= 0); break; default: - while (gp_port_read (camera->port, &c, 1) >= 0); + while (gp_port_read (camera->port, (char *)&c, 1) >= 0); break; } } @@ -111,22 +111,22 @@ QVsend (Camera *camera, unsigned char *cmd, int cmd_len, CR (QVping (camera)); /* Write the request and calculate the checksum */ - CR (gp_port_write (camera->port, cmd, cmd_len)); + CR (gp_port_write (camera->port, (char *)cmd, cmd_len)); for (cmd_end = cmd+cmd_len, checksum = 0; cmd < cmd_end; ++cmd) checksum += *cmd; /* Read the checksum */ - CR (gp_port_read (camera->port, &c, 1)); + CR (gp_port_read (camera->port, (char *)&c, 1)); if (c != (unsigned char)(~checksum)) return (GP_ERROR_CORRUPTED_DATA); /* Send ACK */ c = ACK; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); /* Receive the answer */ if (buf_len) - CR (gp_port_read (camera->port, buf, buf_len)); + CR (gp_port_read (camera->port, (char *)buf, buf_len)); return (GP_OK); } @@ -145,7 +145,7 @@ QVblockrecv (Camera *camera, unsigned char **buf, unsigned long int *buf_len) /* Send DC2 */ c = DC2; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); while (1) { unsigned char buffer[2]; @@ -154,11 +154,11 @@ QVblockrecv (Camera *camera, unsigned char **buf, unsigned long int *buf_len) unsigned char *new; /* Read STX */ - CR (gp_port_read (camera->port, &c, 1)); + CR (gp_port_read (camera->port, (char *)&c, 1)); if (c != STX) { retries++; c = NAK; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); if (retries > CASIO_QV_RETRIES) return (GP_ERROR_CORRUPTED_DATA); else @@ -166,7 +166,7 @@ QVblockrecv (Camera *camera, unsigned char **buf, unsigned long int *buf_len) } /* Read sector size */ - CR (gp_port_read (camera->port, buffer, 2)); + CR (gp_port_read (camera->port, (char *)buffer, 2)); size = (buffer[0] << 8) | buffer[1]; sum = buffer[0] + buffer[1]; @@ -180,19 +180,19 @@ QVblockrecv (Camera *camera, unsigned char **buf, unsigned long int *buf_len) *buf_len += size; /* Get the sector */ - CR (gp_port_read (camera->port, *buf + pos, size)); + CR (gp_port_read (camera->port, (char *)*buf + pos, size)); for (i = 0; i < size; i++) sum += (*buf)[i + pos]; /* Get EOT or ETX and the checksum */ - CR (gp_port_read (camera->port, buffer, 2)); + CR (gp_port_read (camera->port, (char *)buffer, 2)); sum += buffer[0]; /* Verify the checksum */ if ((unsigned char)(~sum) != buffer[1]) { retries++; c = NAK; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); if (retries > CASIO_QV_RETRIES) return (GP_ERROR_CORRUPTED_DATA); else @@ -201,7 +201,7 @@ QVblockrecv (Camera *camera, unsigned char **buf, unsigned long int *buf_len) /* Acknowledge and prepare for next packet */ c = ACK; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); pos += size; /* Are we done? */ diff --git a/camlibs/digita/usb.c b/camlibs/digita/usb.c index b36ecb796..5825c2d4a 100644 --- a/camlibs/digita/usb.c +++ b/camlibs/digita/usb.c @@ -45,7 +45,7 @@ static int digita_usb_send(CameraPrivateLibrary *dev, void *buffer, int len) int digita_usb_open(CameraPrivateLibrary *dev, Camera *camera) { GPPortSettings settings; - unsigned char buffer[128]; + char buffer[128]; int ret; ret = gp_port_get_settings(camera->port, &settings); diff --git a/camlibs/dimera/mesalib.c b/camlibs/dimera/mesalib.c index 426c5d0fc..48f83ca94 100644 --- a/camlibs/dimera/mesalib.c +++ b/camlibs/dimera/mesalib.c @@ -106,7 +106,7 @@ mesa_flush( GPPort *port, int timeout ) /* Wait for silence */ do { - if ( gp_port_read( port, b, sizeof( b ) ) > 0 ) + if ( gp_port_read( port, (char *)b, sizeof( b ) ) > 0 ) /* reset timer */ gettimeofday( &start, NULL ); gettimeofday( &now, NULL ); @@ -128,7 +128,7 @@ mesa_read( GPPort *port, uint8_t *b, int s, int timeout2, int timeout1 ) do { /* limit reads to 1k segment */ - r = gp_port_read( port, &b[n], s>1024?1024:s ); + r = gp_port_read( port, (char *)&b[n], s>1024?1024:s ); if ( r > 0 ) { n += r; @@ -147,7 +147,7 @@ mesa_send_command( GPPort *port, uint8_t *cmd, int n, int ackTimeout ) { uint8_t c; - CHECK (gp_port_write( port, cmd, n )); + CHECK (gp_port_write( port, (char *)cmd, n )); if ( mesa_read( port, &c, 1, ackTimeout, 0 ) != 1 ) { @@ -659,7 +659,7 @@ mesa_modem_check( GPPort *port ) b[1] = 'T'; b[2] = '\r'; - CHECK (gp_port_write( port, b, sizeof( b ) )); + CHECK (gp_port_write( port, (char *)b, sizeof( b ) )); /* Expect at least one byte */ if ( mesa_read( port, b, 1, 5, 0 ) < 1 ) diff --git a/camlibs/fuji/fuji.c b/camlibs/fuji/fuji.c index 1e9f9c414..79822c802 100644 --- a/camlibs/fuji/fuji.c +++ b/camlibs/fuji/fuji.c @@ -115,13 +115,13 @@ fuji_ping (Camera *camera, GPContext *context) GP_DEBUG ("Pinging camera..."); /* Drain input */ - while (gp_port_read (camera->port, &b, 1) >= 0); + while (gp_port_read (camera->port, (char *)&b, 1) >= 0); i = 0; while (1) { b = ENQ; - CR (gp_port_write (camera->port, &b, 1)); - r = gp_port_read (camera->port, &b, 1); + CR (gp_port_write (camera->port, (char *)&b, 1)); + r = gp_port_read (camera->port, (char *)&b, 1); if ((r >= 0) && (b == ACK)) return (GP_OK); i++; @@ -143,7 +143,7 @@ fuji_send (Camera *camera, unsigned char *cmd, unsigned int cmd_len, /* Send header */ b[0] = ESC; b[1] = STX; - CR (gp_port_write (camera->port, b, 2)); + CR (gp_port_write (camera->port, (char *)b, 2)); /* * Escape the data we are going to send. @@ -162,13 +162,13 @@ fuji_send (Camera *camera, unsigned char *cmd, unsigned int cmd_len, } /* Send data */ - CR (gp_port_write (camera->port, b, cmd_len)); + CR (gp_port_write (camera->port, (char *)b, cmd_len)); /* Send footer */ b[0] = ESC; b[1] = (last ? ETX : ETB); b[2] = check; - CR (gp_port_write (camera->port, b, 3)); + CR (gp_port_write (camera->port, (char *)b, 3)); return (GP_OK); } @@ -184,7 +184,7 @@ fuji_recv (Camera *camera, unsigned char *buf, unsigned int *buf_len, * Read the header. The checksum covers all bytes between * ESC STX and ESC ET[X,B]. */ - CR (gp_port_read (camera->port, b, 6)); + CR (gp_port_read (camera->port, (char *)b, 6)); /* Verify the header */ if ((b[0] != ESC) || (b[1] != STX)) { @@ -209,9 +209,9 @@ fuji_recv (Camera *camera, unsigned char *buf, unsigned int *buf_len, /* Read the data. Unescape it. Calculate the checksum. */ for (i = 0; i < *buf_len; i++) { - CR (gp_port_read (camera->port, buf + i, 1)); + CR (gp_port_read (camera->port, (char *)buf + i, 1)); if (buf[i] == ESC) { - CR (gp_port_read (camera->port, buf + i, 1)); + CR (gp_port_read (camera->port, (char *)buf + i, 1)); if (buf[i] != ESC) { gp_context_error (context, _("Wrong escape sequence: " @@ -219,7 +219,7 @@ fuji_recv (Camera *camera, unsigned char *buf, unsigned int *buf_len, ESC, buf[i]); /* Dump the remaining data */ - while (gp_port_read (camera->port, b, 1) >= 0); + while (gp_port_read (camera->port, (char *)b, 1) >= 0); return (GP_ERROR_CORRUPTED_DATA); } @@ -228,7 +228,7 @@ fuji_recv (Camera *camera, unsigned char *buf, unsigned int *buf_len, } /* Read the footer */ - CR (gp_port_read (camera->port, b, 3)); + CR (gp_port_read (camera->port, (char *)b, 3)); if (b[0] != ESC) { gp_context_error (context, _("Bad data - got 0x%02x, expected 0x%02x."), @@ -281,7 +281,7 @@ fuji_transmit (Camera *camera, unsigned char *cmd, unsigned int cmd_len, CR (fuji_send (camera, cmd, cmd_len, 1, context)); /* Receive ACK (hopefully) */ - CR (gp_port_read (camera->port, &c, 1)); + CR (gp_port_read (camera->port, (char *)&c, 1)); switch (c) { case ACK: break; @@ -324,12 +324,12 @@ fuji_transmit (Camera *camera, unsigned char *cmd, unsigned int cmd_len, r = fuji_recv (camera, buf + *buf_len, &b_len, &last, context); if (r < 0) { retries++; - while (gp_port_read (camera->port, &c, 1) >= 0); + while (gp_port_read (camera->port, (char *)&c, 1) >= 0); if (++retries > 2) return (r); GP_DEBUG ("Retrying..."); c = NAK; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); continue; } @@ -341,7 +341,7 @@ fuji_transmit (Camera *camera, unsigned char *cmd, unsigned int cmd_len, /* Acknowledge this packet. */ c = ACK; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); *buf_len += b_len; if (p) @@ -719,7 +719,7 @@ fuji_upload (Camera *camera, const unsigned char *data, (i + CHUNK_SIZE < size) ? 0 : 1, context)); /* Receive ACK (hopefully) */ - CR (gp_port_read (camera->port, &c, 1)); + CR (gp_port_read (camera->port, (char *)&c, 1)); switch (c) { case ACK: break; @@ -795,7 +795,7 @@ fuji_reset (Camera *camera, GPContext *context) { unsigned char c = EOT; - CR (gp_port_write (camera->port, &c, 1)); + CR (gp_port_write (camera->port, (char *)&c, 1)); return (GP_OK); } diff --git a/camlibs/kodak/dc120/library.c b/camlibs/kodak/dc120/library.c index 919f2d710..93dcc878a 100644 --- a/camlibs/kodak/dc120/library.c +++ b/camlibs/kodak/dc120/library.c @@ -86,7 +86,7 @@ write_again: /* Read in the response from the camera if requested */ if (read_response) { - if (gp_port_read(camera->port, in, 1) < GP_OK) + if (gp_port_read(camera->port, (char *)in, 1) < GP_OK) /* On error, write again */ goto write_again; diff --git a/camlibs/kodak/dc210/library.c b/camlibs/kodak/dc210/library.c index 3d99d3e0a..a2477200e 100644 --- a/camlibs/kodak/dc210/library.c +++ b/camlibs/kodak/dc210/library.c @@ -166,7 +166,7 @@ static int dc210_write_single_char int i; for (i=0; i< RETRIES; i++){ - if (gp_port_write(camera->port, &response, 1) >= 0) + if (gp_port_write(camera->port, (char *)&response, 1) >= 0) return (GP_OK); }; @@ -185,7 +185,7 @@ static int dc210_read_single_char for (i = 0; i < RETRIES; i++){ - error = gp_port_read(camera->port, response, 1); + error = gp_port_read(camera->port, (char *)response, 1); if (error < 0){ if (error == GP_ERROR_TIMEOUT) @@ -238,7 +238,7 @@ static int dc210_execute_command }; for (k = 0; k < RETRIES; k++){ - error = gp_port_read(camera->port, &response, 1); + error = gp_port_read(camera->port, (char *)&response, 1); if (error != 1){ if (error == GP_ERROR_TIMEOUT){ dc210_cmd_error = DC210_TIMEOUT_ERROR; @@ -307,7 +307,7 @@ static int dc210_write_command_packet /* read answer */ - error = gp_port_read(camera->port, &answer, 1); + error = gp_port_read(camera->port, (char *)&answer, 1); if (error < 0) return GP_ERROR; @@ -388,7 +388,7 @@ static int dc210_read_single_block error = 1; for (k = 0; k < RETRIES; k++){ - if (gp_port_read(camera->port, b, blocksize) < 0){ + if (gp_port_read(camera->port, (char *)b, blocksize) < 0){ continue; }; error = 0; @@ -443,7 +443,7 @@ static int dc210_read_to_file fatal_error = 1; for (k = 0; k < RETRIES; k++){ /* read packet */ - if (gp_port_read(camera->port, b, blocksize) < 0){ + if (gp_port_read(camera->port, (char *)b, blocksize) < 0){ dc210_write_single_char(camera, DC210_ILLEGAL_PACKET); packet_following = dc210_wait_for_response(camera, 0, NULL); continue; @@ -625,8 +625,8 @@ static int dc210_format_card (Camera * camera, char * album_name, GPContext * co dc210_write_command_packet(camera, data); if (dc210_wait_for_response(camera, 3, context) != DC210_PACKET_FOLLOWING) return GP_ERROR; - gp_port_read(camera->port, answer, 16); - gp_port_read(camera->port, &checksum_read, 1); + gp_port_read(camera->port, (char *)answer, 16); + gp_port_read(camera->port, (char *)&checksum_read, 1); checksum = 0; for (i = 0; i < 16; i++) checksum ^= answer[i]; @@ -658,8 +658,8 @@ static int dc210_get_card_status (Camera * camera, dc210_card_status * card_stat dc210_execute_command(camera, cmd); if (dc210_wait_for_response(camera, 0, NULL) != DC210_PACKET_FOLLOWING) return GP_ERROR; - gp_port_read(camera->port, answer, 16); - gp_port_read(camera->port, &checksum_read, 1); + gp_port_read(camera->port, (char *)answer, 16); + gp_port_read(camera->port, (char *)&checksum_read, 1); checksum = 0; for (i = 0; i < 16; i++) checksum ^= answer[i]; diff --git a/camlibs/kodak/dc3200/library.c b/camlibs/kodak/dc3200/library.c index e1f6434c8..f3b3c744b 100644 --- a/camlibs/kodak/dc3200/library.c +++ b/camlibs/kodak/dc3200/library.c @@ -633,7 +633,7 @@ int dc3200_send_packet(Camera *camera, unsigned char *data, int data_len) #ifdef DEBUG dump_buffer(buff, buff_len, "s", 16); #endif - res = gp_port_write(camera->port, buff, data_len + 3); + res = gp_port_write(camera->port, (char *)buff, data_len + 3); free(buff); return res; } @@ -665,7 +665,7 @@ int dc3200_recv_packet(Camera *camera, unsigned char *data, int *data_len) * */ - res = gp_port_read(camera->port, &buff[num_read], 1); + res = gp_port_read(camera->port, (char *)&buff[num_read], 1); while(res >= 0 && fails < READ_RETRIES) { if(res == 0) { @@ -685,7 +685,7 @@ int dc3200_recv_packet(Camera *camera, unsigned char *data, int *data_len) break; } } - res = gp_port_read(camera->port, &buff[num_read], 1); + res = gp_port_read(camera->port, (char *)&buff[num_read], 1); } if(!complete) { @@ -939,7 +939,7 @@ int dc3200_clear_read_buffer(Camera *camera) gp_port_set_timeout(camera->port, 0); - while(gp_port_read(camera->port, &byte, 1) > 0) + while(gp_port_read(camera->port, (char *)&byte, 1) > 0) count++; if(count > 0) diff --git a/camlibs/kodak/ez200/ez200.c b/camlibs/kodak/ez200/ez200.c index a4bcadfdf..5428f5253 100644 --- a/camlibs/kodak/ez200/ez200.c +++ b/camlibs/kodak/ez200/ez200.c @@ -108,7 +108,7 @@ ez200_get_picture_size (GPPort *port, int n) { GP_DEBUG("Running ez200_get_picture_size"); - READ(port, PICTURE, n, 1, c, 3); + READ(port, PICTURE, n, 1, (char *)c, 3); size = (int)c[0] + (int)c[1]*0x100 + (int)c[2]*0x10000; GP_DEBUG(" size of picture %i is 0x%x = %i byte(s)", n, size, size); diff --git a/camlibs/konica/lowlevel.c b/camlibs/konica/lowlevel.c index 56f77385b..6973e4423 100644 --- a/camlibs/konica/lowlevel.c +++ b/camlibs/konica/lowlevel.c @@ -80,8 +80,8 @@ l_ping_rec (GPPort *p, unsigned int level) /* Write ENQ and read the response. */ c = ENQ; - CHECK (gp_port_write (p, &c, 1)); - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_write (p, (char *)&c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); switch (c) { case ACK: return (GP_OK); @@ -107,9 +107,9 @@ l_ping_rec (GPPort *p, unsigned int level) /* Write NACK. */ c = NACK; - CHECK (gp_port_write (p, &c, 1)); + CHECK (gp_port_write (p, (char *)&c, 1)); for (;;) { - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); switch (c) { case ENQ: @@ -173,7 +173,7 @@ l_esc_read (GPPort *p, unsigned char *c) { CHECK_NULL (p && c); - CHECK (gp_port_read (p, c, 1)); + CHECK (gp_port_read (p, (char *)c, 1)); /* * STX, ETX, ENQ, ACK, XOFF, XON, NACK, and ETB have to be masked by @@ -202,7 +202,7 @@ l_esc_read (GPPort *p, unsigned char *c) if ((*c == ETX) || (*c == ETB)) return (GP_ERROR_CORRUPTED_DATA); } else if (*c == ESC) { - CHECK (gp_port_read (p, c, 1)); + CHECK (gp_port_read (p, (char *)c, 1)); *c = (~*c & 0xff); if ((*c != STX ) && (*c != ETX ) && (*c != ENQ) && (*c != ACK ) && (*c != XOFF) && (*c != XON) && @@ -286,8 +286,8 @@ l_send (GPPort *p, GPContext *context, unsigned char *send_buffer, for (i = 0; ; i++) { /* Write data as above. */ - CHECK_FREE (gp_port_write (p, sb, sbs), sb); - CHECK_FREE (gp_port_read (p, &c, 1), sb); + CHECK_FREE (gp_port_write (p, (char *)sb, sbs), sb); + CHECK_FREE (gp_port_read (p, (char *)&c, 1), sb); switch (c) { case ACK: @@ -296,7 +296,7 @@ l_send (GPPort *p, GPContext *context, unsigned char *send_buffer, /* Write EOT. */ c = EOT; - CHECK (gp_port_write (p, &c, 1)); + CHECK (gp_port_write (p, (char *)&c, 1)); return (GP_OK); case NACK: @@ -331,7 +331,7 @@ l_receive (GPPort *p, GPContext *context, for (i = 0; ; ) { CHECK (gp_port_set_timeout (p, timeout)); - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); CHECK (gp_port_set_timeout (p, DEFAULT_TIMEOUT)); switch (c) { case ENQ: @@ -366,7 +366,7 @@ l_receive (GPPort *p, GPContext *context, * error). */ for (;;) { - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); if (c == ENQ) break; } @@ -387,7 +387,7 @@ l_receive (GPPort *p, GPContext *context, CHECK (gp_port_write (p, "\6", 1)); for (*rbs = 0; ; ) { for (j = 0; ; j++) { - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); switch (c) { case STX: @@ -428,7 +428,7 @@ while (read < rbs_internal) { */ GP_DEBUG ("Reading %i bytes (%i of %i already read)...", rbs_internal - read, read, rbs_internal); - result = gp_port_read (p, &((*rb)[*rbs + read]), + result = gp_port_read (p, (char *)&((*rb)[*rbs + read]), rbs_internal - read); if (result < 0) { error_flag = 1; @@ -457,7 +457,7 @@ while (read < rbs_internal) { } else if (*c == ESC) { if (i == read + r - 1) { /* ESC is last char of packet */ - CHECK (gp_port_read (p, c, 1)); + CHECK (gp_port_read (p, (char *)c, 1)); } else { memmove (c, c + 1, read + r - i - 1); r--; @@ -478,7 +478,7 @@ while (read < rbs_internal) { read += r; }} if (!error_flag) { - CHECK (gp_port_read (p, &d, 1)); + CHECK (gp_port_read (p, (char *)&d, 1)); switch (d) { case ETX: @@ -510,7 +510,7 @@ while (read < rbs_internal) { */ while ((d != ETX) && (d != ETB)) { CHECK (gp_port_read (p, - &d, 1)); + (char *)&d, 1)); } error_flag = 1; break; @@ -541,11 +541,11 @@ while (read < rbs_internal) { /* Write NACK. */ c = NACK; - CHECK (gp_port_write (p, &c, 1)); + CHECK (gp_port_write (p, (char *)&c, 1)); continue; } } - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); switch (c) { case EOT: @@ -576,7 +576,7 @@ while (read < rbs_internal) { case ETB: /* We expect more data. Read ENQ. */ - CHECK (gp_port_read (p, &c, 1)); + CHECK (gp_port_read (p, (char *)&c, 1)); switch (c) { case ENQ: diff --git a/camlibs/largan/lmini/lmini.c b/camlibs/largan/lmini/lmini.c index 445d8527a..74f9888ee 100644 --- a/camlibs/largan/lmini/lmini.c +++ b/camlibs/largan/lmini/lmini.c @@ -208,7 +208,7 @@ int largan_get_pict (Camera * camera, largan_pict_type type, /* the remaining 5 bytes are read here */ - ret = gp_port_read (camera->port, buf, sizeof(buf)); + ret = gp_port_read (camera->port, (char *)buf, sizeof(buf)); if (ret < GP_OK) { return ret; } @@ -402,7 +402,7 @@ static int largan_recv_reply (Camera * camera, uint8_t *reply, uint8_t packet [4]; uint8_t packet_size = 0; memset (packet, 0, sizeof (packet)); - ret = gp_port_read (camera->port, packet, 1); + ret = gp_port_read (camera->port, (char *)packet, 1); if (ret < GP_OK) { return ret; } @@ -429,7 +429,7 @@ static int largan_recv_reply (Camera * camera, uint8_t *reply, *reply = packet[0]; } if (packet_size >= 2) { - ret = gp_port_read (camera->port, &packet[1], 1); + ret = gp_port_read (camera->port, (char *)&packet[1], 1); if (ret < GP_OK) { return ret; } @@ -438,7 +438,7 @@ static int largan_recv_reply (Camera * camera, uint8_t *reply, } } if (packet_size >= 3) { - ret = gp_port_read (camera->port, &packet[2], 1); + ret = gp_port_read (camera->port, (char *)&packet[2], 1); if (ret < GP_OK) { return ret; } @@ -491,7 +491,7 @@ static int largan_send_command (Camera * camera, uint8_t cmd, uint8_t param1, return GP_ERROR; /* unknown command */ } - return gp_port_write (camera->port, packet, packet_size); + return gp_port_write (camera->port, (char *)packet, packet_size); } @@ -532,7 +532,7 @@ static int purge_camera (Camera * camera) while (1) { - count = gp_port_read (camera->port, buffer, 1); + count = gp_port_read (camera->port, (char *)buffer, 1); if (count < GP_OK) return count; diff --git a/camlibs/minolta/dimagev/capture.c b/camlibs/minolta/dimagev/capture.c index 53d617f84..e07b0678b 100644 --- a/camlibs/minolta/dimagev/capture.c +++ b/camlibs/minolta/dimagev/capture.c @@ -71,7 +71,7 @@ int dimagev_shutter(dimagev_t *dimagev) { return GP_ERROR_NO_MEMORY; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_shutter::unable to write packet"); if ( p != NULL ) { @@ -90,7 +90,7 @@ int dimagev_shutter(dimagev_t *dimagev) { GP_DEBUG( "dimagev_shutter::sleep() returned non-zero value"); } - if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_shutter::no response from camera"); return GP_ERROR_IO; } @@ -144,12 +144,12 @@ int dimagev_shutter(dimagev_t *dimagev) { } char_buffer = DIMAGEV_EOT; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_shutter::unable to send EOT"); return GP_ERROR_IO; } - if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_shutter::no response from camera"); return GP_ERROR_IO; } diff --git a/camlibs/minolta/dimagev/delete.c b/camlibs/minolta/dimagev/delete.c index 43b7b130b..96f5cd7fd 100644 --- a/camlibs/minolta/dimagev/delete.c +++ b/camlibs/minolta/dimagev/delete.c @@ -64,7 +64,7 @@ int dimagev_delete_picture(dimagev_t *dimagev, int file_number) { return GP_ERROR_NO_MEMORY; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_delete_picture::unable to send set_data packet"); free(p); return GP_ERROR_IO; @@ -174,7 +174,7 @@ int dimagev_delete_all(dimagev_t *dimagev) { return GP_ERROR_IO; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_delete_all::unable to send set_data packet"); free(p); return GP_ERROR_IO; diff --git a/camlibs/minolta/dimagev/download.c b/camlibs/minolta/dimagev/download.c index db1c1a722..bd1e33520 100644 --- a/camlibs/minolta/dimagev/download.c +++ b/camlibs/minolta/dimagev/download.c @@ -60,11 +60,11 @@ int dimagev_get_picture(dimagev_t *dimagev, int file_number, CameraFile *file) { return GP_ERROR_NO_MEMORY; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_get_picture::unable to send set_data packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_picture::no response from camera"); free(p); return GP_ERROR_IO; @@ -116,7 +116,7 @@ int dimagev_get_picture(dimagev_t *dimagev, int file_number, CameraFile *file) { for ( i = 0 ; i < ( total_packets -1 ) ; i++ ) { char_buffer=DIMAGEV_ACK; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_picture::unable to send ACK"); free(data); return GP_ERROR_IO; @@ -130,7 +130,7 @@ int dimagev_get_picture(dimagev_t *dimagev, int file_number, CameraFile *file) { GP_DEBUG( "dimagev_get_picture::sending NAK to get retry"); char_buffer=DIMAGEV_NAK; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_picture::unable to send NAK"); free(data); return GP_ERROR_IO; @@ -161,13 +161,13 @@ int dimagev_get_picture(dimagev_t *dimagev, int file_number, CameraFile *file) { size++; char_buffer=DIMAGEV_EOT; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_picture::unable to send ACK"); free(data); return GP_ERROR_IO; } - if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_picture::no response from camera"); free(data); return GP_ERROR_IO; @@ -234,11 +234,11 @@ int dimagev_get_thumbnail(dimagev_t *dimagev, int file_number, CameraFile *file) return GP_ERROR_NO_MEMORY; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_get_thumbnail::unable to send set_data packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_thumbnail::no response from camera"); free(p); return GP_ERROR_IO; @@ -291,7 +291,7 @@ int dimagev_get_thumbnail(dimagev_t *dimagev, int file_number, CameraFile *file) while ( size < 9599 ) { char_buffer=DIMAGEV_ACK; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_thumbnail::unable to send ACK"); free(ycrcb_data); return GP_ERROR_IO; @@ -323,13 +323,13 @@ int dimagev_get_thumbnail(dimagev_t *dimagev, int file_number, CameraFile *file) size++; char_buffer=DIMAGEV_EOT; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_thumbnail::unable to send ACK"); free(ycrcb_data); return GP_ERROR_IO; } - if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_thumbnail::no response from camera"); free(ycrcb_data); return GP_ERROR_IO; diff --git a/camlibs/minolta/dimagev/info.c b/camlibs/minolta/dimagev/info.c index d229a5ade..425ef0425 100644 --- a/camlibs/minolta/dimagev/info.c +++ b/camlibs/minolta/dimagev/info.c @@ -53,11 +53,11 @@ int dimagev_get_camera_info(dimagev_t *dimagev) { return GP_ERROR_IO; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_info::unable to write packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_info::no response from camera"); free(p); return GP_ERROR_IO; @@ -86,13 +86,13 @@ int dimagev_get_camera_info(dimagev_t *dimagev) { } char_buffer = DIMAGEV_EOT; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_info::unable to send EOT"); free(p); return GP_ERROR_IO; } - if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_info::no response from camera"); free(p); return GP_ERROR_IO; diff --git a/camlibs/minolta/dimagev/packet.c b/camlibs/minolta/dimagev/packet.c index bf45d5442..5b14f129b 100644 --- a/camlibs/minolta/dimagev/packet.c +++ b/camlibs/minolta/dimagev/packet.c @@ -109,13 +109,13 @@ dimagev_packet *dimagev_read_packet(dimagev_t *dimagev) { return NULL; } - if ( gp_port_read(dimagev->dev, p->buffer, 4) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)p->buffer, 4) < GP_OK ) { GP_DEBUG( "dimagev_read_packet::unable to read packet header - will try to send NAK"); free(p); /* Send a NAK */ char_buffer = DIMAGEV_NAK; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_read_packet::unable to send NAK"); return NULL; } @@ -127,13 +127,13 @@ dimagev_packet *dimagev_read_packet(dimagev_t *dimagev) { p->length = ( p->buffer[2] * 256 ) + ( p->buffer[3] ); - if ( gp_port_read(dimagev->dev, &(p->buffer[4]), ( p->length - 4)) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&(p->buffer[4]), ( p->length - 4)) < GP_OK ) { GP_DEBUG( "dimagev_read_packet::unable to read packet body - will try to send NAK"); free(p); /* Send a NAK */ char_buffer = DIMAGEV_NAK; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_read_packet::unable to send NAK"); return NULL; } @@ -150,7 +150,7 @@ dimagev_packet *dimagev_read_packet(dimagev_t *dimagev) { /* Send a NAK */ char_buffer = DIMAGEV_NAK; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_read_packet::unable to send NAK"); return NULL; } diff --git a/camlibs/minolta/dimagev/status.c b/camlibs/minolta/dimagev/status.c index af5b58eb7..ffa3e1c51 100644 --- a/camlibs/minolta/dimagev/status.c +++ b/camlibs/minolta/dimagev/status.c @@ -47,11 +47,11 @@ int dimagev_get_camera_status(dimagev_t *dimagev) { return GP_ERROR_IO; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_status::unable to write packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_status::no response from camera"); free(p); return GP_ERROR_IO; @@ -80,13 +80,13 @@ int dimagev_get_camera_status(dimagev_t *dimagev) { } char_buffer = DIMAGEV_EOT; - if ( gp_port_write(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_status::unable to send EOT"); free(p); return GP_ERROR_IO; } - if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_get_camera_status::no response from camera"); free(p); return GP_ERROR_IO; diff --git a/camlibs/minolta/dimagev/upload.c b/camlibs/minolta/dimagev/upload.c index d74db14ef..6719533fd 100644 --- a/camlibs/minolta/dimagev/upload.c +++ b/camlibs/minolta/dimagev/upload.c @@ -60,11 +60,11 @@ int dimagev_put_file(dimagev_t* dimagev, CameraFile *file) { return GP_ERROR_NO_MEMORY; } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_put_file::unable to send command packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_put_file::no response from camera"); free(p); return GP_ERROR_IO; @@ -109,11 +109,11 @@ int dimagev_put_file(dimagev_t* dimagev, CameraFile *file) { free(packet_buffer); - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_put_file::unable to send data packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_put_file::no response from camera"); free(p); return GP_ERROR_IO; @@ -152,11 +152,11 @@ int dimagev_put_file(dimagev_t* dimagev, CameraFile *file) { } } - if ( gp_port_write(dimagev->dev, p->buffer, p->length) < GP_OK ) { + if ( gp_port_write(dimagev->dev, (char *)p->buffer, p->length) < GP_OK ) { GP_DEBUG( "dimagev_put_file::unable to send data packet"); free(p); return GP_ERROR_IO; - } else if ( gp_port_read(dimagev->dev, &char_buffer, 1) < GP_OK ) { + } else if ( gp_port_read(dimagev->dev, (char *)&char_buffer, 1) < GP_OK ) { GP_DEBUG( "dimagev_put_file::no response from camera"); free(p); return GP_ERROR_IO; diff --git a/camlibs/mustek/rs232.c b/camlibs/mustek/rs232.c index 905656118..a4ce4866a 100644 --- a/camlibs/mustek/rs232.c +++ b/camlibs/mustek/rs232.c @@ -124,7 +124,7 @@ int mdc800_rs232_waitForCommit (GPPort *port,char commandid) int ret; gp_port_set_timeout(port,mdc800_io_getCommandTimeout(commandid)); - ret = gp_port_read(port,ch,1); + ret = gp_port_read(port,(char *)ch,1); if (ret!=1) { printCError ("(mdc800_rs232_waitForCommit) Error receiving commit !\n"); diff --git a/camlibs/pccam300/pccam300.c b/camlibs/pccam300/pccam300.c index 5ea3b58cc..61f825116 100644 --- a/camlibs/pccam300/pccam300.c +++ b/camlibs/pccam300/pccam300.c @@ -63,18 +63,18 @@ pccam300_wait_for_status (GPPort *port) while (status != 0x00 && retries--) { gp_port_set_timeout (port, 3000); - CHECK(gp_port_usb_msg_read (port, 0x06, 0x00, 0x00, &status, 1)); + CHECK(gp_port_usb_msg_read (port, 0x06, 0x00, 0x00, (char *)&status, 1)); if (status == 0 || status == 8) return GP_OK; if (status == 0xb0) { gp_port_set_timeout (port, 200000); CHECK(gp_port_usb_msg_read (port, 0x06, 0x00, 0x00, - &status, 1)); + (char *)&status, 1)); } if (status == 0x40) { gp_port_set_timeout (port, 400000); CHECK(gp_port_usb_msg_read (port, 0x06, 0x00, 0x00, - &status, 1)); + (char *)&status, 1)); } } return GP_ERROR; @@ -106,7 +106,8 @@ pccam300_get_filecount (GPPort *port, int *filecount) uint8_t response; gp_port_set_timeout (port, 400000); - CHECK (gp_port_usb_msg_read (port, 0x08, 0x00, 0x00, &response, 0x01)); + CHECK (gp_port_usb_msg_read (port, 0x08, 0x00, 0x00, + (char *)&response, 0x01)); *filecount = response; return GP_OK; } @@ -119,7 +120,8 @@ pccam300_get_filesize (GPPort *port, unsigned int index, uint16_t i = index; gp_port_set_timeout (port, 400000); - CHECK (gp_port_usb_msg_read (port, 0x08, i, 0x0001, response, 0x03)); + CHECK (gp_port_usb_msg_read (port, 0x08, i, 0x0001, + (char *)response, 0x03)); *filesize = (response[0] & 0xff) + (response[1] & 0xff) * 0x100 + (response[2] & 0xff) * 0x10000; @@ -133,10 +135,12 @@ pccam300_get_mem_info (GPPort *port, GPContext *context, int *totalmem, unsigned char response[4]; gp_port_set_timeout (port, 400000); - CHECK (gp_port_usb_msg_read (port, 0x60, 0x00, 0x02, response, 0x04)); + CHECK (gp_port_usb_msg_read (port, 0x60, 0x00, 0x02, + (char *)response, 0x04)); *totalmem = response[2] * 65536 + response[1] * 256 + response[0]; CHECK (pccam300_wait_for_status (port)); - CHECK (gp_port_usb_msg_read (port, 0x60, 0x00, 0x03, response, 0x04)); + CHECK (gp_port_usb_msg_read (port, 0x60, 0x00, 0x03, + (char *)response, 0x04)); *freemem = response[2] * 65536 + response[1] * 256 + response[0]; CHECK (pccam300_wait_for_status (port)); return GP_OK; @@ -166,7 +170,7 @@ pccam300_get_file (GPPort *port, GPContext *context, int index, /* Read the data into the buffer overlapping the header area by * 0x200 bytes. */ - r = gp_port_read (port, buf + 623 - 0x200, data_size); + r = gp_port_read (port, (char *)buf + 623 - 0x200, data_size); if (r < GP_OK) { free (buf); return r; @@ -188,7 +192,7 @@ pccam300_get_file (GPPort *port, GPContext *context, int index, * we need to request the correct header. */ CHECK(gp_port_usb_msg_read(port, 0x0b, buf[623 - 0x200 + 8], - 0x3, buf, 623)); + 0x3, (char *)buf, 623)); *type = PCCAM300_MIME_JPEG; } *data = buf; diff --git a/camlibs/polaroid/pdc320.c b/camlibs/polaroid/pdc320.c index cd699469d..88fff44cc 100644 --- a/camlibs/polaroid/pdc320.c +++ b/camlibs/polaroid/pdc320.c @@ -163,7 +163,7 @@ pdc320_command( memset (newcmd, 0xe6, 4); off = 4; off += pdc320_escape (cmd, cmdlen, newcmd + off); off += pdc320_escape (csum, 2, newcmd + off); - ret = gp_port_write (port, newcmd, off); + ret = gp_port_write (port, (char *)newcmd, off); free(newcmd); return ret; } @@ -180,15 +180,15 @@ pdc320_simple_reply (GPPort *port, const unsigned char expcode, unsigned char csum[2]; int calccsum; - CR (gp_port_read (port, reply, 1)); + CR (gp_port_read (port, (char *)reply, 1)); if (reply[0] != expcode) { GP_DEBUG("*** reply got 0x%02x, expected 0x%02x\n", reply[0], expcode ); return GP_ERROR; } - CR (gp_port_read (port, reply+1, replysize-1)); - CR (gp_port_read (port, csum, 2)); + CR (gp_port_read (port, (char *)reply+1, replysize-1)); + CR (gp_port_read (port, (char *)csum, 2)); calccsum = pdc320_calc_checksum (reply, replysize); if (calccsum != ((csum[1] << 8) | csum[0])) { GP_DEBUG("csum %x vs %x\n",calccsum,((csum[0]<<8)|csum[1])); @@ -218,7 +218,7 @@ pdc320_init (GPPort *port) /* The initial command is prefixed by 4 raw E6. */ memset(e6,0xe6,sizeof(e6)); - CR (gp_port_write (port, e6, sizeof (e6) )); + CR (gp_port_write (port, (char *)e6, sizeof (e6) )); GP_DEBUG ("*** PDC320_INIT ***"); CR (pdc320_simple_command_reply (port, PDC320_INIT, 5, 1, buf)); @@ -285,16 +285,16 @@ pdc320_0c (Camera *camera, int n) /* Write the command */ GP_DEBUG ("*** PDC320_0c ***"); CR (pdc320_command (camera->port, cmd, sizeof (cmd))); - CR (gp_port_read (camera->port, buf, 3)); + CR (gp_port_read (camera->port, (char *)buf, 3)); if (buf[0] != 7) return GP_ERROR; size = (buf[1] << 8) | buf[2]; xbuf = malloc (size); - CR (gp_port_read (camera->port, xbuf, size)); + CR (gp_port_read (camera->port, (char *)xbuf, size)); for (i=0; i<size; i++) { GP_DEBUG ("buf[%d]=0x%02x", i, xbuf[i]); } - CR (gp_port_read (camera->port, buf, 2)); + CR (gp_port_read (camera->port, (char *)buf, 2)); /* checksum is calculated from both, but i am not clear how. */ return GP_OK; } @@ -336,7 +336,7 @@ pdc320_pic (Camera *camera, int n, unsigned char **data, int *size) /* Read the frame number */ usleep (10000); - CR_FREE (gp_port_read (camera->port, buf, 5), *data); + CR_FREE (gp_port_read (camera->port, (char *)buf, 5), *data); f1 = (buf[1] << 8) + buf[2]; f2 = (buf[3] << 8) + buf[4]; GP_DEBUG ("Reading frame %d " @@ -344,10 +344,10 @@ pdc320_pic (Camera *camera, int n, unsigned char **data, int *size) /* Read the actual data */ usleep(1000); - CR_FREE (gp_port_read (camera->port, *data + i, len), *data); + CR_FREE (gp_port_read (camera->port, (char *)*data + i, len), *data); /* Read the checksum */ - CR_FREE (gp_port_read (camera->port, buf, 2), *data); + CR_FREE (gp_port_read (camera->port, (char *)buf, 2), *data); } return (GP_OK); diff --git a/camlibs/polaroid/pdc700.c b/camlibs/polaroid/pdc700.c index 3395d824e..41670048a 100644 --- a/camlibs/polaroid/pdc700.c +++ b/camlibs/polaroid/pdc700.c @@ -208,7 +208,7 @@ pdc700_send (Camera *camera, unsigned char *cmd, unsigned int cmd_len) cmd[1] = (cmd_len - 3) >> 8; cmd[2] = (cmd_len - 3) & 0xff; cmd[cmd_len - 1] = calc_checksum (cmd + 3, cmd_len - 1 - 3); - CR (gp_port_write (camera->port, cmd, cmd_len)); + CR (gp_port_write (camera->port, (char *)cmd, cmd_len)); return (GP_OK); } @@ -226,7 +226,7 @@ pdc700_read (Camera *camera, unsigned char *cmd, * Read the header (0x40 plus 2 bytes indicating how many bytes * will follow) */ - CR (gp_port_read (camera->port, header, 3)); + CR (gp_port_read (camera->port, (char *)header, 3)); if (header[0] != 0x40) { gp_context_error (context, _("Received unexpected " "header (%i)"), header[0]); @@ -235,7 +235,7 @@ pdc700_read (Camera *camera, unsigned char *cmd, *b_len = (header[2] << 8) | header [1]; /* Read the remaining bytes */ - CR (gp_port_read (camera->port, b, *b_len)); + CR (gp_port_read (camera->port, (char *)b, *b_len)); /* * The first byte indicates if this the response for our command. diff --git a/camlibs/ricoh/g3.c b/camlibs/ricoh/g3.c index 29744bd70..3b7fd7224 100644 --- a/camlibs/ricoh/g3.c +++ b/camlibs/ricoh/g3.c @@ -56,7 +56,7 @@ g3_channel_read(GPPort *port, int *channel, char **buffer, int *len) unsigned char xbuf[0x800]; int tocopy, ret, curlen; - ret = gp_port_read(port, xbuf, 0x800); + ret = gp_port_read(port, (char *)xbuf, 0x800); if (ret < GP_OK) { gp_log(GP_LOG_ERROR, "g3", "read error in g3_channel_read\n"); return ret; @@ -117,7 +117,7 @@ g3_channel_read_bytes( rest = (rest + 9 + 3) & ~3; if (rest < 0x800) rest = 0x800; - ret = gp_port_read(port, xbuf, rest); + ret = gp_port_read(port, (char *)xbuf, rest); if (ret < GP_OK) { gp_log(GP_LOG_ERROR, "g3", "read error in g3_channel_read\n"); return ret; diff --git a/camlibs/ricoh/ricoh.c b/camlibs/ricoh/ricoh.c index 29466a30a..01fd2eac4 100644 --- a/camlibs/ricoh/ricoh.c +++ b/camlibs/ricoh/ricoh.c @@ -98,7 +98,7 @@ ricoh_send (Camera *camera, GPContext *context, unsigned char cmd, /* First, make sure there is no data coming from the camera. */ CR (gp_port_get_timeout (camera->port, &timeout)); CR (gp_port_set_timeout (camera->port, 20)); - while (gp_port_read (camera->port, buf, 1) >= 0); + while (gp_port_read (camera->port, (char *)buf, 1) >= 0); CR (gp_port_set_timeout (camera->port, timeout)); /* Write header */ @@ -106,7 +106,7 @@ ricoh_send (Camera *camera, GPContext *context, unsigned char cmd, buf[1] = STX; buf[2] = cmd; buf[3] = len; - CR (gp_port_write (camera->port, buf, 4)); + CR (gp_port_write (camera->port, (char *)buf, 4)); crc = updcrc (cmd, crc); crc = updcrc (len, crc); @@ -124,7 +124,7 @@ ricoh_send (Camera *camera, GPContext *context, unsigned char cmd, break; } } - CR (gp_port_write (camera->port, data + w, i - w)); + CR (gp_port_write (camera->port, (char *)data + w, i - w)); if (data[i - 1] == 0x10) CR (gp_port_write (camera->port, "\x10", 1)); w = i; @@ -137,7 +137,7 @@ ricoh_send (Camera *camera, GPContext *context, unsigned char cmd, buf[3] = crc >> 8; buf[4] = len + 2; buf[5] = number; - CR (gp_port_write (camera->port, buf, 6)); + CR (gp_port_write (camera->port, (char *)buf, 6)); return (GP_OK); } @@ -172,7 +172,7 @@ ricoh_recv (Camera *camera, GPContext *context, unsigned char *cmd, * drop that and read on. */ for (i = 0, buf[1] = ACK; i < 4; i++) { - CR (gp_port_read (camera->port, buf, 2)); + CR (gp_port_read (camera->port, (char *)buf, 2)); if (buf[0] != DLE) { gp_context_error (context, _("We expected " "0x%x but received 0x%x. Please " @@ -195,8 +195,8 @@ ricoh_recv (Camera *camera, GPContext *context, unsigned char *cmd, return GP_ERROR_CORRUPTED_DATA; } - CR (gp_port_read (camera->port, cmd, 1)); - CR (gp_port_read (camera->port, len, 1)); + CR (gp_port_read (camera->port, (char *)cmd, 1)); + CR (gp_port_read (camera->port, (char *)len, 1)); crc = updcrc (*cmd, crc); crc = updcrc (*len, crc); @@ -207,7 +207,7 @@ ricoh_recv (Camera *camera, GPContext *context, unsigned char *cmd, r = 0; last_dle = 0; while (r < *len) { - CR (gp_port_read (camera->port, data + r, *len - r)); + CR (gp_port_read (camera->port, (char *)data + r, *len - r)); if (last_dle) { r++; last_dle = 0; @@ -236,7 +236,7 @@ ricoh_recv (Camera *camera, GPContext *context, unsigned char *cmd, } /* Get footer */ - CR (gp_port_read (camera->port, buf, 6)); + CR (gp_port_read (camera->port, (char *)buf, 6)); if ((buf[0] != DLE) || (buf[1] != ETX && buf[1] != ETB)) return (GP_ERROR_CORRUPTED_DATA); diff --git a/camlibs/samsung/samsung.c b/camlibs/samsung/samsung.c index 5859de766..7fc2c648b 100644 --- a/camlibs/samsung/samsung.c +++ b/camlibs/samsung/samsung.c @@ -61,7 +61,7 @@ static int SDSC_send (GPPort *port, unsigned char command) { - CHECK_RESULT (gp_port_write (port, &command, 1)); + CHECK_RESULT (gp_port_write (port, (char *)&command, 1)); return (GP_OK); } @@ -85,7 +85,7 @@ SDSC_receive (GPPort *port, unsigned char *buf, int length) } /* Read data */ - result = gp_port_read (port, buf, length); + result = gp_port_read (port, (char *)buf, length); if (result < 0) { CHECK_RESULT (SDSC_send (port, SDSC_RETRANSMIT)); continue; diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index 9f08ee560..9b430ef88 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -354,7 +354,7 @@ sierra_check_connection (Camera *camera, GPContext *context) */ CHECK (gp_port_get_timeout (camera->port, &timeout)); CHECK (gp_port_set_timeout (camera->port, 20)); - ret = gp_port_read (camera->port, &c, 1); + ret = gp_port_read (camera->port, (char *)&c, 1); CHECK (gp_port_set_timeout (camera->port, timeout)); switch (ret) { case GP_ERROR_TIMEOUT: @@ -396,7 +396,7 @@ sierra_check_connection (Camera *camera, GPContext *context) * The camera sends us unexpected data. Dump it and assume * that everything's just fine. */ - while (gp_port_read (camera->port, &c, 1) >= 0); + while (gp_port_read (camera->port, (char *)&c, 1) >= 0); return GP_OK; } } @@ -551,7 +551,7 @@ sierra_read_packet (Camera *camera, unsigned char *packet, GPContext *context) (camera->pl->flags & SIERRA_WRAP_USB_MASK), packet, blocksize); else - result = gp_port_read (camera->port, packet, blocksize); + result = gp_port_read (camera->port, (char *)packet, blocksize); if (result < 0) { GP_DEBUG ("Read failed (%i: '%s').", result, gp_result_as_string (result)); @@ -609,7 +609,7 @@ sierra_read_packet (Camera *camera, unsigned char *packet, GPContext *context) */ gp_context_error (context, _("The first byte " "received (0x%x) is not valid."), packet[0]); - while (gp_port_read (camera->port, packet, 1) > 0) + while (gp_port_read (camera->port, (char *)packet, 1) > 0) ; sierra_clear_usb_halt(camera); return (GP_ERROR_CORRUPTED_DATA); @@ -622,7 +622,7 @@ sierra_read_packet (Camera *camera, unsigned char *packet, GPContext *context) */ if (br < 4) { result = gp_port_read (camera->port, - packet + br, 4 - br); + (char *)packet + br, 4 - br); if (result < 0) { sierra_clear_usb_halt(camera); GP_DEBUG ("Could not read length of " @@ -645,7 +645,7 @@ sierra_read_packet (Camera *camera, unsigned char *packet, GPContext *context) * or an error occurred. */ while (br < length) { - result = gp_port_read (camera->port, packet + br, + result = gp_port_read (camera->port, (char *)packet + br, length - br); if (result == GP_ERROR_TIMEOUT) { diff --git a/camlibs/smal/ultrapocket.c b/camlibs/smal/ultrapocket.c index 10e1b4fa5..445c2271c 100644 --- a/camlibs/smal/ultrapocket.c +++ b/camlibs/smal/ultrapocket.c @@ -67,9 +67,9 @@ static int ultrapocket_command(GPPort *port, int iswrite, unsigned char *data, int datasize) { int ret; if (iswrite) - ret = gp_port_write(port, data, datasize); + ret = gp_port_write(port, (char *)data, datasize); else - ret = gp_port_read(port, data, datasize); + ret = gp_port_read(port, (char *)data, datasize); return ret; } @@ -415,7 +415,7 @@ ultrapocket_skip(GPPort *port, int npackets) gp_port_get_timeout(port, &old_timeout); gp_port_set_timeout(port, 100); - for (; (npackets > 0) && gp_port_read(port, retbuf, 0x1000); npackets--); + for (; (npackets > 0) && gp_port_read(port, (char *)retbuf, 0x1000); npackets--); gp_port_set_timeout(port, old_timeout); return GP_OK; } diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c index c0ce0bd72..ce7799a1a 100644 --- a/camlibs/sonydscf1/command.c +++ b/camlibs/sonydscf1/command.c @@ -71,24 +71,24 @@ static int recvdata(GPPort *port, unsigned char *p, int len) int i; gp_log (GP_LOG_DEBUG, "recvdata", "reading %d bytes", len); - gp_port_read(port, &s, 1); /* BOFL */ - gp_port_read(port, &t, 1); /* recvaddr */ + gp_port_read(port, (char *)&s, 1); /* BOFL */ + gp_port_read(port, (char *)&t, 1); /* recvaddr */ if(t != recvaddr[address]){ gp_log (GP_LOG_ERROR, "recvdata", "address %02x does not match %02x, draining 3 bytes", t, recvaddr[address]); - gp_port_read(port, &s, 1); /* drain */ - gp_port_read(port, &s, 1); /* drain */ - gp_port_read(port, &s, 1); /* drain */ + gp_port_read(port, (char *)&s, 1); /* drain */ + gp_port_read(port, (char *)&s, 1); /* drain */ + gp_port_read(port, (char *)&s, 1); /* drain */ Abort(port); return(-1); } i = len; sum = (int) t; - while ((GP_OK <= gp_port_read(port, &s, 1)) && (s != EOFRAME)) { + while ((GP_OK <= gp_port_read(port, (char *)&s, 1)) && (s != EOFRAME)) { sum = sum + s; if(i > 0) { if(s == CESCAPE){ - gp_port_read(port, &s, 1); + gp_port_read(port, (char *)&s, 1); if(0x20 & s) s = 0xDF & s; else @@ -283,7 +283,7 @@ long F1fread(GPPort *port, unsigned char *data, long len) buf[6] = (len >> 8) & 0xff; buf[7] = 0xff & len; sendcommand(port,buf, 8); - gp_port_read(port, buf, 9); + gp_port_read(port, (char *)buf, 9); if((buf[2] != 0x02) || (buf[3] != 0x0C) || (buf[4] != 0x00)){ Abort(port); fprintf(stderr,"F1fread fail\n"); @@ -292,13 +292,13 @@ long F1fread(GPPort *port, unsigned char *data, long len) len2 = buf[7] * 0x100 + buf[8]; /* data size */ if(len2 == 0) { - gp_port_read(port, &s, 1); /* last block checksum */ - gp_port_read(port, &s, 1); /* last block EOFL */ + gp_port_read(port, (char *)&s, 1); /* last block checksum */ + gp_port_read(port, (char *)&s, 1); /* last block EOFL */ return(0); } - while((GP_OK <= gp_port_read(port, &s, 1)) && (s != EOFRAME)){ + while((GP_OK <= gp_port_read(port, (char *)&s, 1)) && (s != EOFRAME)){ if(s == CESCAPE){ - gp_port_read(port, &s, 1); + gp_port_read(port, (char *)&s, 1); if(0x20 & s) s = 0xDF & s; else @@ -386,7 +386,7 @@ long F1fwrite(GPPort *port,unsigned char *data, long len, unsigned char b) /* th address ++; if(address >7 ) address = 0; - gp_port_read(port, buf, 7); + gp_port_read(port, (char *)buf, 7); if((buf[2] != 0x02) || (buf[3] != 0x14) || (buf[4] != 0x00)){ Abort(port); fprintf(stderr,"F1fwrite fail\n"); diff --git a/camlibs/sonydscf55/sony.c b/camlibs/sonydscf55/sony.c index 79c1121b4..e3e48c9b4 100644 --- a/camlibs/sonydscf55/sony.c +++ b/camlibs/sonydscf55/sony.c @@ -157,7 +157,7 @@ sony_baud_to_id(long baud) static int sony_read_byte(Camera * camera, unsigned char *b) { - int n = gp_port_read(camera->port, b, 1); + int n = gp_port_read(camera->port, (char *)b, 1); if (n != 1) return GP_ERROR; else @@ -316,7 +316,7 @@ sony_packet_write(Camera * camera, Packet * p) **/ usleep(10000); - rc = gp_port_write(camera->port, &START_PACKET, 1); + rc = gp_port_write(camera->port, (char *)&START_PACKET, 1); p->buffer[p->length] = p->checksum; diff --git a/camlibs/spca50x/spca50x-flash.c b/camlibs/spca50x/spca50x-flash.c index 796bd281c..7ad815a2b 100644 --- a/camlibs/spca50x/spca50x-flash.c +++ b/camlibs/spca50x/spca50x-flash.c @@ -183,7 +183,7 @@ spca50x_flash_get_TOC(CameraPrivateLibrary *pl, int *filecount) if (pl->bridge == BRIDGE_SPCA500) { /* For dsc350 type cams */ /* read the TOC from the cam */ - CHECK (gp_port_read (pl->gpdev, pl->flash_toc, toc_size)); + CHECK (gp_port_read (pl->gpdev, (char *)pl->flash_toc, toc_size)); /* reset to idle */ CHECK (gp_port_usb_msg_write(pl->gpdev, 0x00, 0x0000, 0x0100, NULL, 0x0)); *filecount = (int)pl->flash_toc[10]; @@ -195,7 +195,7 @@ spca50x_flash_get_TOC(CameraPrivateLibrary *pl, int *filecount) return GP_ERROR_NO_MEMORY; } else { /* all other cams with flash... */ /* read the TOC from the cam */ - CHECK (gp_port_read (pl->gpdev, pl->flash_toc, toc_size)); + CHECK (gp_port_read (pl->gpdev, (char *)pl->flash_toc, toc_size)); } /* record that TOC has been updated - clear the "dirty" flag */ pl->num_files_on_flash = *filecount; @@ -860,7 +860,7 @@ spca50x_flash_get_file (CameraPrivateLibrary *lib, GPContext *context, free (buf); return ret; } - ret = gp_port_read (lib->gpdev, buf, aligned_size); + ret = gp_port_read (lib->gpdev, (char *)buf, aligned_size); if (ret < GP_OK) { free (buf); return ret; @@ -999,7 +999,7 @@ spca50x_flash_init (CameraPrivateLibrary *pl, GPContext *context) jpReg[i].val, jpReg[i].reg, NULL, 0x00)); CHECK (gp_port_usb_msg_read (pl->gpdev, 0x00, 0x0000, - jpReg[i].reg, bytes, 0x01)); + jpReg[i].reg, (char *)bytes, 0x01)); } CHECK (gp_port_usb_msg_write (pl->gpdev, 0x00, 0x0001, 0x2501, NULL, 0x00)); @@ -1014,11 +1014,11 @@ spca50x_flash_init (CameraPrivateLibrary *pl, GPContext *context) * command. Unfortunately it is of yet unclear, what the exact procedure * is. Until we know, let's keep this here. */ CHECK (gp_port_usb_msg_read (pl->gpdev, 0x01, 0x0000, 0x0001, - bytes, 0x01)); + (char *)bytes, 0x01)); CHECK (gp_port_usb_msg_read (pl->gpdev, 0x01, 0x0000, 0x0001, - bytes, 0x01)); + (char *)bytes, 0x01)); CHECK (gp_port_usb_msg_read (pl->gpdev, 0x01, 0x0000, 0x0001, - bytes, 0x01)); + (char *)bytes, 0x01)); /* Set to idle? */ CHECK (gp_port_usb_msg_read (pl->gpdev, 0x01, 0x0000, 0x000f, @@ -1030,11 +1030,11 @@ spca50x_flash_init (CameraPrivateLibrary *pl, GPContext *context) /* firmware detection */ CHECK (gp_port_usb_msg_read (pl->gpdev, 0x20, 0x0000, 0x0000, - bytes, 0x01)); + (char *)bytes, 0x01)); CHECK (gp_port_usb_msg_read (pl->gpdev, 0x20, 0x0000, 0x0000, - bytes, 0x05)); + (char *)bytes, 0x05)); CHECK (gp_port_usb_msg_read (pl->gpdev, 0x21, 0x0000, 0x0000, - bytes, 0x01)); + (char *)bytes, 0x01)); /* * The cam is supposed to sync up with the computer time here @@ -1059,7 +1059,7 @@ spca50x_flash_init (CameraPrivateLibrary *pl, GPContext *context) for (i=0;i<7;i++) CHECK (gp_port_usb_msg_write (pl->gpdev, 0x29, 0x0000, - i, bytes+i, 0x01)); + i, (char *)bytes+i, 0x01)); } diff --git a/camlibs/spca50x/spca50x-sdram.c b/camlibs/spca50x/spca50x-sdram.c index c22125c86..f62c22bc5 100644 --- a/camlibs/spca50x/spca50x-sdram.c +++ b/camlibs/spca50x/spca50x-sdram.c @@ -119,7 +119,7 @@ spca50x_sdram_get_file_count_and_fat_count (CameraPrivateLibrary * lib, sleep (1); CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, 0xe15, - (uint8_t *) & lib->num_files_on_sdram, 1)); + (char *) & lib->num_files_on_sdram, 1)); LE32TOH (lib->num_files_on_sdram); /* get fatscount */ @@ -128,10 +128,10 @@ spca50x_sdram_get_file_count_and_fat_count (CameraPrivateLibrary * lib, sleep (1); CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, 0x0e19, - (uint8_t*)&lower, 1)); + (char *)&lower, 1)); CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, 0x0e20, - (uint8_t*)&upper, 1)); + (char *)&upper, 1)); lib->num_fats = (((upper & 0xFF) << 8) | (lower & 0xFF)); } else { @@ -273,7 +273,7 @@ spca50x_get_image (CameraPrivateLibrary * lib, uint8_t ** buf, return ret; } sleep (1); - ret = gp_port_read (lib->gpdev, mybuf, size); + ret = gp_port_read (lib->gpdev, (char *)mybuf, size); if (ret < GP_OK) { free (mybuf); return ret; @@ -628,7 +628,7 @@ spca50x_get_image_thumbnail (CameraPrivateLibrary * lib, uint8_t ** buf, return ret; } sleep (1); - ret = gp_port_read (lib->gpdev, mybuf, size); + ret = gp_port_read (lib->gpdev, (char *)mybuf, size); if (ret < GP_OK) { free (mybuf); return ret; @@ -697,7 +697,7 @@ spca50x_sdram_get_info (CameraPrivateLibrary * lib) CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, SPCA50X_REG_DramType, - (uint8_t *) & dramtype, 1)); + (char *) & dramtype, 1)); dramtype &= 0xFF; } @@ -751,7 +751,7 @@ spca50x_is_idle (CameraPrivateLibrary * lib) int mode; CHECK (gp_port_usb_msg_read - (lib->gpdev, 0, 0, SPCA50X_REG_CamMode, (uint8_t *) & mode, 1)); + (lib->gpdev, 0, 0, SPCA50X_REG_CamMode, (char *) & mode, 1)); return mode == SPCA50X_CamMode_Idle ? 1 : 0; } @@ -790,13 +790,13 @@ spca50x_download_data (CameraPrivateLibrary * lib, uint32_t start, CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, SPCA50X_REG_VlcAddressL, - (uint8_t *) & vlcAddressL, 1)); + (char *) & vlcAddressL, 1)); CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, SPCA50X_REG_VlcAddressM, - (uint8_t *) & vlcAddressM, 1)); + (char *) & vlcAddressM, 1)); CHECK (gp_port_usb_msg_read (lib->gpdev, 0, 0, SPCA50X_REG_VlcAddressH, - (uint8_t *) & vlcAddressH, 1)); + (char *) & vlcAddressH, 1)); foo = start & 0xFF; CHECK (gp_port_usb_msg_write @@ -816,7 +816,7 @@ spca50x_download_data (CameraPrivateLibrary * lib, uint32_t start, (lib->gpdev, 0, SPCA50X_TrigDramFifo, SPCA50X_REG_Trigger, NULL, 0)); - CHECK (gp_port_read (lib->gpdev, buf, size)); + CHECK (gp_port_read (lib->gpdev, (char *)buf, size)); CHECK (gp_port_usb_msg_write (lib->gpdev, 0, vlcAddressL, SPCA50X_REG_VlcAddressL, NULL, 0)); @@ -872,7 +872,7 @@ spca50x_get_FATs (CameraPrivateLibrary * lib, int dramtype) (lib->gpdev, 0x05, 0x00, 0x07, NULL, 0)); sleep (1); CHECK (gp_port_read - (lib->gpdev, lib->fats, + (lib->gpdev, (char *)lib->fats, lib->num_fats * SPCA50X_FAT_PAGE_SIZE)); } diff --git a/camlibs/spca50x/spca50x.c b/camlibs/spca50x/spca50x.c index 0fa537e0f..b4d0ba1d6 100644 --- a/camlibs/spca50x/spca50x.c +++ b/camlibs/spca50x/spca50x.c @@ -65,7 +65,7 @@ spca50x_get_firmware_revision (CameraPrivateLibrary *lib) { CHECK (gp_port_usb_msg_read (lib->gpdev, 0x20, 0x0, 0x0, - &(lib->fw_rev), 1)); + (char *)&(lib->fw_rev), 1)); return GP_OK; } @@ -79,7 +79,7 @@ spca50x_detect_storage_type (CameraPrivateLibrary *lib) { buf[i] = 0; /* if no data returned, assume no capability */ CHECK (gp_port_usb_msg_read (lib->gpdev, 0x28, 0x0000, - i, &buf[i], 0x01)); + i, (char *)&buf[i], 0x01)); } if (buf[0]) lib->storage_media_mask |= SPCA50X_SDRAM; diff --git a/camlibs/stv0674/library.c b/camlibs/stv0674/library.c index 676f09df7..d61edd7ab 100644 --- a/camlibs/stv0674/library.c +++ b/camlibs/stv0674/library.c @@ -50,7 +50,7 @@ int stv0674_ping(GPPort *port) int ret; unsigned char reply[4]; - ret = gp_port_usb_msg_read (port, CMDID_PING, 0, 0, reply, 1); + ret = gp_port_usb_msg_read (port, CMDID_PING, 0, 0, (char *)reply, 1); if (ret < GP_OK) return ret; @@ -69,7 +69,7 @@ int stv0674_file_count(GPPort *port, int *count) int ret; unsigned char reply[4]; - ret = gp_port_usb_msg_read (port, CMDID_ENUMERATE_IMAGES, 0, 0, reply, 4); + ret = gp_port_usb_msg_read (port, CMDID_ENUMERATE_IMAGES, 0, 0, (char *)reply, 4); if (ret < GP_OK) return ret; @@ -118,11 +118,11 @@ int stv0674_get_image(GPPort *port, int image_no, CameraFile *file) setval(imagno,image_no); - ret = gp_port_usb_msg_write (port, CMDID_SET_IMAGE, 0, 0, imagno, 4); + ret = gp_port_usb_msg_write (port, CMDID_SET_IMAGE, 0, 0, (char *)imagno, 4); if (ret < GP_OK) return ret; - ret = gp_port_usb_msg_read (port, CMDID_IHAVENOIDEA, 0, 0, reply, 2); + ret = gp_port_usb_msg_read (port, CMDID_IHAVENOIDEA, 0, 0, (char *)reply, 2); if (ret < GP_OK) return ret; @@ -132,12 +132,12 @@ int stv0674_get_image(GPPort *port, int image_no, CameraFile *file) CMDID_READ_IMAGE, READ_IMAGE_VALUE_RESET, 0, - imagno, + (char *)imagno, 8); if (ret < GP_OK) return ret; - gp_port_read(port, header, 0x200); + gp_port_read(port, (char *)header, 0x200); size=(header[0x47]<<8) | header[0x48]; @@ -160,14 +160,14 @@ int stv0674_get_image(GPPort *port, int image_no, CameraFile *file) CMDID_READ_IMAGE, READ_IMAGE_VALUE_READ, 0, - imagno, + (char *)imagno, 8); if (ret < GP_OK) { free (data); return ret; } - gp_port_read(port, &data[current*0x1000], 0x1000); + gp_port_read(port, (char *)&data[current*0x1000], 0x1000); } if(remain) @@ -177,14 +177,14 @@ int stv0674_get_image(GPPort *port, int image_no, CameraFile *file) CMDID_READ_IMAGE, READ_IMAGE_VALUE_READ, 0, - imagno, + (char *)imagno, 8); if (ret < GP_OK) { free (data); return ret; } - gp_port_read(port, &data[current*0x1000], remain); + gp_port_read(port, (char *)&data[current*0x1000], remain); } @@ -192,7 +192,7 @@ int stv0674_get_image(GPPort *port, int image_no, CameraFile *file) gp_file_append(file, data, size); free(data); - ret = gp_port_usb_msg_write (port, CMDID_FINISH_READ, 0, 0, imagno, 4); + ret = gp_port_usb_msg_write (port, CMDID_FINISH_READ, 0, 0, (char *)imagno, 4); if (ret < GP_OK) return ret; diff --git a/camlibs/stv0680/library.c b/camlibs/stv0680/library.c index 2e203bfcb..692b86939 100644 --- a/camlibs/stv0680/library.c +++ b/camlibs/stv0680/library.c @@ -91,17 +91,17 @@ static int stv0680_cmd(GPPort *port, unsigned char cmd, /* write to port */ printf("Writing packet to port\n"); - if((ret = gp_port_write(port, packet, 8)) < GP_OK) + if((ret = gp_port_write(port, (char *)packet, 8)) < GP_OK) return ret; printf("Reading response header\n"); /* read response header */ - if((ret = gp_port_read(port, rhdr, 6)) != 6) + if((ret = gp_port_read(port, (char *)rhdr, 6)) != 6) return ret; printf("Read response\n"); /* read response */ - if((ret = gp_port_read(port, response, response_len)) != response_len) + if((ret = gp_port_read(port, (char *)response, response_len)) != response_len) return ret; printf("Validating packet [0x%X,0x%X,0x%X,0x%X,0x%X,0x%X]\n", @@ -127,9 +127,9 @@ int stv0680_try_cmd(GPPort *port, unsigned char cmd, case GP_PORT_USB: /* Most significant bit set, data flows from camera->host */ if (cmd & 0x80) - ret=gp_port_usb_msg_read(port,cmd,data,0,response,response_len); + ret=gp_port_usb_msg_read(port,cmd,data,0,(char *)response,response_len); else - ret=gp_port_usb_msg_write(port,cmd,data,0,response,response_len); + ret=gp_port_usb_msg_write(port,cmd,data,0,(char *)response,response_len); if (ret == response_len) return GP_OK; @@ -213,7 +213,7 @@ int stv0680_get_image_raw(GPPort *port, int image_no, CameraFile *file) size = (imghdr.size[0] << 24) | (imghdr.size[1] << 16) | (imghdr.size[2]<<8) | imghdr.size[3]; raw = malloc(size); - if ((ret=gp_port_read(port, raw, size))<0) + if ((ret=gp_port_read(port, (char *)raw, size))<0) return ret; sprintf(header, "P6\n# gPhoto2 stv0680 image\n%d %d\n255\n", w, h); @@ -258,7 +258,7 @@ int stv0680_get_image(GPPort *port, int image_no, CameraFile *file) sprintf(header, "P6\n# gPhoto2 stv0680 image\n#flags %x sgain %d sclkdiv %d avgpix %d fine %d coarse %d\n%d %d\n255\n", imghdr.flags, imghdr.sensor_gain, imghdr.sensor_clkdiv, imghdr.avg_pixel_value, fine, coarse , w, h); gp_file_append(file, header, strlen(header)); - if ((ret=gp_port_read(port, raw, size))<0) + if ((ret=gp_port_read(port, (char *)raw, size))<0) return ret; data = malloc(size * 3); @@ -322,7 +322,7 @@ int stv0680_get_image_preview(GPPort *port, int image_no, CameraFile *file) } raw = calloc(1, rsize); if (!raw) return GP_ERROR_NO_MEMORY; - if ((ret=gp_port_read(port, raw, rsize))<0) { + if ((ret=gp_port_read(port, (char *)raw, rsize))<0) { free(raw); return ret; } @@ -485,7 +485,7 @@ int stv0680_capture_preview(GPPort *port, char **data, int *size) *size= xsize; raw = malloc(*size); - switch(gp_port_read(port, raw, *size)) { + switch(gp_port_read(port, (char *)raw, *size)) { case GP_ERROR_TIMEOUT: printf("read timeout\n"); break; diff --git a/camlibs/sx330z/sx330z.c b/camlibs/sx330z/sx330z.c index 2964d177d..ffec82131 100644 --- a/camlibs/sx330z/sx330z.c +++ b/camlibs/sx330z/sx330z.c @@ -84,7 +84,7 @@ sx330z_init(Camera *camera, GPContext *context) /* struct traveler_ack ack;*/ uint8_t trxbuf[0x10]; int ret; - ret = gp_port_usb_msg_read(camera->port, USB_REQ_RESERVED, SX330Z_REQUEST_INIT, 0, trxbuf, 0x10); + ret = gp_port_usb_msg_read(camera->port, USB_REQ_RESERVED, SX330Z_REQUEST_INIT, 0, (char *)trxbuf, 0x10); if (ret != 0x10) return(GP_ERROR); /* more specific about error ? */ return(GP_OK); } /* sx330z_init */ @@ -101,13 +101,13 @@ sx330z_read_block(Camera *camera, GPContext *context, struct traveler_req *req, /* 1. send request */ sx330z_fill_req(trxbuf, req); ret = gp_port_usb_msg_write(camera->port, - USB_REQ_RESERVED, req->requesttype, 0, trxbuf, 0x20); + USB_REQ_RESERVED, req->requesttype, 0, (char *)trxbuf, 0x20); if (ret != 0x20) return(GP_ERROR_IO_WRITE); /* 2. read data */ - ret = gp_port_read(camera->port, buf, req->size); + ret = gp_port_read(camera->port, (char *)buf, req->size); if (ret != req->size)return(GP_ERROR_IO_READ); /* 3. read Ack */ - ret = gp_port_read(camera->port, trxbuf, 0x10); + ret = gp_port_read(camera->port, (char *)trxbuf, 0x10); if (ret != 0x10) return(GP_ERROR); /* FIXME : Security check ???*/ return(GP_OK); @@ -125,7 +125,7 @@ sx330z_get_toc_num_pages(Camera *camera, GPContext *context, int32_t *pages) int ret; ret=gp_port_usb_msg_read(camera->port, - USB_REQ_RESERVED,SX330Z_REQUEST_TOC_SIZE, 0, trxbuf, 0x10); + USB_REQ_RESERVED,SX330Z_REQUEST_TOC_SIZE, 0, (char *)trxbuf, 0x10); if (ret != 0x10) return(GP_ERROR); sx330z_fill_ack(trxbuf, &ack); /* convert endianness */ diff --git a/camlibs/topfield/usb_io.c b/camlibs/topfield/usb_io.c index 3b3cec438..127c57bf1 100644 --- a/camlibs/topfield/usb_io.c +++ b/camlibs/topfield/usb_io.c @@ -91,13 +91,13 @@ static const unsigned char success_packet[8] = { ssize_t send_cancel(Camera *camera,GPContext *context) { gp_log (GP_LOG_DEBUG, "topfield", __func__); - return gp_port_write (camera->port, cancel_packet, 8); + return gp_port_write (camera->port, (char *)cancel_packet, 8); } ssize_t send_success(Camera *camera, GPContext *context) { gp_log (GP_LOG_DEBUG, "topfield", __func__); - return gp_port_write (camera->port, success_packet, 8); + return gp_port_write (camera->port, (char *)success_packet, 8); } ssize_t send_cmd_ready(Camera *camera, GPContext *context) @@ -269,7 +269,7 @@ ssize_t send_tf_packet(Camera *camera, struct tf_packet *packet, GPContext *cont gp_log (GP_LOG_DEBUG, "topfield", __func__); put_u16(&packet->crc, get_crc(packet)); swap_out_packet(packet); - return gp_port_write (camera->port, (unsigned char *) packet, byte_count); + return gp_port_write (camera->port, (char *) packet, byte_count); } /* Receive a Topfield protocol packet. @@ -281,7 +281,7 @@ ssize_t get_tf_packet(Camera *camera, struct tf_packet * packet, GPContext *cont int r; gp_log (GP_LOG_DEBUG, "topfield", __func__); - r = gp_port_read (camera->port, buf, MAXIMUM_PACKET_SIZE); + r = gp_port_read (camera->port, (char *)buf, MAXIMUM_PACKET_SIZE); if(r < 0) return r; diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c index 29fd2c706..94f000b8d 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.c +++ b/camlibs/toshiba/pdrm11/pdrm11.c @@ -41,15 +41,15 @@ int pdrm11_init(GPPort *port) gp_port_set_timeout(port,1000); /* exactly what windows driver does */ - gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, buf, 4); + gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, (char *)buf, 4); gp_port_usb_msg_write(port, 0x01, PDRM11_CMD_PING3, 0, NULL, 0); - gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, buf, 4); + gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, (char *)buf, 4); gp_port_usb_msg_write(port, 0x01, PDRM11_CMD_INIT1, 0, NULL, 0); - gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, buf, 4); + gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, (char *)buf, 4); gp_port_usb_msg_write(port, 0x01, PDRM11_CMD_INIT2, 0, NULL, 0); - gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, buf, 4); + gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_READY, 0, (char *)buf, 4); - gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_ZERO, 0, buf, 2); + gp_port_usb_msg_read (port, 0x01, PDRM11_CMD_ZERO, 0, (char *)buf, 2); if(buf[0] || buf[1]) { /* I haven't seen anything other than 00 00 yet * unless the connection is bad */ @@ -64,7 +64,7 @@ int pdrm11_init(GPPort *port) GP_DEBUG("waiting..."); timeout--; - if( gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_READY, 0, buf, 4) == -ETIMEDOUT ) + if( gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_READY, 0, (char *)buf, 4) == -ETIMEDOUT ) timeout = 0; } while( !((buf[3] == 0x25) && (buf[0] == 1)) && timeout ); @@ -161,10 +161,10 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t CHECK( pdrm11_select_file(port, picNum) ); if(type == GP_FILE_TYPE_PREVIEW) { - CHECK(gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_INFO, picNum, buf, 8)); + CHECK(gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_INFO, picNum, (char *)buf, 8)); file_type = buf[4]; - CHECK( gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_THUMBSIZE, picNum, buf, 14) ); + CHECK( gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_THUMBSIZE, picNum, (char *)buf, 14) ); thumbsize = le16atoh( &buf[8] ); /* add 1 to file size only for jpeg thumbnails */ @@ -181,7 +181,7 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t } } else if(type == GP_FILE_TYPE_NORMAL) { - CHECK( gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_FILESIZE, picNum, buf, 26) ); + CHECK( gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_FILESIZE, picNum, (char *)buf, 26) ); size = le32atoh( &buf[18] ); } else { GP_DEBUG("Unsupported file type!"); @@ -202,10 +202,10 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t CHECK_AND_FREE( gp_port_usb_msg_write(port, 0x01, PDRM11_CMD_GET_PIC, picNum, NULL, 0), image ); } - ret = gp_port_read(port, image, size); + ret = gp_port_read(port, (char *)image, size); if(ret != size) { GP_DEBUG("failed to read from port. Giving it one more try..."); - ret = gp_port_read(port, image, size); + ret = gp_port_read(port, (char *)image, size); if(ret != size) { GP_DEBUG("gp_port_read returned %d 0x%x. size: %d 0x%x", ret, ret, size, size); free (image); @@ -241,7 +241,7 @@ int pdrm11_delete_file(GPPort *port, int picNum) CHECK( pdrm11_select_file(port, picNum) ); /* should always be 00 00 */ - gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_DELETE, picNum, buf, 2); + gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_DELETE, picNum, (char *)buf, 2); if( (buf[0] != 0) || (buf[1] !=0) ) { GP_DEBUG("should have read 00 00. actually read %2x %2x.", buf[0], buf[1]); return(GP_ERROR); |