From 246a5e306aa58ed37990bfbeb08a91bf3cc673e1 Mon Sep 17 00:00:00 2001 From: Patrick Mansfield Date: Sat, 13 Sep 2003 19:08:58 +0000 Subject: [PATCH] Get rid of C++ style comments. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6749 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/sierra/ChangeLog | 3 +++ camlibs/sierra/epson-desc.c | 12 ------------ camlibs/sierra/sierra.c | 38 ++++++++++++++++++------------------- 3 files changed, 21 insertions(+), 32 deletions(-) diff --git a/camlibs/sierra/ChangeLog b/camlibs/sierra/ChangeLog index 5df915a10..367681be5 100644 --- a/camlibs/sierra/ChangeLog +++ b/camlibs/sierra/ChangeLog @@ -1,3 +1,6 @@ +2003-09-13 Patrick Mansfield + * epson-desc.c sierra.c: get rid of C++ style comments. + 2003-08-30 Patrick Mansfield * olympus-desc.c, sierra.c, sierra-desc.h: Add specific values for the Olympus 3000z, based on input from Till Kamppeter diff --git a/camlibs/sierra/epson-desc.c b/camlibs/sierra/epson-desc.c index 46a92737d..8993e42b6 100644 --- a/camlibs/sierra/epson-desc.c +++ b/camlibs/sierra/epson-desc.c @@ -507,18 +507,11 @@ static const RegisterDescriptorType ep3000z_reg_103[] = { static CameraRegisterType ep3000z_pic_regs[] = { /* camera prefix, register number, size of register */ CAM_REG_TYPE_INIT (ep3000z, 01, 4, CAM_DESC_DEFAULT, 0), /* resolution/size */ - //CAM_REG_TYPE_INIT (ep3000z, 03, 4, CAM_DESC_DEFAULT, 0), /* shutter */ CAM_REG_TYPE_INIT (ep3000z, 05, 4, CAM_DESC_DEFAULT, 0), /* aperature (f-stop) */ CAM_REG_TYPE_INIT (ep3000z, 06, 4, CAM_DESC_DEFAULT, 0), /* color mode */ CAM_REG_TYPE_INIT (ep3000z, 07, 4, CAM_DESC_DEFAULT, 0), /* flash */ CAM_REG_TYPE_INIT (ep3000z, 20, 4, CAM_DESC_DEFAULT, 0), /* white balance */ CAM_REG_TYPE_INIT (ep3000z, 33, 4, CAM_DESC_DEFAULT, 0), /* focus mode */ - //CAM_REG_TYPE_INIT (ep3000z,103, 4, CAM_DESC_DEFAULT, 0), /* focus position */ - //CAM_REG_TYPE_INIT (ep3000z, 69, 8, CAM_DESC_DEFAULT, 0), /* exposure compensation */ - //CAM_REG_TYPE_INIT (ep3000z, 70, 4, CAM_DESC_DEFAULT, 0), /* exposure metering */ - //CAM_REG_TYPE_INIT (ep3000z, 71, 8, CAM_DESC_DEFAULT, 0), /* optical zoom */ - //CAM_REG_TYPE_INIT (ep3000z, 72, 4, CAM_DESC_DEFAULT, 0), /* digital zoom + lense + AE lock */ - //CAM_REG_TYPE_INIT (ep3000z, 85, 4, CAM_DESC_DEFAULT, 0), /* ISO Speed, read only */ }; /* @@ -527,13 +520,8 @@ static CameraRegisterType ep3000z_pic_regs[] = { static const CameraRegisterType ep3000z_cam_regs[] = { CAM_REG_TYPE_INIT (ep3000z, 53, 4, CAM_DESC_DEFAULT, 0), /* date-time */ CAM_REG_TYPE_INIT (ep3000z, 02, 4, CAM_DESC_DEFAULT, 0), /* date-time */ - //CAM_REG_TYPE_INIT (ep3000z, 34, 4, CAM_DESC_SUBACTION, - // SIERRA_ACTION_LCD_MODE), /* lcd mode */ - //CAM_REG_TYPE_INIT (ep3000z, 35, 4, CAM_DESC_DEFAULT, 0), /* LCD brightness */ - //CAM_REG_TYPE_INIT (ep3000z, 38, 4, CAM_DESC_DEFAULT, 0), /* LCD auto shutoff */ CAM_REG_TYPE_INIT (ep3000z, 24, 4, CAM_DESC_DEFAULT, 0), /* Camera power save */ CAM_REG_TYPE_INIT (ep3000z, 23, 4, CAM_DESC_DEFAULT, 0), /* Host power save */ - //CAM_REG_TYPE_INIT (ep3000z, 41, 4, CAM_DESC_DEFAULT, 0), /* time format, read only */ }; static const CameraRegisterSetType ep3000z_desc[] = { diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c index d8fd0560b..d127f4702 100644 --- a/camlibs/sierra/sierra.c +++ b/camlibs/sierra/sierra.c @@ -728,12 +728,11 @@ put_file_func (CameraFilesystem * fs, const char *folder, CameraFile * file, voi } #ifdef UNUSED_CODE -// FIXME: Is this function still usefull ? static void dump_register (Camera *camera, GPContext *context) { int ret, value, i; const char *description[] = { - "?", // 0 + "?", /* 0 */ "resolution", "date", "shutter speed", @@ -743,7 +742,7 @@ static void dump_register (Camera *camera, GPContext *context) "flash mode", "?", "?", - "frames taken", // 10 + "frames taken", /* 10 */ "frames left", "size of current image", "size of thumbnail of current image", @@ -753,7 +752,7 @@ static void dump_register (Camera *camera, GPContext *context) "?", "?", "brightness/contrast", - "white balance", // 20 + "white balance", /* 20 */ "?", "camera id", "auto off (host)", @@ -763,7 +762,7 @@ static void dump_register (Camera *camera, GPContext *context) "?", "memory left", "?", - "?", // 30 + "?", /* 30 */ "?", "?", "lens mode", @@ -773,31 +772,31 @@ static void dump_register (Camera *camera, GPContext *context) "?", "lcd auto off", "?", - "?", // 40 + "?", /* 40 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "?", // 50 + "?", /* 50 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "?", // 60 + "?", /* 60 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "spot metering mode", // 70 + "spot metering mode", /* 70 */ "?", "zoom", "?", "?", "?", "?", "?", "?", "current filename", - "?", // 80 + "?", /* 80 */ "?", "?", "number of folders in current folder/folder number", "current folder name", "?", "?", "?", "?", "?", - "?", // 90 + "?", /* 90 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "?", // 100 + "?", /* 100 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "?", // 110 + "?", /* 110 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "?", // 120 + "?", /* 120 */ "?", "?", "?", "?", "?", "?", "?", "?", "?", - "?" // 130 + "?" /* 130 */ }; @@ -901,9 +900,10 @@ camera_get_config_olympus (Camera *camera, CameraWidget **window, GPContext *con /* Color Mode */ ret = sierra_get_int_register (camera, 6, &value, context); if (ret >= 0) { - - // Those values are for a C-2020 Z. If your model differs, we - // have to distinguish models here... + /* + * Those values are for a C-2020 Z. If your model differs, + * we have to distinguish models here. + */ gp_widget_new (GP_WIDGET_RADIO, _("Color Mode"), &child); gp_widget_add_choice (child, _("Normal")); gp_widget_add_choice (child, _("Black/White")); @@ -1817,7 +1817,6 @@ camera_set_config_epson (Camera *camera, CameraWidget *window, GPContext *contex static int camera_get_config_default (Camera *camera, CameraWidget **window, GPContext *context) { - // This really should change in the near future... return camera_get_config_olympus (camera, window, context); } @@ -1825,7 +1824,6 @@ camera_get_config_default (Camera *camera, CameraWidget **window, GPContext *con static int camera_set_config_default (Camera *camera, CameraWidget *window, GPContext *context) { - // This really should change in the near futur... return camera_set_config_olympus (camera, window, context); }