darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

finished GP_PORT renaming

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1527 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Scott Fritzinger
2001-01-22 21:25:25 +00:00
parent 3dd042f150
commit ded91bec92
20 changed files with 68 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
camlibs/barbie/barbie.c
View File

@@ -75,7 +75,7 @@ int camera_init(Camera *camera) {
camera->camlib_data = b;
b->dev = gp_port_new(GP_PORT_SERIAL);
gp_port_set_timeout(b->dev, 5000);
gp_port_timeout_set(b->dev, 5000);
strcpy(settings.serial.port, camera->port->path);
settings.serial.speed = 57600;
@@ -83,7 +83,7 @@ int camera_init(Camera *camera) {
settings.serial.parity = 0;
settings.serial.stopbits= 1;
gp_port_set_settings(b->dev, settings);
gp_port_settings_set(b->dev, settings);
gp_port_open(b->dev);
/* Create the filesystem */

8
camlibs/canon/serial.c
View File

@@ -77,9 +77,9 @@ void serial_flush_output(gp_port *gdev)
int canon_serial_change_speed(gp_port *gdev, int speed)
{
/* set speed */
gp_port_get_settings(gdev, &settings);
gp_port_settings_get(gdev, &settings);
settings.serial.speed = speed;
gp_port_set_settings(gdev, settings);
gp_port_settings_set(gdev, settings);
usleep(70000);
@@ -101,7 +101,7 @@ int canon_serial_change_speed(gp_port *gdev, int speed)
****************************************************************************/
int canon_serial_get_cts(gp_port *gdev)
{
return gp_port_get_pin(gdev,PIN_CTS);
return gp_port_pin_get(gdev,PIN_CTS);
}
/*****************************************************************************
@@ -330,7 +330,7 @@ void serial_set_timeout(gp_port *gdev, int to)
{
// struct canon_info *cs = (struct canon_info*)camera->camlib_data;
gp_port_set_timeout(gdev,to);
gp_port_timeout_set(gdev,to);
}
/*****************************************************************************

2
camlibs/digita/serial.c
View File

@@ -189,7 +189,7 @@ int digita_serial_open(struct digita_device *dev, Camera *camera)
digita_send = digita_serial_send;
digita_read = digita_serial_read;
gp_port_set_settings(dev->gpdev, settings);
gp_port_settings_set(dev->gpdev, settings);
if (gp_port_open(dev->gpdev) < 0) {
fprintf(stderr, "error opening device\n");
return 0;

4
camlibs/kodak/dc120/dc120.c
View File

@@ -83,7 +83,7 @@ int camera_init (Camera *camera) {
settings.serial.parity = 0;
settings.serial.stopbits = 1;
if (gp_port_set_settings(dd->dev, settings) == GP_ERROR) {
if (gp_port_settings_set(dd->dev, settings) == GP_ERROR) {
gp_port_free(dd->dev);
free(dd);
return (GP_ERROR);
@@ -95,7 +95,7 @@ int camera_init (Camera *camera) {
return (GP_ERROR);
}
gp_port_set_timeout(dd->dev, TIMEOUT);
gp_port_timeout_set(dd->dev, TIMEOUT);
/* Reset the camera to 9600 */
gp_port_send_break(dd->dev, 2);

10
camlibs/kodak/dc120/library.c
View File

@@ -29,7 +29,7 @@ int dc120_packet_write (DC120Data *dd, char *packet, int size, int read_response
write_again:
/* If retry, give camera some recup time */
if (x > 0)
GP_PORT_SLEEP(SLEEP_TIMEOUT);
GP_SYSTEM_SLEEP(SLEEP_TIMEOUT);
/* Return error if too many retries */
if (x++ > RETRIES)
@@ -161,7 +161,7 @@ int dc120_set_speed (DC120Data *dd, int speed) {
char *p = dc120_packet_new(0x41);
gp_port_settings settings;
gp_port_get_settings(dd->dev, &settings);
gp_port_settings_get(dd->dev, &settings);
switch (speed) {
case 9600:
@@ -204,12 +204,12 @@ int dc120_set_speed (DC120Data *dd, int speed) {
if (dc120_packet_write(dd, p, 8, 1) == GP_ERROR)
return (GP_ERROR);
if (gp_port_set_settings (dd->dev, settings) == GP_ERROR)
if (gp_port_settings_set (dd->dev, settings) == GP_ERROR)
return (GP_ERROR);
free (p);
GP_PORT_SLEEP(300);
GP_SYSTEM_SLEEP(300);
/* Speed change went OK. */
return (GP_OK);
@@ -322,7 +322,7 @@ int dc120_get_file_preview (DC120Data *dd, CameraFile *file, int file_number, ch
gp_file_append(file, buf, strlen(buf));
}
GP_PORT_SLEEP(1000);
GP_SYSTEM_SLEEP(1000);
return (GP_OK);
}

4
camlibs/kodak/dc240/dc240.c
View File

@@ -104,7 +104,7 @@ int camera_init (Camera *camera) {
return (GP_ERROR);
}
if (gp_port_set_settings(dd->dev, settings) == GP_ERROR) {
if (gp_port_settings_set(dd->dev, settings) == GP_ERROR) {
gp_port_free(dd->dev);
free(dd);
return (GP_ERROR);
@@ -116,7 +116,7 @@ int camera_init (Camera *camera) {
return (GP_ERROR);
}
gp_port_set_timeout(dd->dev, TIMEOUT);
gp_port_timeout_set(dd->dev, TIMEOUT);
if (camera->port->type == GP_PORT_SERIAL) {
/* Reset the camera to 9600 */

4
camlibs/kodak/dc240/library.c
View File

@@ -292,7 +292,7 @@ int dc240_set_speed (DC240Data *dd, int speed) {
char *p = dc240_packet_new(0x41);
gp_port_settings settings;
gp_port_get_settings(dd->dev, &settings);
gp_port_settings_get(dd->dev, &settings);
switch (speed) {
case 9600:
@@ -335,7 +335,7 @@ int dc240_set_speed (DC240Data *dd, int speed) {
if (dc240_packet_write(dd, p, 8, 1) == GP_ERROR)
return (GP_ERROR);
if (gp_port_set_settings (dd->dev, settings) == GP_ERROR)
if (gp_port_settings_set (dd->dev, settings) == GP_ERROR)
return (GP_ERROR);
free (p);

6
camlibs/konica/library.c
View File

@@ -225,7 +225,7 @@ camera_init (Camera* camera)
if (camera->port->speed != 0) {
gp_debug_printf (GP_DEBUG_LOW, "konica", "-> Quick test for given speed %i.\n", camera->port->speed);
device_settings.serial.speed = camera->port->speed;
gp_port_set_settings (device, device_settings);
gp_port_settings_set (device, device_settings);
if (k_init (device) == GP_OK) return (GP_OK);
}
@@ -235,7 +235,7 @@ camera_init (Camera* camera)
for (i = 0; i < 10; i++) {
gp_debug_printf (GP_DEBUG_LOW, "konica", "-> Testing speed %i.\n", test_bit_rate[i]);
device_settings.serial.speed = test_bit_rate[i];
gp_port_set_settings (device, device_settings);
gp_port_settings_set (device, device_settings);
if (k_init (device) == GP_OK) break;
}
if ((i == 1) && (camera->port->speed == 0)) {
@@ -291,7 +291,7 @@ camera_init (Camera* camera)
return (result);
}
device_settings.serial.speed = bit_rate[i];
gp_port_set_settings (device, device_settings);
gp_port_settings_set (device, device_settings);
if ((result = k_init (device)) != GP_OK) {
gp_port_free (device);
return (result);

6
camlibs/konica/lowlevel.c
View File

@@ -53,7 +53,7 @@ l_init (gp_port* device)
g_return_val_if_fail (device, GP_ERROR_BAD_PARAMETERS);
gp_port_set_timeout (device, DEFAULT_TIMEOUT);
gp_port_timeout_set (device, DEFAULT_TIMEOUT);
if (gp_port_open (device) == GP_ERROR) return GP_ERROR_IO;
for (i = 0; ; i++) {
/****************/
@@ -326,9 +326,9 @@ l_receive (gp_port* device, guchar** rb, guint* rbs, guint timeout)
g_return_val_if_fail (device, GP_ERROR_BAD_PARAMETERS);
for (i = 0; ; ) {
gp_port_set_timeout (device, timeout);
gp_port_timeout_set (device, timeout);
if (gp_port_read (device, &c, 1) < 1) return (GP_ERROR_IO);
gp_port_set_timeout (device, DEFAULT_TIMEOUT);
gp_port_timeout_set (device, DEFAULT_TIMEOUT);
switch (c) {
case ENQ:
/******************************************************/

4
camlibs/minolta/dimagev/dimagev.c
View File

@@ -92,7 +92,7 @@ int camera_init (Camera *camera) {
return GP_ERROR;
}
gp_port_set_timeout(dimagev->dev, 5000);
gp_port_timeout_set(dimagev->dev, 5000);
#if defined HAVE_STRNCPY
strncpy(dimagev->settings.serial.port, camera->port->path, sizeof(dimagev->settings.serial.port));
@@ -109,7 +109,7 @@ int camera_init (Camera *camera) {
return GP_ERROR;
}
gp_port_set_settings(dimagev->dev, dimagev->settings);
gp_port_settings_set(dimagev->dev, dimagev->settings);
gp_port_open(dimagev->dev);
if ( dimagev_get_camera_data(dimagev) == GP_ERROR ) {

2
camlibs/panasonic/dc.c
View File

@@ -138,7 +138,7 @@ int dsc1_setbaudrate(dsc_t *dsc, int speed) {
sleep(DSC_PAUSE/2);
dsc->settings.serial.speed = speed;
if (gp_port_set_settings(dsc->dev, dsc->settings) != GP_OK)
if (gp_port_settings_set(dsc->dev, dsc->settings) != GP_OK)
return GP_ERROR;
DEBUG_PRINT(("Baudrate set to: %i.", speed));

4
camlibs/panasonic/dc1000.c
View File

@@ -382,14 +382,14 @@ int camera_init (Camera *camera) {
dsc->dev = gp_port_new(GP_PORT_SERIAL);
gp_port_set_timeout(dsc->dev, 5000);
gp_port_timeout_set(dsc->dev, 5000);
strcpy(dsc->settings.serial.port, camera->port->path);
dsc->settings.serial.speed = 9600; /* hand shake speed */
dsc->settings.serial.bits = 8;
dsc->settings.serial.parity = 0;
dsc->settings.serial.stopbits = 1;
gp_port_set_settings(dsc->dev, dsc->settings);
gp_port_settings_set(dsc->dev, dsc->settings);
gp_port_open(dsc->dev);

4
camlibs/panasonic/dc1580.c
View File

@@ -475,14 +475,14 @@ int camera_init (Camera *camera) {
dsc->dev = gp_port_new(GP_PORT_SERIAL);
gp_port_set_timeout(dsc->dev, 5000);
gp_port_timeout_set(dsc->dev, 5000);
strcpy(dsc->settings.serial.port, camera->port->path);
dsc->settings.serial.speed = 9600; /* hand shake speed */
dsc->settings.serial.bits = 8;
dsc->settings.serial.parity = 0;
dsc->settings.serial.stopbits = 1;
gp_port_set_settings(dsc->dev, dsc->settings);
gp_port_settings_set(dsc->dev, dsc->settings);
gp_port_open(dsc->dev);

4
camlibs/sierra/library.c
View File

@@ -394,7 +394,7 @@ int sierra_set_speed (Camera *camera, int speed) {
fd->first_packet = 1;
gp_port_get_settings(fd->dev, &settings);
gp_port_settings_get(fd->dev, &settings);
switch (speed) {
case 9600:
@@ -429,7 +429,7 @@ int sierra_set_speed (Camera *camera, int speed) {
if (sierra_set_int_register(camera, 17, speed)==GP_ERROR)
return (GP_ERROR);
if (gp_port_set_settings(fd->dev, settings)==GP_ERROR)
if (gp_port_settings_set(fd->dev, settings)==GP_ERROR)
return (GP_ERROR);
GP_SYSTEM_SLEEP(10);

10
camlibs/sierra/sierra.c
View File

@@ -210,7 +210,7 @@ int camera_init (Camera *camera) {
free (fd);
return (GP_ERROR);
}
gp_port_set_timeout (fd->dev, 5000);
gp_port_timeout_set (fd->dev, 5000);
settings.usb.inep = inep;
settings.usb.outep = outep;
settings.usb.config = 1;
@@ -223,13 +223,13 @@ int camera_init (Camera *camera) {
return (GP_ERROR);
}
if (gp_port_set_settings(fd->dev, settings) == GP_ERROR) {
if (gp_port_settings_set(fd->dev, settings) == GP_ERROR) {
gp_port_free(fd->dev);
free (fd);
return (GP_ERROR);
}
gp_port_set_timeout(fd->dev, TIMEOUT);
gp_port_timeout_set(fd->dev, TIMEOUT);
fd->type = camera->port->type;
if (gp_port_open(fd->dev)==GP_ERROR) {
@@ -268,7 +268,7 @@ int camera_init (Camera *camera) {
sierra_set_int_register(camera, 83, -1);
gp_port_set_timeout(fd->dev, 50);
gp_port_timeout_set(fd->dev, 50);
if (sierra_set_string_register(camera, 84, "\\", 1)==GP_ERROR)
fd->folders = 0;
else
@@ -286,7 +286,7 @@ int camera_init (Camera *camera) {
strcpy(fd->folder, "/");
gp_port_set_timeout(fd->dev, TIMEOUT);
gp_port_timeout_set(fd->dev, TIMEOUT);
camera_stop(camera);
return (GP_OK);

4
camlibs/stv0680/stv0680.c
View File

@@ -82,7 +82,7 @@ int camera_init (Camera *camera) {
/* open and configure serial port */
device->gpiod = gp_port_new(GP_PORT_SERIAL);
gp_port_set_timeout(device->gpiod, 1000);
gp_port_timeout_set(device->gpiod, 1000);
strcpy(gpiod_settings.serial.port, camera->port->path);
gpiod_settings.serial.speed = camera->port->speed;
@@ -90,7 +90,7 @@ int camera_init (Camera *camera) {
gpiod_settings.serial.parity = 0;
gpiod_settings.serial.stopbits = 1;
gp_port_set_settings(device->gpiod, gpiod_settings);
gp_port_settings_set(device->gpiod, gpiod_settings);
gp_port_open(device->gpiod);
/* create camera filesystem */

4
frontends/command-line/main.c
View File

@@ -296,7 +296,7 @@ OPTION_CALLBACK(list_ports) {
gp_port_info info;
int x, count;
if ((count = gp_port_get_count()) < 0) {
if ((count = gp_port_count_get()) < 0) {
cli_error_print("Could not get number of ports");
return (count);
}
@@ -307,7 +307,7 @@ OPTION_CALLBACK(list_ports) {
} else
printf("%i\n", count);
for(x=0; x<count; x++) {
gp_port_get_info(x, &info);
gp_port_info_get(x, &info);
printf("%-32s %-32s\n",info.path,info.name);
}

6
libgphoto2/camera.c
View File

@@ -185,14 +185,14 @@ int gp_camera_init (Camera *camera)
/* Set the port type from the path in case the frontend didn't. */
if (camera->port->type == GP_PORT_NONE) {
for (x=0; x<gp_port_get_count(); x++) {
gp_port_get_info(x, &info);
for (x=0; x<gp_port_count_get(); x++) {
gp_port_info_get(x, &info);
if (strcmp(info.path, camera->port->path)==0) {
camera->port->type = info.type;
break;
}
}
if (x == gp_port_get_count ())
if (x == gp_port_count_get ())
return (GP_ERROR_BAD_PARAMETERS);
}

18
libgphoto2_port/include/gphoto2-port.h
View File

@@ -161,14 +161,14 @@ struct gp_port {
unsuccessful: GP_ERROR
*/
int gp_port_get_count ();
int gp_port_count_get ();
/* Get a count of available devices
return values:
successful: valid gp_port_list struct
unsuccessful: GP_ERROR
*/
int gp_port_get_info (int device_number, gp_port_info *info);
int gp_port_info_get (int device_number, gp_port_info *info);
/* Get information about a device
return values:
successful: valid gp_port_list struct
@@ -189,7 +189,7 @@ gp_port *gp_port_new (gp_port_type type);
unsuccessful: GP_ERROR
*/
int gp_port_set_debug (gp_port *dev, int debug_level);
int gp_port_debug_set (gp_port *dev, int debug_level);
/*
Set the debugging level specific to a device
*/
@@ -208,19 +208,19 @@ gp_port *gp_port_new (gp_port_type type);
unsuccessful: GP_ERROR
*/
int gp_port_set_timeout (gp_port *dev, int millisec_timeout);
int gp_port_timeout_set (gp_port *dev, int millisec_timeout);
/* Sets the read/write timeout
successful: GP_OK
unsuccessful: GP_ERROR
*/
int gp_port_get_timeout (gp_port *dev, int *millisec_timeout);
int gp_port_timeout_get (gp_port *dev, int *millisec_timeout);
/* Sets the read/write timeout
successful: GP_OK
unsuccessful: GP_ERROR
*/
int gp_port_set_settings (gp_port *dev,
int gp_port_settings_set (gp_port *dev,
gp_port_settings settings);
/* Sets the settings
successful: GP_OK
@@ -228,7 +228,7 @@ gp_port *gp_port_new (gp_port_type type);
*/
int gp_port_get_settings (gp_port *dev,
int gp_port_settings_get (gp_port *dev,
gp_port_settings *settings);
/* Returns settings in "settings"
successful: GP_OK
@@ -253,7 +253,7 @@ gp_port *gp_port_new (gp_port_type type);
/* Serial and Parallel specific functions
-------------------------------------------------------------- */
int gp_port_get_pin (gp_port *dev, int pin);
int gp_port_pin_get (gp_port *dev, int pin);
/* Give the status of pin from dev
pin values:
see PIN_ constants in the various .h files
@@ -262,7 +262,7 @@ gp_port *gp_port_new (gp_port_type type);
unsuccessful: GP_ERROR
*/
int gp_port_set_pin (gp_port *dev, int pin, int level);
int gp_port_pin_set (gp_port *dev, int pin, int level);
/* set the status of pin from dev to level
pin values:
see PIN_ constants in the various .h files

38
libgphoto2_port/libgphoto2_port/gp_port.c
View File

@@ -60,13 +60,13 @@ int gp_port_init(int debug)
return (gp_port_library_list(device_list, &device_count));
}
int gp_port_get_count(void)
int gp_port_count_get(void)
{
gp_port_debug_printf(GP_DEBUG_LOW, glob_debug_level, "Device count: %i", device_count);
return device_count;
}
int gp_port_get_info(int device_number, gp_port_info *info)
int gp_port_info_get(int device_number, gp_port_info *info)
{
gp_port_debug_printf(GP_DEBUG_LOW, glob_debug_level, "Getting device info...");
@@ -113,29 +113,22 @@ gp_port *gp_port_new(gp_port_type type)
settings.serial.bits = 8;
settings.serial.parity = 0;
settings.serial.stopbits = 1;
gp_port_set_settings(dev, settings);
gp_port_set_timeout(dev, 500);
gp_port_settings_set(dev, settings);
gp_port_timeout_set(dev, 500);
break;
case GP_PORT_PARALLEL:
#ifdef GP_PORT_PARALLEL
sprintf(buf, GP_PORT_SERIAL_PREFIX, GP_PORT_SERIAL_RANGE_LOW);
strcpy(settings.parallel.port, buf);
#endif
break;
case GP_PORT_NETWORK:
#ifdef GP_PORT_NETWORK
gp_port_set_timeout(dev, 50000);
#endif
gp_port_timeout_set(dev, 50000);
break;
case GP_PORT_USB:
#ifdef GP_PORT_USB
gp_port_set_timeout(dev, 5000);
#endif
gp_port_timeout_set(dev, 5000);
break;
case GP_PORT_IEEE1394:
#ifdef GP_PORT_IEEE1394
/* blah ? */
#endif
break;
default:
/* ERROR! */
@@ -147,7 +140,7 @@ gp_port *gp_port_new(gp_port_type type)
return (dev);
}
int gp_port_set_debug (gp_port *dev, int debug_level)
int gp_port_debug_set (gp_port *dev, int debug_level)
{
dev->debug_level = debug_level;
@@ -271,7 +264,7 @@ int gp_port_read(gp_port *dev, char *bytes, int size)
return (retval);
}
int gp_port_set_timeout(gp_port *dev, int millisec_timeout)
int gp_port_timeout_set(gp_port *dev, int millisec_timeout)
{
dev->timeout = millisec_timeout;
@@ -281,7 +274,7 @@ int gp_port_set_timeout(gp_port *dev, int millisec_timeout)
return GP_OK;
}
int gp_port_get_timeout(gp_port *dev, int *millisec_timeout)
int gp_port_timeout_get(gp_port *dev, int *millisec_timeout)
{
*millisec_timeout = dev->timeout;
@@ -291,7 +284,7 @@ int gp_port_get_timeout(gp_port *dev, int *millisec_timeout)
return GP_OK;
}
int gp_port_set_settings(gp_port *dev, gp_port_settings settings)
int gp_port_settings_set(gp_port *dev, gp_port_settings settings)
{
int retval;
@@ -305,7 +298,7 @@ int gp_port_set_settings(gp_port *dev, gp_port_settings settings)
}
int gp_port_get_settings(gp_port *dev, gp_port_settings * settings)
int gp_port_settings_get(gp_port *dev, gp_port_settings * settings)
{
memcpy(settings, &dev->settings, sizeof(gp_port_settings));
gp_port_debug_printf(GP_DEBUG_LOW, dev->debug_level, "gp_port_get_settings: ok");
@@ -316,7 +309,7 @@ int gp_port_get_settings(gp_port *dev, gp_port_settings * settings)
/* Serial and Parallel-specific functions */
/* ------------------------------------------------------------------ */
int gp_port_get_pin(gp_port *dev, int pin)
int gp_port_pin_get(gp_port *dev, int pin)
{
int retval;
@@ -331,7 +324,7 @@ int gp_port_get_pin(gp_port *dev, int pin)
return (retval);
}
int gp_port_set_pin(gp_port *dev, int pin, int level)
int gp_port_pin_set(gp_port *dev, int pin, int level)
{
int retval;
@@ -364,8 +357,6 @@ int gp_port_send_break (gp_port *dev, int duration)
/* USB-specific functions */
/* ------------------------------------------------------------------ */
#ifdef GP_PORT_USB
int gp_port_usb_find_device (gp_port * dev, int idvendor, int idproduct)
{
int retval;
@@ -429,4 +420,3 @@ int gp_port_usb_msg_read (gp_port * dev, int value, char *bytes, int size)
"gp_port_usb_msg_read: msg_read %s", retval < 0? "error":"ok");
return (retval);
}
#endif