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

* library.c:

Browse Source 
* ptp.c:
	* ptp.h: Moved include of time.h to ptp.h to get time_t definition
	  Moved typedef lines after their dependent definitions.
	  Fixed spelling of PTPDeviceInfo.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3784 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Dan Fandrich
2002-01-09 21:05:02 +00:00
parent b62d3ac8f5
commit f45ea4384b
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/ptp/ChangeLog
View File

@@ -1,3 +1,11 @@
2002-01-09 Dan Fandrich <dan@coneharvesters.com>
* library.c:
* ptp.c:
* ptp.h: Moved include of time.h to ptp.h to get time_t definition
Moved typedef lines after their dependent definitions.
Fixed spelling of PTPDeviceInfo.
2002-01-09 Mariusz Woloszyn
* Started ptp fs implementation

1
camlibs/ptp/library.c
View File

@@ -22,7 +22,6 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <time.h>
#include <gphoto2-library.h>
#include <gphoto2-debug.h>

3
camlibs/ptp/ptp.c
View File

@@ -25,7 +25,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
#ifdef ENABLE_NLS
# include <libintl.h>
@@ -233,7 +232,7 @@ ptp_transaction (PTPParams* params, PTPReq* req, uint16_t code,
#if 0
// Do GetDevInfo (we may use it for some camera_about)
uint16_t
ptp_getdevinfo (PTPParams* params, PTPDedviceInfo* devinfo)
ptp_getdevinfo (PTPParams* params, PTPDeviceInfo* devinfo)
{
}
#endif

11
camlibs/ptp/ptp.h
View File

@@ -22,6 +22,7 @@
#define __PTP_H__
#include <stdarg.h>
#include <time.h>
#include <gphoto2-endian.h>
// PTP datalayer byteorder
@@ -36,7 +37,6 @@
#define PTP_REQ_HDR_LEN (2*sizeof(uint32_t)+2*sizeof(uint16_t))
#define PTP_REQ_DATALEN 16384
typedef struct _PTPReq PTPReq;
struct _PTPReq {
uint32_t len;
uint16_t type;
@@ -44,6 +44,7 @@ struct _PTPReq {
uint32_t trans_id;
char data[PTP_REQ_DATALEN];
};
typedef struct _PTPReq PTPReq;
// Container types
@@ -135,7 +136,6 @@ struct _PTPReq {
// PTP device info structure (returned by GetDevInfo)
typedef struct _PTPDeviceInfo PTPDedviceInfo;
struct _PTPDeviceInfo {
uint16_t StaqndardVersion;
uint32_t VendorExtensionID;
@@ -152,20 +152,20 @@ struct _PTPDeviceInfo {
char *DeviceVersionl;
char *SerialNumber;
};
typedef struct _PTPDeviceInfo PTPDeviceInfo;
// PTP objecthandles structure (returned by GetObjectHandles)
typedef struct _PTPObjectHandles PTPObjectHandles;
struct _PTPObjectHandles {
uint32_t n;
uint32_t handler[(PTP_REQ_DATALEN-sizeof(uint32_t))/sizeof(uint32_t)];
};
typedef struct _PTPObjectHandles PTPObjectHandles;
// PTP objectinfo structure (returned by GetObjectInfo)
typedef struct _PTPObjectInfo PTPObjectInfo;
struct _PTPObjectInfo {
uint32_t StorageID;
uint16_t ObjectFormat;
@@ -187,6 +187,7 @@ struct _PTPObjectInfo {
time_t ModificationDate;
char *Keywords;
};
typedef struct _PTPObjectInfo PTPObjectInfo;
#define MAXFILENAMELEN 255
@@ -252,7 +253,6 @@ typedef short (* PTPIOWriteFunc) (unsigned char *bytes, unsigned int size,
typedef void (* PTPErrorFunc) (void *data, const char *format, va_list args);
typedef void (* PTPDebugFunc) (void *data, const char *format, va_list args);
typedef struct _PTPParams PTPParams;
struct _PTPParams {
/* data layer byteorder */
uint8_t byteorder;
@@ -274,6 +274,7 @@ struct _PTPParams {
PTPObjectInfo * objectinfo;
};
typedef struct _PTPParams PTPParams;
// ptp functions