summaryrefslogtreecommitdiff
path: root/camlibs/toshiba
diff options
context:
space:
mode:
authorSiim Meerits <sh0@yutani.ee>2020-07-27 17:37:00 +0300
committerSiim Meerits <sh0@yutani.ee>2020-07-27 17:37:00 +0300
commit456a1d598bccc260b233d2e91c469be452e0fbef (patch)
treec1288655494c94292f6e2eb26d722958899c7107 /camlibs/toshiba
parentaf2c0e0558e78cae06371abef36f43ca74a9c5c0 (diff)
downloadlibgphoto2-456a1d598bccc260b233d2e91c469be452e0fbef.tar.gz
Remove trailing whitespace from all *.h and *.c files.
Diffstat (limited to 'camlibs/toshiba')
-rw-r--r--camlibs/toshiba/pdrm11/library.c18
-rw-r--r--camlibs/toshiba/pdrm11/pdrm11.c26
-rw-r--r--camlibs/toshiba/pdrm11/pdrm11.h8
3 files changed, 26 insertions, 26 deletions
diff --git a/camlibs/toshiba/pdrm11/library.c b/camlibs/toshiba/pdrm11/library.c
index 6169c490d..1b7964315 100644
--- a/camlibs/toshiba/pdrm11/library.c
+++ b/camlibs/toshiba/pdrm11/library.c
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@@ -45,7 +45,7 @@
#define GP_MODULE "Toshiba"
int
-camera_id (CameraText *id)
+camera_id (CameraText *id)
{
strcpy(id->text, "toshiba-pdrm11");
@@ -54,7 +54,7 @@ camera_id (CameraText *id)
int
-camera_abilities (CameraAbilitiesList *list)
+camera_abilities (CameraAbilitiesList *list)
{
CameraAbilities a;
@@ -66,7 +66,7 @@ camera_abilities (CameraAbilitiesList *list)
a.usb_vendor = 0x1132;
a.usb_product = 0x4337;
a.operations = GP_OPERATION_NONE;
- a.file_operations = GP_FILE_OPERATION_DELETE |
+ a.file_operations = GP_FILE_OPERATION_DELETE |
GP_FILE_OPERATION_PREVIEW;
a.folder_operations = GP_FOLDER_OPERATION_NONE;
@@ -77,7 +77,7 @@ camera_abilities (CameraAbilitiesList *list)
static int
-camera_exit (Camera *camera, GPContext *context)
+camera_exit (Camera *camera, GPContext *context)
{
return (GP_OK);
}
@@ -90,7 +90,7 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
{
int picNum;
Camera *camera = data;
-
+
switch(type){
case GP_FILE_TYPE_PREVIEW:
case GP_FILE_TYPE_NORMAL:
@@ -140,7 +140,7 @@ static CameraFilesystemFuncs fsfuncs = {
};
int
-camera_init (Camera *camera, GPContext *context)
+camera_init (Camera *camera, GPContext *context)
{
/* First, set up all the function pointers */
camera->functions->exit = camera_exit;
diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c
index 8fb7f2a54..9083d766f 100644
--- a/camlibs/toshiba/pdrm11/pdrm11.c
+++ b/camlibs/toshiba/pdrm11/pdrm11.c
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@@ -41,7 +41,7 @@ int pdrm11_init(GPPort *port)
{
unsigned char buf[20];
int timeout = 50;
-
+
gp_port_set_timeout(port,1000);
/* exactly what windows driver does */
@@ -60,7 +60,7 @@ int pdrm11_init(GPPort *port)
GP_DEBUG("PDRM11_CMD_ZERO: %x %x", buf[0], buf[1]);
return(GP_ERROR);
}
-
+
/* wait til the camera is ready */
do {
@@ -71,7 +71,7 @@ int pdrm11_init(GPPort *port)
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 );
-
+
/* what good is this? */
usleep(400000);
@@ -97,7 +97,7 @@ int pdrm11_get_filenames(GPPort *port, CameraList *list)
numPics = le16atoh(&buf[2]) + (le16atoh(&buf[0]) * 1024);
GP_DEBUG("found %d pictures", numPics);
-
+
for(i=1; i<numPics+1; i++) {
CHECK( pdrm11_select_file(port, i) );
@@ -126,7 +126,7 @@ static int pdrm11_select_file(GPPort *port, uint16_t file)
uint16_t picNum = htole16(file);
uint16_t file_type;
-
+
/* byte 4 of PDRM11_CMD_GET_INFO determines if the file is a jpeg or tiff */
CHECK(gp_port_usb_msg_read(port, 0x01, PDRM11_CMD_GET_INFO, file, buf, 8));
file_type = htole16(buf[4]);
@@ -148,7 +148,7 @@ static int pdrm11_ping(GPPort *port)
#endif
-int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType type,
+int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType type,
CameraFile *file, GPPort *port, uint16_t picNum)
{
uint32_t size = 0;
@@ -160,7 +160,7 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t
int ret;
int file_type;
-
+
gp_port_set_timeout(port,10000);
CHECK( pdrm11_select_file(port, picNum) );
@@ -170,9 +170,9 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t
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 */
- if(file_type == 1) {
+ if(file_type == 1) {
GP_DEBUG("thumbnail file_type: %s.", "jpeg");
size = (uint32_t)thumbsize + 1;
} else if(file_type == 2) {
@@ -225,7 +225,7 @@ int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType t
image[i+1] = temp;
}
}
-
+
gp_file_set_mime_type(file, GP_MIME_JPEG);
gp_file_set_data_and_size(file, (char *)image, size);
diff --git a/camlibs/toshiba/pdrm11/pdrm11.h b/camlibs/toshiba/pdrm11/pdrm11.h
index 01bb328d7..5cc2534ef 100644
--- a/camlibs/toshiba/pdrm11/pdrm11.h
+++ b/camlibs/toshiba/pdrm11/pdrm11.h
@@ -7,10 +7,10 @@
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
@@ -76,7 +76,7 @@
int pdrm11_init(GPPort *port);
-int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType type,
+int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType type,
CameraFile *file, GPPort *port, uint16_t picNum);
int pdrm11_get_filenames(GPPort *port, CameraList *list);
int pdrm11_delete_file(GPPort *port, int picNum);