diff options
author | Marcus Meissner <meissner@suse.de> | 2018-04-16 07:12:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-16 07:12:46 +0200 |
commit | bdb39ac1720f9a5d74967f9e78d62347f496926b (patch) | |
tree | f479b76c7850539c4bad0eb856329dceaf0059cf | |
parent | e3904f32b88248c60a3b968dceebeb973569df20 (diff) | |
parent | 785e98a9a19eebb3b458e2be8c97dbc1cc9dab82 (diff) | |
download | libmtp-bdb39ac1720f9a5d74967f9e78d62347f496926b.tar.gz |
Merge pull request #10 from philipl/master
Include names for events when dumping device info
-rw-r--r-- | src/libmtp.c | 2 | ||||
-rw-r--r-- | src/ptp.c | 37 | ||||
-rw-r--r-- | src/ptp.h | 1 |
3 files changed, 39 insertions, 1 deletions
diff --git a/src/libmtp.c b/src/libmtp.c index 02431c1..77e9139 100644 --- a/src/libmtp.c +++ b/src/libmtp.c @@ -3182,7 +3182,7 @@ void LIBMTP_Dump_Device_Info(LIBMTP_mtpdevice_t *device) printf(" None.\n"); } else { for (i=0;i<params->deviceinfo.EventsSupported_len;i++) { - printf(" 0x%04x (%s)\n", params->deviceinfo.EventsSupported[i], ptp_strerror(params->deviceinfo.EventsSupported[i], params->deviceinfo.VendorExtensionID)); + printf(" 0x%04x: %s\n", params->deviceinfo.EventsSupported[i], ptp_get_event_code_name(params, params->deviceinfo.EventsSupported[i])); } } printf("Device Properties Supported:\n"); @@ -6331,6 +6331,43 @@ ptp_get_opcode_name(PTPParams* params, uint16_t opcode) struct { + uint16_t code; + const char *name; +} ptp_event_codes[] = { + {PTP_EC_Undefined, "Undefined"}, + {PTP_EC_CancelTransaction, "CancelTransaction"}, + {PTP_EC_ObjectAdded, "ObjectAdded"}, + {PTP_EC_ObjectRemoved, "ObjectRemoved"}, + {PTP_EC_StoreAdded, "StoreAdded"}, + {PTP_EC_StoreRemoved, "StoreRemoved"}, + {PTP_EC_DevicePropChanged, "DevicePropChanged"}, + {PTP_EC_ObjectInfoChanged, "ObjectInfoChanged"}, + {PTP_EC_DeviceInfoChanged, "DeviceInfoChanged"}, + {PTP_EC_RequestObjectTransfer, "RequestObjectTransfer"}, + {PTP_EC_StoreFull, "StoreFull"}, + {PTP_EC_DeviceReset, "DeviceReset"}, + {PTP_EC_StorageInfoChanged, "StorageInfoChanged"}, + {PTP_EC_CaptureComplete, "CaptureComplete"}, + {PTP_EC_UnreportedStatus, "UnreportedStatus"}, + + {PTP_EC_MTP_ObjectPropChanged, "ObjectPropChanged"}, + {PTP_EC_MTP_ObjectPropDescChanged, "ObjectPropDescChanged"}, + {PTP_EC_MTP_ObjectReferencesChanged, "ObjectReferencesChanged"}, +}; + + +const char* +ptp_get_event_code_name(PTPParams* params, uint16_t event_code) +{ + unsigned int i; + for (i=0; i<sizeof(ptp_event_codes)/sizeof(ptp_event_codes[0]); i++) + if (event_code == ptp_event_codes[i].code) + return _(ptp_event_codes[i].name); + return _("Unknown Event"); +} + + +struct { uint16_t id; const char *name; } ptp_opc_trans[] = { @@ -3356,6 +3356,7 @@ void ptp_error (PTPParams *params, const char *format, ...); const char* ptp_get_property_description(PTPParams* params, uint16_t dpc); const char* ptp_get_opcode_name(PTPParams* params, uint16_t opcode); +const char* ptp_get_event_code_name(PTPParams* params, uint16_t event_code); int ptp_render_property_value(PTPParams* params, uint16_t dpc, |