ptp2: remove PTPCanon_Propery::proptype member

The proptype (a.k.a. device property code) is already stored in
dpd.DevicePropertyCode member. This patch introduces the
ptp_find_eos_devicepropdesc() function for the commonly repeated for-loop
looking for the DevicePropDesc* in the cache.

This now allows to completely replace PTPCanon_Property with
PTPDevicePropDesc and then drop the canon_props array altogether and use
the generic one.
This commit is contained in:
axxel
2024-09-25 02:32:12 +02:00
committed by Marcus Meissner
parent d0c91fd99e
commit 8a2c257ce4
4 changed files with 47 additions and 89 deletions

View File

@@ -1695,24 +1695,27 @@ ptp_pack_EOS_CustomFuncEx (PTPParams* params, unsigned char* data, char* str)
#define PTP_ece_OAN_OFC 0x0c
#define PTP_ece_OAN_Size 0x14
static PTPDevicePropDesc*
_lookup_or_allocate_canon_prop(PTPParams *params, uint16_t proptype)
static inline PTPDevicePropDesc*
ptp_find_eos_devicepropdesc(PTPParams *params, uint32_t dpc)
{
unsigned int j;
for (unsigned j=0; j < params->nrofcanon_props; j++)
if (params->canon_props[j].dpd.DevicePropertyCode == dpc)
return &params->canon_props[j].dpd;
return NULL;
}
for (j=0;j<params->nrofcanon_props;j++)
if (params->canon_props[j].proptype == proptype)
break;
if (j<params->nrofcanon_props)
return &params->canon_props[j].dpd;
static PTPDevicePropDesc*
_lookup_or_allocate_canon_prop(PTPParams *params, uint32_t dpc)
{
PTPDevicePropDesc *dpd = ptp_find_eos_devicepropdesc(params, dpc);
if (j)
params->canon_props = realloc(params->canon_props, sizeof(params->canon_props[0])*(j+1));
else
params->canon_props = malloc(sizeof(params->canon_props[0]));
params->canon_props[j].proptype = proptype;
if (dpd)
return dpd;
unsigned j = params->nrofcanon_props;
params->canon_props = realloc(params->canon_props, sizeof(params->canon_props[0])*(j+1));
memset (&params->canon_props[j].dpd,0,sizeof(params->canon_props[j].dpd));
params->canon_props[j].dpd.DevicePropertyCode = proptype;
params->canon_props[j].dpd.DevicePropertyCode = dpc;
params->canon_props[j].dpd.GetSet = 1;
params->canon_props[j].dpd.FormFlag = PTP_DPFF_None;
params->nrofcanon_props = j+1;
@@ -1872,15 +1875,11 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
const unsigned char *xdata = &curdata[PTP_ece_Prop_Desc_Data];
unsigned int xsize = size - PTP_ece_Prop_Desc_Data;
unsigned int j;
PTPDevicePropDesc *dpd;
for (j=0;j<params->nrofcanon_props;j++)
if (params->canon_props[j].proptype == proptype)
break;
PTPDevicePropDesc *dpd = ptp_find_eos_devicepropdesc(params, proptype);
ptp_debug (params, "event %3d: EOS prop %04x options changed, type %d, count %2d (%s) %s",
i, proptype, propxtype, propxcnt, ptp_get_property_description (params, proptype),
j==params->nrofcanon_props ? "(unknown)" : "");
dpd ? "" : "(unknown)");
/* 1 - uint16 ?
* 3 - uint16
* 7 - string?
@@ -1890,11 +1889,9 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
break;
}
if (j==params->nrofcanon_props || propxcnt == 0 || propxcnt >= 2<<16) /* buggy or exploit */
if (!dpd || propxcnt == 0 || propxcnt >= 2<<16) /* buggy or exploit */
break;
dpd = &params->canon_props[j].dpd;
dpd->FormFlag = PTP_DPFF_Enumeration;
dpd->FORM.Enum.NumberOfValues = propxcnt;
free (dpd->FORM.Enum.SupportedValue);
@@ -1953,25 +1950,11 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
uint32_t proptype = dtoh32a(&curdata[PTP_ece_Prop_Subtype]);
const unsigned char *xdata = &curdata[PTP_ece_Prop_Val_Data];
unsigned int xsize = size - PTP_ece_Prop_Val_Data;
PTPDevicePropDesc *dpd;
ptp_debug (params, "event %3d: EOS prop %04x value changed, size %2d (%s)",
i, proptype, xsize, ptp_get_property_description(params, proptype));
for (j=0;j<params->nrofcanon_props;j++)
if (params->canon_props[j].proptype == proptype)
break;
if (j == params->nrofcanon_props) {
if (j)
params->canon_props = realloc(params->canon_props, sizeof(params->canon_props[0])*(j+1));
else
params->canon_props = malloc(sizeof(params->canon_props[0]));
params->canon_props[j].proptype = proptype;
memset (&params->canon_props[j].dpd,0,sizeof(params->canon_props[j].dpd));
params->canon_props[j].dpd.GetSet = 1;
params->canon_props[j].dpd.FormFlag = PTP_DPFF_None;
params->nrofcanon_props = j+1;
}
dpd = &params->canon_props[j].dpd;
PTPDevicePropDesc *dpd = _lookup_or_allocate_canon_prop(params, proptype);
ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY;
ce[i].u.propid = proptype;

View File

@@ -142,7 +142,7 @@ have_eos_prop(PTPParams *params, uint16_t vendor, uint16_t prop) {
if ((params->deviceinfo.VendorExtensionID != PTP_VENDOR_CANON) || (vendor != PTP_VENDOR_CANON))
return 0;
for (i=0;i<params->nrofcanon_props;i++)
if (params->canon_props[i].proptype == prop)
if (params->canon_props[i].dpd.DevicePropertyCode == prop)
return 1;
return 0;
}

View File

@@ -3931,26 +3931,12 @@ uint16_t
ptp_canon_eos_getdevicepropdesc (PTPParams* params, uint16_t propcode,
PTPDevicePropDesc *dpd)
{
unsigned int i;
PTPDevicePropDesc *cached_dpd = ptp_find_eos_devicepropdesc(params, propcode);
for (i=0;i<params->nrofcanon_props;i++)
if (params->canon_props[i].proptype == propcode)
break;
if (params->nrofcanon_props == i)
if (!cached_dpd)
return PTP_RC_Undefined;
memcpy (dpd, &params->canon_props[i].dpd, sizeof (*dpd));
if (dpd->FormFlag == PTP_DPFF_Enumeration) {
/* need to duplicate the Enumeration alloc */
dpd->FORM.Enum.SupportedValue = calloc (dpd->FORM.Enum.NumberOfValues, sizeof (PTPPropertyValue));
memcpy (dpd->FORM.Enum.SupportedValue,
params->canon_props[i].dpd.FORM.Enum.SupportedValue,
sizeof (PTPPropertyValue)*dpd->FORM.Enum.NumberOfValues
);
}
if (dpd->DataType == PTP_DTC_STR) {
dpd->FactoryDefaultValue.str = strdup( params->canon_props[i].dpd.FactoryDefaultValue.str );
dpd->CurrentValue.str = strdup( params->canon_props[i].dpd.CurrentValue.str );
}
duplicate_DevicePropDesc(cached_dpd, dpd);
return PTP_RC_OK;
}
@@ -4107,16 +4093,14 @@ ptp_canon_eos_setdevicepropvalue (PTPParams* params,
PTPContainer ptp;
uint16_t ret;
unsigned char *data = NULL;
unsigned int i, size;
unsigned int size;
PTPDevicePropDesc *dpd = ptp_find_eos_devicepropdesc(params, propcode);
if (!dpd)
return PTP_RC_Undefined;
PTP_CNT_INIT(ptp, PTP_OC_CANON_EOS_SetDevicePropValueEx);
for (i=0;i<params->nrofcanon_props;i++)
if (params->canon_props[i].proptype == propcode)
break;
if (params->nrofcanon_props == i)
return PTP_RC_Undefined;
switch (propcode) {
case PTP_DPC_CANON_EOS_ImageFormat:
case PTP_DPC_CANON_EOS_ImageFormatCF:
@@ -4137,15 +4121,12 @@ ptp_canon_eos_setdevicepropvalue (PTPParams* params,
ptp_pack_EOS_CustomFuncEx( params, data + 8, value->str );
break;
default:
if (datatype != PTP_DTC_STR) {
data = calloc(3,sizeof(uint32_t));
if (!data) return PTP_RC_GeneralError;
if (datatype != PTP_DTC_STR)
size = sizeof(uint32_t)*3;
} else {
else
size = strlen(value->str) + 1 + 8;
data = calloc(size,sizeof(char));
if (!data) return PTP_RC_GeneralError;
}
data = calloc(size,sizeof(char));
if (!data) return PTP_RC_GeneralError;
switch (datatype) {
case PTP_DTC_INT8:
case PTP_DTC_UINT8:
@@ -4181,30 +4162,30 @@ ptp_canon_eos_setdevicepropvalue (PTPParams* params,
case PTP_DPC_CANON_EOS_ImageFormatSD:
case PTP_DPC_CANON_EOS_ImageFormatExtHD:
/* special handling of ImageFormat properties */
params->canon_props[i].dpd.CurrentValue.u16 = value->u16;
dpd->CurrentValue.u16 = value->u16;
break;
case PTP_DPC_CANON_EOS_CustomFuncEx:
/* special handling of CustomFuncEx properties */
free(params->canon_props[i].dpd.CurrentValue.str);
params->canon_props[i].dpd.CurrentValue.str = strdup( value->str );
free(dpd->CurrentValue.str);
dpd->CurrentValue.str = strdup( value->str );
break;
default:
switch (datatype) {
case PTP_DTC_INT8:
case PTP_DTC_UINT8:
params->canon_props[i].dpd.CurrentValue.u8 = value->u8;
dpd->CurrentValue.u8 = value->u8;
break;
case PTP_DTC_UINT16:
case PTP_DTC_INT16:
params->canon_props[i].dpd.CurrentValue.u16 = value->u16;
dpd->CurrentValue.u16 = value->u16;
break;
case PTP_DTC_INT32:
case PTP_DTC_UINT32:
params->canon_props[i].dpd.CurrentValue.u32 = value->u32;
dpd->CurrentValue.u32 = value->u32;
break;
case PTP_DTC_STR:
free (params->canon_props[i].dpd.CurrentValue.str);
params->canon_props[i].dpd.CurrentValue.str = strdup(value->str);
free (dpd->CurrentValue.str);
dpd->CurrentValue.str = strdup(value->str);
break;
}
}
@@ -4844,18 +4825,15 @@ ptp_generic_getdevicepropdesc (PTPParams *params, uint32_t propcode, PTPDevicePr
if ( (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) &&
ptp_operation_issupported(params, PTP_OC_CANON_EOS_RequestDevicePropValue)
) {
unsigned j;
for (j=0;j<params->nrofcanon_props;j++)
if (params->canon_props[j].proptype == propcode)
break;
if (j == params->nrofcanon_props) {
PTPDevicePropDesc *eos_dpd = ptp_find_eos_devicepropdesc(params, propcode);
if (!eos_dpd) {
ptp_debug (params, "Canon EOS property %04x not found", propcode);
if ((propcode & 0xFF00) == 0xD100 || (propcode & 0xFF00) == 0xD200)
return PTP_RC_DevicePropNotSupported;
else
goto generic;
}
duplicate_DevicePropDesc(&params->canon_props[j].dpd, &params->deviceproperties[i].desc);
duplicate_DevicePropDesc(eos_dpd, &params->deviceproperties[i].desc);
goto done;
}

View File

@@ -1870,9 +1870,6 @@ struct _PTPCanon_changes_entry {
typedef struct _PTPCanon_changes_entry PTPCanon_changes_entry;
typedef struct _PTPCanon_Property {
uint32_t proptype;
/* fill out for queries */
PTPDevicePropDesc dpd;
} PTPCanon_Property;