From 5e7525c2eeb7a9aa60656c0756ec7e34f8aafeb5 Mon Sep 17 00:00:00 2001 From: Ilya Konstantinov Date: Sat, 27 Apr 2002 16:27:17 +0000 Subject: [PATCH] sierra_ping -> sierra_init: This function isn't really a "ping", since it can be used only on startup. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4476 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/sierra/library.c | 6 +++--- camlibs/sierra/library.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c index 346b0499b..bc985a932 100644 --- a/camlibs/sierra/library.c +++ b/camlibs/sierra/library.c @@ -710,19 +710,19 @@ sierra_write_ack (Camera *camera) } int -sierra_ping (Camera *camera, GPContext *context) +sierra_init (Camera *camera, GPContext *context) { char buf[4096], packet[4096]; int r = 0; - GP_DEBUG ("Pinging camera..."); + GP_DEBUG ("Sending initialization sequence to the camera..."); packet[0] = NUL; while (1) { CHECK (sierra_write_packet (camera, packet)); CHECK (sierra_read_packet_wait (camera, buf, context)); - + switch (buf[0]) { case NAK: return (GP_OK); diff --git a/camlibs/sierra/library.h b/camlibs/sierra/library.h index fe225db17..8fcd40503 100644 --- a/camlibs/sierra/library.h +++ b/camlibs/sierra/library.h @@ -47,7 +47,7 @@ int sierra_set_locked (Camera *camera, unsigned int n, SierraLocked locked, int sierra_set_speed (Camera *camera, int speed, GPContext *context); int sierra_end_session (Camera *camera, GPContext *context); -int sierra_ping (Camera *camera, GPContext *context); +int sierra_init (Camera *camera, GPContext *context); int sierra_get_memory_left (Camera *camera, int *memory, GPContext *context); int sierra_check_battery_capacity (Camera *camera, GPContext *context);