Menu
▾
▴
[gphoto-cvs] SF.net SVN: gphoto:[11970] trunk/libgphoto2/camlibs/ptp2
|
From: <mar...@us...> - 2009-04-11 12:10:10
|
Revision: 11970
http://gphoto.svn.sourceforge.net/gphoto/?rev=11970&view=rev
Author: marcusmeissner
Date: 2009-04-11 12:10:04 +0000 (Sat, 11 Apr 2009)
Log Message:
-----------
added event queue handling, for all but EOS check event.
unify the return values of the various check_event functions
wait_for_event adjusted and simplified (work in progress)
Modified Paths:
--------------
trunk/libgphoto2/camlibs/ptp2/ChangeLog
trunk/libgphoto2/camlibs/ptp2/config.c
trunk/libgphoto2/camlibs/ptp2/library.c
trunk/libgphoto2/camlibs/ptp2/ptp-pack.c
trunk/libgphoto2/camlibs/ptp2/ptp.c
trunk/libgphoto2/camlibs/ptp2/ptp.h
Modified: trunk/libgphoto2/camlibs/ptp2/ChangeLog
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ChangeLog 2009-04-11 12:00:06 UTC (rev 11969)
+++ trunk/libgphoto2/camlibs/ptp2/ChangeLog 2009-04-11 12:10:04 UTC (rev 11970)
@@ -1,3 +1,16 @@
+2009-04-10 Marcus Meissner <ma...@je...>
+
+ * ptp.c,ptp.h,ptp-pack.c: make nikon check event return a
+ generic PTPContainer, make canon check event also return
+ a generic PTPContainer.
+
+ * ptp.c,ptp.h: Added 2 PTP event queue, generic events and Canon EOS.
+
+ * library.c: Rewrote wait_for_event to use event queues etc.
+
+ * library.c: Hooked up the first try at the trigger capture method,
+ currently just PTP generic, others to follow.
+
2009-03-27 Marcus Meissner <ma...@je...>
* library.c, ptp.c, ptp.h: use Nikon Get Vendor Extension Codes
Modified: trunk/libgphoto2/camlibs/ptp2/config.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/config.c 2009-04-11 12:00:06 UTC (rev 11969)
+++ trunk/libgphoto2/camlibs/ptp2/config.c 2009-04-11 12:10:04 UTC (rev 11970)
@@ -66,8 +66,7 @@
static int
camera_prepare_canon_powershot_capture(Camera *camera, GPContext *context) {
- PTPUSBEventContainer event;
- PTPContainer evc;
+ PTPContainer event;
PTPPropertyValue propval;
uint16_t val16;
int i, ret, isevent;
@@ -114,11 +113,11 @@
gp_port_set_timeout (camera->port, 1000);
/* Catch event */
- if (PTP_RC_OK==(val16=params->event_wait (params, &evc))) {
- if (evc.Code==PTP_EC_StorageInfoChanged)
+ if (PTP_RC_OK==(val16=params->event_wait (params, &event))) {
+ if (event.Code==PTP_EC_StorageInfoChanged)
gp_log (GP_LOG_DEBUG, "ptp", "Event: entering shooting mode. \n");
else
- gp_log (GP_LOG_DEBUG, "ptp", "Event: 0x%X\n", evc.Code);
+ gp_log (GP_LOG_DEBUG, "ptp", "Event: 0x%X\n", event.Code);
} else {
printf("No event yet, we'll try later.\n");
}
@@ -130,9 +129,9 @@
gp_log (GP_LOG_DEBUG, "ptp", "error during check event: %d\n", ret);
}
if (isevent)
- gp_log (GP_LOG_DEBUG, "ptp", "evdata: L=0x%X, T=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X\n",
- event.length,event.type,event.code,event.trans_id,
- event.param1, event.param2, event.param3);
+ gp_log (GP_LOG_DEBUG, "ptp", "evdata: nparam=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X\n",
+ event.Nparam,event.Code,event.Transaction_ID,
+ event.Param1, event.Param2, event.Param3);
}
gp_port_set_timeout (camera->port, oldtimeout);
if (ptp_operation_issupported(params, PTP_OC_CANON_ViewfinderOn)) {
@@ -144,11 +143,11 @@
gp_port_set_timeout (camera->port, 1000);
/* Catch event, attempt 2 */
if (val16!=PTP_RC_OK) {
- if (PTP_RC_OK==params->event_wait (params, &evc)) {
- if (evc.Code == PTP_EC_StorageInfoChanged)
+ if (PTP_RC_OK==params->event_wait (params, &event)) {
+ if (event.Code == PTP_EC_StorageInfoChanged)
gp_log (GP_LOG_DEBUG, "ptp","Event: entering shooting mode.\n");
else
- gp_log (GP_LOG_DEBUG, "ptp","Event: 0x%X\n", evc.Code);
+ gp_log (GP_LOG_DEBUG, "ptp","Event: 0x%X\n", event.Code);
} else
gp_log (GP_LOG_DEBUG, "ptp", "No expected mode change event.\n");
}
Modified: trunk/libgphoto2/camlibs/ptp2/library.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/library.c 2009-04-11 12:00:06 UTC (rev 11969)
+++ trunk/libgphoto2/camlibs/ptp2/library.c 2009-04-11 12:10:04 UTC (rev 11970)
@@ -1571,7 +1571,7 @@
newobject = 0xffff0001;
while (!((ptp_nikon_device_ready(params) == PTP_RC_OK) && hasc101)) {
int i, evtcnt;
- PTPUSBEventContainer *nevent = NULL;
+ PTPContainer *nevent = NULL;
/* Just busy loop until the camera is ready again. */
/* and wait for the 0xc101 event */
@@ -1579,10 +1579,10 @@
if (ret != PTP_RC_OK)
break;
for (i=0;i<evtcnt;i++) {
- gp_log (GP_LOG_DEBUG , "ptp/nikon_capture", "%d:nevent.Code is %x / param %lx", i, nevent[i].code, (unsigned long)nevent[i].param1);
- if (nevent[i].code == PTP_EC_Nikon_ObjectAddedInSDRAM) {
+ gp_log (GP_LOG_DEBUG , "ptp/nikon_capture", "%d:nevent.Code is %x / param %lx", i, nevent[i].Code, (unsigned long)nevent[i].Param1);
+ if (nevent[i].Code == PTP_EC_Nikon_ObjectAddedInSDRAM) {
hasc101=1;
- newobject = nevent[i].param1;
+ newobject = nevent[i].Param1;
if (!newobject) newobject = 0xffff0001;
}
}
@@ -1733,7 +1733,6 @@
PTPPropertyValue propval;
uint16_t val16;
PTPContainer event;
- PTPUSBEventContainer usbevent;
uint32_t handle;
char buf[1024];
int xmode = CANON_TRANSFER_CARD;
@@ -1808,24 +1807,23 @@
found = FALSE;
while ((time(NULL) - event_start)<=timeout) {
gp_context_idle (context);
- ret = ptp_canon_checkevent (params,&usbevent,&isevent);
+ ret = ptp_canon_checkevent (params,&event,&isevent);
if (ret!=PTP_RC_OK)
continue;
if (isevent)
- gp_log (GP_LOG_DEBUG, "ptp","evdata: L=0x%X, T=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", usbevent.length,usbevent.type,usbevent.code,usbevent.trans_id, usbevent.param1, usbevent.param2, usbevent.param3);
+ gp_log (GP_LOG_DEBUG, "ptp","evdata: nparams=0x%X, code=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", event.Nparam,event.Code,event.Transaction_ID, event.Param1, event.Param2, event.Param3);
if ( isevent &&
- (usbevent.type==PTP_USB_CONTAINER_EVENT) &&
- (usbevent.code==PTP_EC_CANON_RequestObjectTransfer)
+ (event.Code==PTP_EC_CANON_RequestObjectTransfer)
) {
int j;
- handle=usbevent.param1;
- gp_log (GP_LOG_DEBUG, "ptp", "PTP_EC_CANON_RequestObjectTransfer, object handle=0x%X.",usbevent.param1);
- newobject = usbevent.param1;
+ handle=event.Param1;
+ gp_log (GP_LOG_DEBUG, "ptp", "PTP_EC_CANON_RequestObjectTransfer, object handle=0x%X.",handle);
+ newobject = event.Param1;
for (j=0;j<2;j++) {
- ret=ptp_canon_checkevent(params,&usbevent,&isevent);
+ ret=ptp_canon_checkevent(params,&event,&isevent);
if ((ret==PTP_RC_OK) && isevent)
- gp_log (GP_LOG_DEBUG, "ptp", "evdata: L=0x%X, T=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", usbevent.length,usbevent.type,usbevent.code,usbevent.trans_id, usbevent.param1, usbevent.param2, usbevent.param3);
+ gp_log (GP_LOG_DEBUG, "ptp", "evdata: L=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", event.Nparam,event.Code,event.Transaction_ID, event.Param1, event.Param2, event.Param3);
}
/* Marcus: Not sure if we really needs this.
ret = ptp_canon_reset_aeafawb(params,7);
@@ -2088,16 +2086,13 @@
uint32_t newobject = 0x0;
CameraFilePath *path;
static int capcnt = 0;
- int i, oldtimeout;
+ int i;
uint16_t ret;
time_t event_start;
CameraFile *file;
char *ximage;
int finish = 0;
-static PTPCanon_changes_entry *backlogentries = NULL;
-static int nrofbacklogentries = 0;
-
SET_CONTEXT(camera, context);
memset (&event, 0, sizeof(event));
@@ -2114,12 +2109,12 @@
while ((time(NULL) - event_start)<=(timeout/1000 + 1)) {
int i;
- if (backlogentries) {
- gp_log (GP_LOG_DEBUG, "ptp2/wait_for_eos_event", "Using %d backlog entries", nrofbacklogentries);
- entries = backlogentries;
- nrofentries = nrofbacklogentries;
- backlogentries = NULL;
- nrofbacklogentries = 0;
+ if (params->backlogentries) {
+ gp_log (GP_LOG_DEBUG, "ptp2/wait_for_eos_event", "Using %d backlog entries", params->nrofbacklogentries);
+ entries = params->backlogentries;
+ nrofentries = params->nrofbacklogentries;
+ params->backlogentries = NULL;
+ params->nrofbacklogentries = 0;
} else {
ret = ptp_canon_eos_getevent (params, &entries, &nrofentries);
if (ret != PTP_RC_OK) {
@@ -2187,9 +2182,9 @@
if (finish) {
if (nrofentries-i > 1) {
gp_log (GP_LOG_DEBUG, "ptp2/wait_for_eos_event", "Backlogging %d events", nrofentries-i);
- backlogentries = malloc (sizeof (PTPCanon_changes_entry) * (nrofentries-i));
- nrofbacklogentries = (nrofentries-i-1);
- memcpy (backlogentries, entries+i+1, sizeof (PTPCanon_changes_entry) * (nrofentries-i-1));
+ params->backlogentries = malloc (sizeof (PTPCanon_changes_entry) * (nrofentries-i));
+ params->nrofbacklogentries = (nrofentries-i-1);
+ memcpy (params->backlogentries, entries+i+1, sizeof (PTPCanon_changes_entry) * (nrofentries-i-1));
}
free (entries);
break;
@@ -2199,28 +2194,25 @@
}
return GP_OK;
}
+
if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
ptp_operation_issupported(params, PTP_OC_CANON_CheckEvent)
) {
- PTPUSBEventContainer usbevent;
- int isevent;
char *x;
event_start=time(NULL);
while ((time(NULL) - event_start)<=(timeout/1000 + 1)) {
+ ptp_check_event (params);
gp_context_idle (context);
- ret = ptp_canon_checkevent (params,&usbevent,&isevent);
- if (ret!=PTP_RC_OK)
+ if (!ptp_get_one_event(params, &event))
continue;
- if (isevent) {
- gp_log (GP_LOG_DEBUG, "ptp","evdata: L=0x%X, T=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", usbevent.length,usbevent.type,usbevent.code,usbevent.trans_id, usbevent.param1, usbevent.param2, usbevent.param3);
- *eventtype = GP_EVENT_UNKNOWN;
- x = malloc(strlen("PTP Canon Event 0123, Param1 01234567")+1);
- if (x) {
- sprintf (x, "PTP Canon Event %04x, Param1 %08x", usbevent.code, usbevent.param1);
- *eventdata = x;
- break;
- }
+ gp_log (GP_LOG_DEBUG, "ptp","evdata: nparam=0x%X, C=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", event.Nparam,event.Code,event.Transaction_ID, event.Param1, event.Param2, event.Param3);
+ *eventtype = GP_EVENT_UNKNOWN;
+ x = malloc(strlen("PTP Canon Event 0123, Param1 01234567")+1);
+ if (x) {
+ sprintf (x, "PTP Canon Event %04x, Param1 %08x", event.Code, event.Param1);
+ *eventdata = x;
+ break;
}
}
return GP_OK;
@@ -2228,107 +2220,111 @@
if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
ptp_operation_issupported(params, PTP_OC_NIKON_CheckEvent)
) {
- uint32_t newobject, hasc101;
+ uint32_t newobject;
event_start=time(NULL);
*eventtype = GP_EVENT_TIMEOUT;
while ((time(NULL) - event_start)<= (timeout/1000 + 1)) {
- int i, evtcnt;
- PTPUSBEventContainer *nevent = NULL;
-
- ret = ptp_nikon_check_event(params, &nevent, &evtcnt);
- if (ret != PTP_RC_OK)
+ ptp_check_event (params);
+ gp_context_idle (context);
+ if (!ptp_get_one_event (params, &event))
continue;
- for (i=0;i<evtcnt;i++) {
- gp_log (GP_LOG_DEBUG , "ptp/nikon_capture", "%d:nevent.Code is %x / param %lx", i, nevent[i].code, (unsigned long)nevent[i].param1);
- if (nevent[i].code == PTP_EC_ObjectAdded) {
- path = (CameraFilePath *)malloc(sizeof(CameraFilePath));
- if (!path)
- return GP_ERROR_NO_MEMORY;
- newobject = nevent[i].param1;
- add_object (camera, newobject, context);
- path->name[0]='\0';
- path->folder[0]='\0';
+ gp_log (GP_LOG_DEBUG , "ptp/nikon_capture", "event.Code is %x / param %lx", event.Code, (unsigned long)event.Param1);
+ switch (event.Code) {
+ case PTP_EC_ObjectAdded: {
+ int n;
+ PTPObjectInfo *obinfo;
- for (i = params->handles.n ; i--; ) {
- PTPObjectInfo *obinfo;
+ path = (CameraFilePath *)malloc(sizeof(CameraFilePath));
+ if (!path)
+ return GP_ERROR_NO_MEMORY;
+ newobject = event.Param1;
+ add_object (camera, newobject, context);
+ path->name[0]='\0';
+ path->folder[0]='\0';
- if (params->handles.Handler[i] != newobject)
- continue;
- obinfo = &camera->pl->params.objectinfo[i];
- strcpy (path->name, obinfo->Filename);
- sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)obinfo->StorageID);
- get_folder_from_handle (camera, obinfo->StorageID, obinfo->ParentObject, path->folder);
- /* delete last / or we get confused later. */
- path->folder[ strlen(path->folder)-1 ] = '\0';
- CR (gp_filesystem_append (camera->fs, path->folder,
- path->name, context));
- break;
- }
- *eventtype = GP_EVENT_FILE_ADDED;
- *eventdata = path;
- finish = 1;
+ n = handle_to_n (newobject, camera);
+ if (n == PTP_HANDLER_SPECIAL)
break;
- }
- if (nevent[i].code == PTP_EC_Nikon_ObjectAddedInSDRAM) {
- PTPObjectInfo oi;
+ obinfo = &camera->pl->params.objectinfo[n];
+ strcpy (path->name, obinfo->Filename);
+ sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)obinfo->StorageID);
+ get_folder_from_handle (camera, obinfo->StorageID, obinfo->ParentObject, path->folder);
+ /* delete last / or we get confused later. */
+ path->folder[ strlen(path->folder)-1 ] = '\0';
+ CR (gp_filesystem_append (camera->fs, path->folder,
+ path->name, context));
+ *eventtype = GP_EVENT_FILE_ADDED;
+ *eventdata = path;
+ break;
+ }
+ case PTP_EC_Nikon_ObjectAddedInSDRAM: {
+ PTPObjectInfo oi;
- hasc101=1;
- newobject = nevent[i].param1;
- if (!newobject) newobject = 0xffff0001;
- ret = ptp_getobjectinfo (params, newobject, &oi);
- if (ret != PTP_RC_OK)
- continue;
- path = (CameraFilePath *)malloc(sizeof(CameraFilePath));
- if (!path)
- return GP_ERROR_NO_MEMORY;
- path->name[0]='\0';
- strcpy (path->folder,"/");
- ret = gp_file_new(&file);
- if (ret!=GP_OK) return ret;
- sprintf (path->name, "capt%04d.jpg", capcnt++);
- gp_file_set_mime_type (file, GP_MIME_JPEG);
- gp_file_set_mtime (file, time(NULL));
+ newobject = event.Param1;
+ if (!newobject) newobject = 0xffff0001;
+ ret = ptp_getobjectinfo (params, newobject, &oi);
+ if (ret != PTP_RC_OK)
+ continue;
+ path = (CameraFilePath *)malloc(sizeof(CameraFilePath));
+ if (!path)
+ return GP_ERROR_NO_MEMORY;
+ path->name[0]='\0';
+ strcpy (path->folder,"/");
+ ret = gp_file_new(&file);
+ if (ret!=GP_OK) return ret;
+ sprintf (path->name, "capt%04d.jpg", capcnt++);
+ gp_file_set_mime_type (file, GP_MIME_JPEG);
+ gp_file_set_mtime (file, time(NULL));
- gp_log (GP_LOG_DEBUG, "ptp2/nikon_capture", "trying to get object size=0x%x", oi.ObjectCompressedSize);
- CPR (context, ptp_getobject (params, newobject, &ximage));
- ret = gp_file_set_data_and_size(file, (char*)ximage, oi.ObjectCompressedSize);
- if (ret != GP_OK) {
- gp_file_free (file);
- return ret;
- }
- ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
- if (ret != GP_OK) {
- gp_file_free (file);
- return ret;
- }
- ret = gp_filesystem_set_file_noop(camera->fs, path->folder, path->name, GP_FILE_TYPE_NORMAL, file, context);
- if (ret != GP_OK) {
- gp_file_free (file);
- return ret;
- }
- *eventtype = GP_EVENT_FILE_ADDED;
- *eventdata = path;
- /* We have now handed over the file, disclaim responsibility by unref. */
- gp_file_unref (file);
- finish = 1;
- break;
+ gp_log (GP_LOG_DEBUG, "ptp2/nikon_capture", "trying to get object size=0x%x", oi.ObjectCompressedSize);
+ CPR (context, ptp_getobject (params, newobject, &ximage));
+ ret = gp_file_set_data_and_size(file, (char*)ximage, oi.ObjectCompressedSize);
+ if (ret != GP_OK) {
+ gp_file_free (file);
+ return ret;
}
+ ret = gp_filesystem_append(camera->fs, path->folder, path->name, context);
+ if (ret != GP_OK) {
+ gp_file_free (file);
+ return ret;
+ }
+ ret = gp_filesystem_set_file_noop(camera->fs, path->folder, path->name, GP_FILE_TYPE_NORMAL, file, context);
+ if (ret != GP_OK) {
+ gp_file_free (file);
+ return ret;
+ }
+ *eventtype = GP_EVENT_FILE_ADDED;
+ *eventdata = path;
+ /* We have now handed over the file, disclaim responsibility by unref. */
+ gp_file_unref (file);
+ break;
}
- free (nevent);
- if (finish) return GP_OK;
+ case PTP_EC_CaptureComplete:
+ *eventtype = GP_EVENT_CAPTURE_COMPLETE;
+ *eventdata = NULL;
+ break;
+ default: {
+ char *x;
+
+ *eventtype = GP_EVENT_UNKNOWN;
+ x = malloc(strlen("PTP Event 0123, Param1 01234567")+1);
+ if (x) {
+ sprintf (x, "PTP Event %04x, Param1 %08x", event.Code, event.Param1);
+ *eventdata = x;
+ }
+ break;
+ }
+ }
+ return GP_OK;
}
*eventtype = GP_EVENT_TIMEOUT;
return GP_OK;
}
- gp_port_get_timeout (camera->port, &oldtimeout);
- gp_port_set_timeout (camera->port, timeout);
- ret = params->event_wait(params,&event);
- gp_port_set_timeout (camera->port, oldtimeout);
-
- if (ret!=PTP_RC_OK) {
+ ptp_check_event(params);
+ if (!ptp_get_one_event (params, &event)) {
/* FIXME: Might be another error, but usually is a timeout */
- gp_log (GP_LOG_DEBUG, "ptp2", "wait_for_event: received error 0x%04x", ret);
+ gp_log (GP_LOG_DEBUG, "ptp2", "wait_for_event: no events received.");
*eventtype = GP_EVENT_TIMEOUT;
return GP_OK;
}
@@ -2337,7 +2333,9 @@
);
switch (event.Code) {
- case PTP_EC_ObjectAdded:
+ case PTP_EC_ObjectAdded: {
+ PTPObjectInfo *obinfo;
+
path = (CameraFilePath *)malloc(sizeof(CameraFilePath));
if (!path)
return GP_ERROR_NO_MEMORY;
@@ -2346,24 +2344,27 @@
path->name[0]='\0';
path->folder[0]='\0';
- for (i = params->handles.n ; i--; ) {
- PTPObjectInfo *obinfo;
-
- if (params->handles.Handler[i] != newobject)
- continue;
- obinfo = &camera->pl->params.objectinfo[i];
- strcpy (path->name, obinfo->Filename);
- sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)obinfo->StorageID);
- get_folder_from_handle (camera, obinfo->StorageID, obinfo->ParentObject, path->folder);
- /* delete last / or we get confused later. */
- path->folder[ strlen(path->folder)-1 ] = '\0';
+ i = handle_to_n (newobject, camera);
+ if (i == PTP_HANDLER_SPECIAL)
+ return GP_ERROR;
+ obinfo = &camera->pl->params.objectinfo[i];
+ strcpy (path->name, obinfo->Filename);
+ sprintf (path->folder,"/"STORAGE_FOLDER_PREFIX"%08lx/",(unsigned long)obinfo->StorageID);
+ get_folder_from_handle (camera, obinfo->StorageID, obinfo->ParentObject, path->folder);
+ /* delete last / or we get confused later. */
+ path->folder[ strlen(path->folder)-1 ] = '\0';
+ if (obinfo->ObjectFormat == PTP_OFC_Association) { /* new folder! */
+ *eventtype = GP_EVENT_FOLDER_ADDED;
+ *eventdata = path;
+ gp_filesystem_reset (camera->fs); /* FIXME: implement more lightweight folder add */
+ } else {
CR (gp_filesystem_append (camera->fs, path->folder,
path->name, context));
- break;
+ *eventtype = GP_EVENT_FILE_ADDED;
+ *eventdata = path;
}
- *eventtype = GP_EVENT_FILE_ADDED;
- *eventdata = path;
break;
+ }
default: {
char *x;
Modified: trunk/libgphoto2/camlibs/ptp2/ptp-pack.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ptp-pack.c 2009-04-11 12:00:06 UTC (rev 11969)
+++ trunk/libgphoto2/camlibs/ptp2/ptp-pack.c 2009-04-11 12:10:04 UTC (rev 11970)
@@ -1045,27 +1045,36 @@
#define PTP_ec_Param3 20
static inline void
-ptp_unpack_EC (PTPParams *params, unsigned char* data, PTPUSBEventContainer *ec, unsigned int len)
+ptp_unpack_EC (PTPParams *params, unsigned char* data, PTPContainer *ec, unsigned int len)
{
+ int length;
+ int type;
+
if (data==NULL)
return;
- ec->length=dtoh32a(&data[PTP_ec_Length]);
- ec->type=dtoh16a(&data[PTP_ec_Type]);
- ec->code=dtoh16a(&data[PTP_ec_Code]);
- ec->trans_id=dtoh32a(&data[PTP_ec_TransId]);
+ memset(&ec,0,sizeof(ec));
+ length=dtoh32a(&data[PTP_ec_Length]);
+ type = dtoh16a(&data[PTP_ec_Type]);
- if (ec->length>=(PTP_ec_Param1+4))
- ec->param1=dtoh32a(&data[PTP_ec_Param1]);
- else
- ec->param1=0;
- if (ec->length>=(PTP_ec_Param2+4))
- ec->param2=dtoh32a(&data[PTP_ec_Param2]);
- else
- ec->param2=0;
- if (ec->length>=(PTP_ec_Param3+4))
- ec->param3=dtoh32a(&data[PTP_ec_Param3]);
- else
- ec->param3=0;
+ ec->Code=dtoh16a(&data[PTP_ec_Code]);
+ ec->Transaction_ID=dtoh32a(&data[PTP_ec_TransId]);
+
+ if (type!=PTP_USB_CONTAINER_EVENT) {
+ ptp_debug (params, "Unknown canon event type %d (code=%x,tid=%x), please report!",type,ec->Code,ec->Transaction_ID);
+ return;
+ }
+ if (length>=(PTP_ec_Param1+4)) {
+ ec->Param1=dtoh32a(&data[PTP_ec_Param1]);
+ ec->Nparam=1;
+ }
+ if (length>=(PTP_ec_Param2+4)) {
+ ec->Param2=dtoh32a(&data[PTP_ec_Param2]);
+ ec->Nparam=2;
+ }
+ if (length>=(PTP_ec_Param3+4)) {
+ ec->Param3=dtoh32a(&data[PTP_ec_Param3]);
+ ec->Nparam=3;
+ }
}
/*
@@ -1349,7 +1358,7 @@
#define PTP_nikon_ec_Param1 4
#define PTP_nikon_ec_Size 6
static inline void
-ptp_unpack_Nikon_EC (PTPParams *params, unsigned char* data, unsigned int len, PTPUSBEventContainer **ec, int *cnt)
+ptp_unpack_Nikon_EC (PTPParams *params, unsigned char* data, unsigned int len, PTPContainer **ec, int *cnt)
{
int i;
@@ -1361,12 +1370,13 @@
*cnt = dtoh16a(&data[PTP_nikon_ec_Length]);
if (*cnt > (len-PTP_nikon_ec_Code)/PTP_nikon_ec_Size) /* broken cnt? */
return;
- *ec = malloc(sizeof(PTPUSBEventContainer)*(*cnt));
+ *ec = malloc(sizeof(PTPContainer)*(*cnt));
for (i=0;i<*cnt;i++) {
- memset(&(*ec)[i],0,sizeof(PTPUSBEventContainer));
- (*ec)[i].code = dtoh16a(&data[PTP_nikon_ec_Code+PTP_nikon_ec_Size*i]);
- (*ec)[i].param1 = dtoh32a(&data[PTP_nikon_ec_Param1+PTP_nikon_ec_Size*i]);
+ memset(&(*ec)[i],0,sizeof(PTPContainer));
+ (*ec)[i].Code = dtoh16a(&data[PTP_nikon_ec_Code+PTP_nikon_ec_Size*i]);
+ (*ec)[i].Param1 = dtoh32a(&data[PTP_nikon_ec_Param1+PTP_nikon_ec_Size*i]);
+ (*ec)[i].Nparam = 1;
}
}
Modified: trunk/libgphoto2/camlibs/ptp2/ptp.c
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ptp.c 2009-04-11 12:00:06 UTC (rev 11969)
+++ trunk/libgphoto2/camlibs/ptp2/ptp.c 2009-04-11 12:10:04 UTC (rev 11970)
@@ -1698,7 +1698,7 @@
* or 0 otherwise
**/
uint16_t
-ptp_canon_checkevent (PTPParams* params, PTPUSBEventContainer* event, int* isevent)
+ptp_canon_checkevent (PTPParams* params, PTPContainer* event, int* isevent)
{
uint16_t ret;
PTPContainer ptp;
@@ -1721,7 +1721,71 @@
return ret;
}
+void
+ptp_check_event (PTPParams *params) {
+ PTPContainer event;
+ uint16_t ret;
+ if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_NIKON) &&
+ ptp_operation_issupported(params, PTP_OC_NIKON_CheckEvent)
+ ) {
+ int evtcnt;
+ PTPContainer *xevent = NULL;
+
+ ret = ptp_nikon_check_event(params, &xevent, &evtcnt);
+ if (ret != PTP_RC_OK)
+ return;
+
+ if (evtcnt) {
+ if (params->nrofevents)
+ params->events = realloc(params->events, sizeof(PTPContainer)*(evtcnt+params->nrofevents));
+ else
+ params->events = malloc(sizeof(PTPContainer)*evtcnt);
+ memcpy (¶ms->events[params->nrofevents],xevent,evtcnt*sizeof(PTPContainer));
+ params->nrofevents += evtcnt;
+ free (xevent);
+ }
+ return;
+ }
+ if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
+ ptp_operation_issupported(params, PTP_OC_CANON_CheckEvent)
+ ) {
+ int isevent;
+
+ ret = ptp_canon_checkevent (params,&event,&isevent);
+ if (ret!=PTP_RC_OK)
+ return;
+ if (isevent) {
+ goto store_event;
+ }
+ /* FIXME: fallthrough or return? */
+ }
+ ret = params->event_check(params,&event);
+
+store_event:
+ if (ret == PTP_RC_OK) {
+ ptp_debug (params, "event: nparams=0x%X, code=0x%X, trans_id=0x%X, p1=0x%X, p2=0x%X, p3=0x%X", event.Nparam,event.Code,event.Transaction_ID, event.Param1, event.Param2, event.Param3);
+ if (params->nrofevents)
+ params->events = realloc(params->events, sizeof(PTPContainer)*(params->nrofevents+1));
+ else
+ params->events = malloc(sizeof(PTPContainer)*1);
+ memcpy (¶ms->events[params->nrofevents],&event,1*sizeof(PTPContainer));
+ params->nrofevents += 1;
+ }
+}
+
+int
+ptp_get_one_event(PTPParams *params, PTPContainer *event) {
+ if (!params->nrofevents)
+ return 0;
+ memcpy (event, params->events, sizeof(PTPContainer));
+ memmove (params->events, params->events+1, sizeof(PTPContainer)*(params->nrofevents-1));
+ /* do not realloc on shrink. */
+ params->nrofevents--;
+ return 1;
+}
+
+
/**
* ptp_canon_focuslock:
*
@@ -2610,7 +2674,7 @@
*
**/
uint16_t
-ptp_nikon_check_event (PTPParams* params, PTPUSBEventContainer** event, int* evtcnt)
+ptp_nikon_check_event (PTPParams* params, PTPContainer** event, int* evtcnt)
{
PTPContainer ptp;
uint16_t ret;
Modified: trunk/libgphoto2/camlibs/ptp2/ptp.h
===================================================================
--- trunk/libgphoto2/camlibs/ptp2/ptp.h 2009-04-11 12:00:06 UTC (rev 11969)
+++ trunk/libgphoto2/camlibs/ptp2/ptp.h 2009-04-11 12:10:04 UTC (rev 11970)
@@ -1687,11 +1687,19 @@
PTPObjectInfo *objectinfo;
PTPDeviceInfo deviceinfo;
+ /* PTP: the current event queue */
+ PTPContainer *events;
+ int nrofevents;
+
/* PTP: Canon specific flags list */
- uint32_t *canon_flags; /* size(handles.n) */
+ uint32_t *canon_flags; /* size(handles.n) */
PTPCanon_Property *canon_props;
int nrofcanon_props;
+ /* PTP: Canon EOS event queue */
+ PTPCanon_changes_entry *backlogentries;
+ int nrofbacklogentries;
+
/* PTP: Wifi profiles */
uint8_t wifi_profiles_version;
uint8_t wifi_profiles_number;
@@ -1795,6 +1803,10 @@
uint16_t ptp_setdevicepropvalue (PTPParams* params, uint16_t propcode,
PTPPropertyValue* value, uint16_t datatype);
+
+void ptp_check_event (PTPParams *params);
+int ptp_get_one_event (PTPParams *params, PTPContainer *evt);
+
/* Microsoft MTP extensions */
uint16_t ptp_mtp_getobjectpropdesc (PTPParams* params, uint16_t opc, uint16_t ofc,
PTPObjectPropDesc *objectpropertydesc);
@@ -1843,7 +1855,7 @@
#define PTP_CANON_RESET_AWB 0x4
uint16_t ptp_canon_reset_aeafawb (PTPParams* params, uint32_t flags);
uint16_t ptp_canon_checkevent (PTPParams* params,
- PTPUSBEventContainer* event, int* isevent);
+ PTPContainer* event, int* isevent);
uint16_t ptp_canon_focuslock (PTPParams* params);
uint16_t ptp_canon_focusunlock (PTPParams* params);
uint16_t ptp_canon_keepdeviceon (PTPParams* params);
@@ -1899,7 +1911,7 @@
uint16_t ptp_nikon_get_liveview_image (PTPParams* params, unsigned char**,unsigned int*);
uint16_t ptp_nikon_get_preview_image (PTPParams* params, unsigned char**, unsigned int*, uint32_t*);
uint16_t ptp_nikon_end_liveview (PTPParams* params);
-uint16_t ptp_nikon_check_event (PTPParams* params, PTPUSBEventContainer **evt, int *evtcnt);
+uint16_t ptp_nikon_check_event (PTPParams* params, PTPContainer **evt, int *evtcnt);
uint16_t ptp_nikon_getfileinfoinblock (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3,
unsigned char **data, unsigned int *size);
uint16_t ptp_nikon_device_ready (PTPParams* params);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|