summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camlibs/ax203/tinyjpeg.c12
-rw-r--r--camlibs/enigma13/enigma13.c2
-rw-r--r--camlibs/iclick/iclick.h2
-rw-r--r--camlibs/lg_gsm/lg_gsm.c83
-rw-r--r--camlibs/polaroid/dlink350f.c8
-rw-r--r--camlibs/ptp2/ptp.c2
-rw-r--r--camlibs/ptp2/ptp.h2
-rw-r--r--camlibs/spca50x/library.c2
-rw-r--r--tests/ddb/ddb-common.h2
-rw-r--r--tests/test-camera-list.c2
10 files changed, 59 insertions, 58 deletions
diff --git a/camlibs/ax203/tinyjpeg.c b/camlibs/ax203/tinyjpeg.c
index 0a29ca4df..dbb75b616 100644
--- a/camlibs/ax203/tinyjpeg.c
+++ b/camlibs/ax203/tinyjpeg.c
@@ -544,15 +544,15 @@ static void decode_MCU_1x1_3planes(struct jdec_private *priv, int block_nr)
priv->nbits_in_reservoir = 0;
priv->reservoir = 0;
- // Cb
+ /* Cb */
process_Huffman_data_unit(priv, cCb, block_nr);
IDCT(&priv->component_infos[cCb], priv->Cb, 8);
- // Cr
+ /* Cr */
process_Huffman_data_unit(priv, cCr, block_nr);
IDCT(&priv->component_infos[cCr], priv->Cr, 8);
- // Y
+ /* Y */
process_Huffman_data_unit(priv, cY, block_nr);
IDCT(&priv->component_infos[cY], priv->Y, 8);
@@ -573,15 +573,15 @@ static void decode_MCU_2x2_3planes(struct jdec_private *priv, int block_nr)
priv->nbits_in_reservoir = 0;
priv->reservoir = 0;
- // Cb
+ /* Cb */
process_Huffman_data_unit(priv, cCb, 0);
IDCT(&priv->component_infos[cCb], priv->Cb, 8);
- // Cr
+ /* Cr */
process_Huffman_data_unit(priv, cCr, 0);
IDCT(&priv->component_infos[cCr], priv->Cr, 8);
- // Y
+ /* Y */
process_Huffman_data_unit(priv, cY, block_nr);
IDCT(&priv->component_infos[cY], priv->Y, 16);
process_Huffman_data_unit(priv, cY, -1);
diff --git a/camlibs/enigma13/enigma13.c b/camlibs/enigma13/enigma13.c
index 4d8ad1c0c..1fea76027 100644
--- a/camlibs/enigma13/enigma13.c
+++ b/camlibs/enigma13/enigma13.c
@@ -343,7 +343,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
Camera *camera = data;
int image_no, result;
- //int i, ret, numpics;
+ /*int i, ret, numpics;*/
char* img_data=NULL;
int img_size=-1;
diff --git a/camlibs/iclick/iclick.h b/camlibs/iclick/iclick.h
index 039e92941..6f7212529 100644
--- a/camlibs/iclick/iclick.h
+++ b/camlibs/iclick/iclick.h
@@ -55,7 +55,7 @@ struct _CameraPrivateLibrary {
};
-// #define ID 0xf0
+/* #define ID 0xf0 */
enum icl_cmnd_type {
CONFIG =0x20,
DATA =0x30,
diff --git a/camlibs/lg_gsm/lg_gsm.c b/camlibs/lg_gsm/lg_gsm.c
index 1cf6b738a..92b1890a5 100644
--- a/camlibs/lg_gsm/lg_gsm.c
+++ b/camlibs/lg_gsm/lg_gsm.c
@@ -51,15 +51,15 @@ int lg_gsm_init (GPPort *port, Model *model, Info *info)
GP_DEBUG("Running lg_gsm_init\n");
port->timeout=20000;
- //syncstart
+ /* syncstart */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_start, 6);
READ(port, oknok, 6);
- //getfirmware : write 0x010000000000
+ /* getfirmware : write 0x010000000000 */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, get_firmware, 0x6);
READ(port, firmware, 54);
- //syncstop
+ /* syncstop */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_stop, 6);
READ(port, oknok, 6);
@@ -68,7 +68,7 @@ int lg_gsm_init (GPPort *port, Model *model, Info *info)
memcpy (info, &firmware[6], 40);
GP_DEBUG("info = %s\n", info);
- //GP_DEBUG("info[20] = 0x%x\n", firmware[26]);
+ /*GP_DEBUG("info[20] = 0x%x\n", firmware[26]);*/
GP_DEBUG("Leaving lg_gsm_init\n");
return GP_OK;
@@ -78,19 +78,20 @@ unsigned int lg_gsm_get_picture_size (GPPort *port, int pic)
{
unsigned int size;
- // example : list photos 2 & 3: 0x04000800000040000000
- // + 0100 : from
- // + 0200 : to
+ /* example : list photos 2 & 3: 0x04000800000040000000
+ + 0100 : from
+ + 0200 : to
+ */
char listphotos[] = "\x04\x0\x08\x0\x0\x0\x40\x0\x0\x0\x0\x0\x0\x0";
char photonumber[22];
- char photodesc[142]; //1 * 142
+ char photodesc[142]; /* 1 * 142 */
char oknok[6];
memset (oknok,0,6);
memset (photonumber,0,22);
memset (photodesc,0,142);
- //listphotos[11]=listphotos[13]=pic / 256;
- //listphotos[10]=listphotos[12]=pic % 256;
+ /*listphotos[11]=listphotos[13]=pic / 256;*/
+ /*listphotos[10]=listphotos[12]=pic % 256;*/
listphotos[10] = listphotos[12] = pic;
GP_DEBUG("Running lg_gsm_get_picture_size\n");
@@ -99,13 +100,13 @@ unsigned int lg_gsm_get_picture_size (GPPort *port, int pic)
READ(port, oknok, 6);
MSGWRITE(port, 0x13, 0xe, 0x0, "", 0);
WRITE(port, listphotos, 0xe);
- //read 22
+ /* read 22 */
READ(port, photonumber, 0x16);
- //then read 142
+ /* then read 142 */
READ(port, photodesc, 0x8e);
size = (unsigned int)photodesc[138] + (unsigned int)photodesc[139]*0x100 + (unsigned int)photodesc[140]*0x10000+(unsigned int)photodesc[141]*0x1000000;
GP_DEBUG(" size of picture %i is 0x%x\n", pic, size);
- // max. 1280x960x24bits ?
+ /* max. 1280x960x24bits ? */
if ( (size >= 0x384000 ) ) {return GP_ERROR;}
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_stop, 6);
@@ -119,7 +120,7 @@ int lg_gsm_read_picture_data (GPPort *port, char *data, int size, int n)
char listphotos[] = "\x04\x0\x08\x0\x0\x0\x40\x0\x0\x0\x0\x0\x0\x0";
char photonumber[22];
- char photodesc[142]; //1 * 142
+ char photodesc[142]; /* 1 * 142 */
char getphoto[144];
char getphotorespheader[150];
char block[50000];
@@ -139,42 +140,42 @@ int lg_gsm_read_picture_data (GPPort *port, char *data, int size, int n)
memset (getphotorespheader,0,150);
memset (block,0,50000);
- //listphotos[11]=listphotos[13]=n / 256;
- //listphotos[10]=listphotos[12]=n % 256;
+ /*listphotos[11]=listphotos[13]=n / 256;*/
+ /*listphotos[10]=listphotos[12]=n % 256;*/
listphotos[10]=listphotos[12]=n;
- //port->timeout=20000;
+ /* port->timeout=20000;*/
GP_DEBUG("Running lg_gsm_read_picture_data\n");
- //syncstart
+ /* syncstart */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_start, 6);
READ(port, oknok, 6);
MSGWRITE(port, 0x13, 0x0e, 0x0, "", 0);
WRITE(port, listphotos, 0xe);
- //read 22
+ /* read 22 */
READ(port, photonumber, 0x16);
- //then read 142
+ /* then read 142 */
READ(port, photodesc, 142);
size = (int)photodesc[138] + (int)photodesc[139]*0x100 + (int)photodesc[140]*0x10000+(int)photodesc[141]*0x1000000;
GP_DEBUG(" size of picture %i is 0x%x\n", n, size);
- // max. 1280x960x24bits ?
+ /* max. 1280x960x24bits ? */
if ( (size >= 0x384000 ) ) {
return GP_ERROR;
}
memcpy(getphoto, &get_photo_cmd[0], 10);
- memcpy(getphoto +10, &n, 1); //TODO: fix this
- //memcpy(getphoto +11, 0, 1);
+ memcpy(getphoto +10, &n, 1); /*TODO: fix this*/
+ /*memcpy(getphoto +11, 0, 1);*/
memcpy(getphoto +12, &photodesc[6],44);
memcpy(getphoto +56, &photodesc[50],88);
- //send getphoto cmd
+ /* send getphoto cmd */
MSGWRITE(port, 0x13, 0x90, 0x0, "", 0);
WRITE(port, getphoto, 0x90);
- //read
+ /* read */
READ(port, getphotorespheader, 0x96);
nb_blocks=size/block_size+1;
- //port->timeout=15000;
+ /*port->timeout=15000;*/
for (i = 1 ; i <= nb_blocks ; i++)
{
remain = size - pos;
@@ -191,8 +192,8 @@ int lg_gsm_read_picture_data (GPPort *port, char *data, int size, int n)
}
}
- //port->timeout=5000;
- //syncstop
+ /*port->timeout=5000;*/
+ /* syncstop */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_stop, 6);
READ(port, oknok, 6);
@@ -208,7 +209,7 @@ int lg_gsm_list_files (GPPort *port, CameraList *list)
char oknok[6];
char photonumber[22];
- char photolist[142000]; //max_photos * 142
+ char photolist[142000]; /* max_photos * 142 */
char name[44];
char value[88];
@@ -220,38 +221,38 @@ int lg_gsm_list_files (GPPort *port, CameraList *list)
GP_DEBUG("Running lg_gsm_list_files\n");
- //set timeout to 3s
- //port->timeout=20000;
- //syncstart
+ /* set timeout to 3s */
+ /*port->timeout=20000;*/
+ /* syncstart */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_start, 6);
READ(port, oknok, 6);
- //lsphoto : write 0x04000800000040000000ffffffff
+ /* lsphoto : write 0x04000800000040000000ffffffff */
MSGWRITE(port, 0x13, 0xe, 0x0, "", 0);
WRITE(port, list_all_photo, 0xe);
READ(port, photonumber, 0x16);
num_pics=photonumber[20]+256*photonumber[21];
- //increase timeout to 20s
- //port->timeout=20000;
- //read 142 * nb_photos
+ /* increase timeout to 20s */
+ /*port->timeout=20000;*/
+ /* read 142 * nb_photos */
READ(port, photolist, 142*num_pics);
for (i = 0; i < num_pics; i++){
- //sprintf( name, "lg_gsm_pic%03i.jpg", i );
+ /* sprintf( name, "lg_gsm_pic%03i.jpg", i ); */
memcpy(name,&photolist[6+142*i],44);
memcpy(value,&photolist[50+142*i],80);
gp_list_append(list, name, value);
}
- //restore timeout to 5s
- //port->timeout=5000;
- //syncstop
+ /* restore timeout to 5s */
+ /*port->timeout=5000; */
+ /* syncstop */
MSGWRITE(port, 0x13, 0x6, 0x0, "", 0);
WRITE(port, sync_stop, 6);
READ(port, oknok, 6);
- //port->timeout=5000;
+ /*port->timeout=5000;*/
GP_DEBUG("Number of pics : %03i\n", num_pics);
diff --git a/camlibs/polaroid/dlink350f.c b/camlibs/polaroid/dlink350f.c
index 570b3e0e1..906597b93 100644
--- a/camlibs/polaroid/dlink350f.c
+++ b/camlibs/polaroid/dlink350f.c
@@ -72,13 +72,13 @@ int dlink_dsc350f_postprocessing_and_flip_both (int width, int height, unsigned
* for first half of image.
*/
switch (whichcolor % 3) {
- case 0: // blue
+ case 0: /* blue */
MINMAX((int)c,lowblue,hiblue);
break;
- case 1: // green
+ case 1: /* green */
MINMAX((int)c,lowgreen,higreen);
break;
- default: // red
+ default: /* red */
MINMAX((int)c,lowred,hired);
break;
}
@@ -90,7 +90,7 @@ int dlink_dsc350f_postprocessing_and_flip_both (int width, int height, unsigned
whichcolor++;
}
- /* // could do more color processing here
+ /* could do more color processing here
GP_DEBUG("adjusting color");
// adjust image colours
diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index 7f80ba2c8..7f28f88fd 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -4992,7 +4992,7 @@ uint16_t
ptp_object_want (PTPParams *params, uint32_t handle, int want, PTPObject **retob) {
uint16_t ret;
PTPObject *ob;
- //Camera *camera = ((PTPData *)params->data)->camera;
+ /*Camera *camera = ((PTPData *)params->data)->camera;*/
*retob = NULL;
if (!handle) {
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index ca5c98458..80ad35527 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -1065,7 +1065,7 @@ struct _PTPNIKONWifiProfile {
uint8_t encryption; /* 0 - None, 1 - WEP 64bit, 2 - WEP 128bit (not supported: 3 - TKIP) */
uint8_t key[64];
uint8_t key_nr;
-// char guid[16];
+/* char guid[16]; */
};
typedef struct _PTPNIKONWifiProfile PTPNIKONWifiProfile;
diff --git a/camlibs/spca50x/library.c b/camlibs/spca50x/library.c
index 1530ee4d7..c1ad101cd 100644
--- a/camlibs/spca50x/library.c
+++ b/camlibs/spca50x/library.c
@@ -613,7 +613,7 @@ camera_init (Camera *camera, GPContext *context)
if ((camera->pl->bridge == BRIDGE_SPCA504) ||
(camera->pl->bridge == BRIDGE_SPCA504B_PD)) {
-// if (abilities.usb_vendor != 0x04fc && abilities.usb_product != 0x504a )
+/* if (abilities.usb_vendor != 0x04fc && abilities.usb_product != 0x504a ) */
if (!(abilities.usb_vendor == 0x04fc && abilities.usb_product == 0x504a ))
ret = spca50x_reset (camera->pl);
}
diff --git a/tests/ddb/ddb-common.h b/tests/ddb/ddb-common.h
index 43905f8b4..075757a5e 100644
--- a/tests/ddb/ddb-common.h
+++ b/tests/ddb/ddb-common.h
@@ -77,7 +77,7 @@ typedef struct YYLTYPE {
YY_DECL;
/* #define YYLEX_PARAM void */
-// #define YYDEBUG 1
+/* #define YYDEBUG 1 */
extern FILE *yyin;
diff --git a/tests/test-camera-list.c b/tests/test-camera-list.c
index 3d8038731..cf0ebfa65 100644
--- a/tests/test-camera-list.c
+++ b/tests/test-camera-list.c
@@ -130,7 +130,7 @@ typedef enum {
static OutputFormat format = FMT_HEADED_TEXT;
-// #define DEBUG_OUTPUT
+/* #define DEBUG_OUTPUT */
/** Parse command line and set global variables. */
View Lorry Controller Status