From 330fdfabbcf198a796efb6c90c343814f5c96b87 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 25 Mar 2024 18:55:01 -0400 Subject: [PATCH] Remove old fuji stuff --- src/cl_data.h | 50 -------------------------------------------------- src/data.c | 32 -------------------------------- src/generic.c | 1 + src/lib.c | 2 +- 4 files changed, 2 insertions(+), 83 deletions(-) diff --git a/src/cl_data.h b/src/cl_data.h index 8ea808e..0c8df9b 100644 --- a/src/cl_data.h +++ b/src/cl_data.h @@ -160,52 +160,6 @@ enum PtpCHDKCommands { PTP_CHDK_UploadFile = 5, }; -// Response to struct FujiInitPacket -struct PtpFujiInitResp { - uint32_t x1; - uint32_t x2; - uint32_t x3; - uint32_t x4; - char cam_name[54]; -}; - -// Appears to be an array for events -struct PtpFujiEvents { - uint16_t length; - struct PtpFujiEventsEntry { - uint16_t code; - uint32_t value; - }events[]; -}; - -// Looks very similar to standard ISO ObjectInfo, but random bits moved around. -// variable data starts at same location. -struct PtpFujiObjectInfo { - uint32_t storage_id; - uint16_t obj_format; - uint16_t protection; - uint32_t fuji_max_partial_size; - uint8_t fuji_unknown2; - uint32_t compressed_size; - uint16_t fuji_unknown3; - uint16_t fuji_unknown4; - uint8_t fuji_unknown5; - uint32_t img_width; - uint32_t img_height; - uint32_t img_bit_depth; - uint32_t parent_obj; - uint16_t assoc_type; - uint32_t assoc_desc; - uint32_t sequence_num; - - #define PTP_FUJI_OBJ_INFO_VAR_START 52 - - char filename[64]; - char date_created[32]; - char settings[32]; - char meta[32]; -}; - #pragma pack(pop) #ifdef CAMLIB_INCLUDE_IMPL @@ -234,10 +188,6 @@ int ptp_eos_get_imgformat_value(uint32_t data[5]); void *ptp_pack_chdk_upload_file(struct PtpRuntime *r, char *in, char *out, int *length); -// Fuji (PTP/IP) -int ptp_fuji_get_init_info(struct PtpRuntime *r, struct PtpFujiInitResp *resp); -int ptp_fuji_parse_object_info(struct PtpRuntime *r, struct PtpFujiObjectInfo *oi); - #endif #endif diff --git a/src/data.c b/src/data.c index b664753..516e808 100644 --- a/src/data.c +++ b/src/data.c @@ -606,35 +606,3 @@ int ptp_eos_events_json(struct PtpRuntime *r, char *buffer, int max) { return curr; } - -// TODO: move to fudge -int ptp_fuji_get_init_info(struct PtpRuntime *r, struct PtpFujiInitResp *resp) { - uint8_t *d = ptp_get_payload(r); - - d += ptp_read_u32(d, &resp->x1); - d += ptp_read_u32(d, &resp->x2); - d += ptp_read_u32(d, &resp->x3); - d += ptp_read_u32(d, &resp->x4); - - ptp_read_unicode_string(resp->cam_name, (char *)d, sizeof(resp->cam_name)); - - return 0; -} - -int ptp_fuji_parse_object_info(struct PtpRuntime *r, struct PtpFujiObjectInfo *oi) { - uint8_t *d = ptp_get_payload(r); - memcpy(oi, d, PTP_FUJI_OBJ_INFO_VAR_START); - d += PTP_FUJI_OBJ_INFO_VAR_START; - d += ptp_read_string(d, oi->filename, sizeof(oi->filename)); - - /* TODO: Figure out payload later: - 0D 44 00 53 00 43 00 46 00 35 00 30 00 38 00 37 00 2E 00 4A 00 50 00 47 00 - 00 00 10 32 00 30 00 31 00 35 00 30 00 35 00 32 00 34 00 54 00 30 00 31 00 - 31 00 37 00 31 00 30 00 00 00 00 0E 4F 00 72 00 69 00 65 00 6E 00 74 00 61 - 00 74 00 69 00 6F 00 6E 00 3A 00 31 00 00 00 0C 00 00 00 03 00 01 20 0E 00 - 00 00 00 - */ - - return 0; -} - diff --git a/src/generic.c b/src/generic.c index 320e940..22edd27 100644 --- a/src/generic.c +++ b/src/generic.c @@ -27,6 +27,7 @@ int ptp_validate_property_value(struct PtpRuntime *r, int prop_code, uint32_t va break; default: ptp_panic("Unsupported PTP prop length %X\n", prop_code); + return 0; } if (value == cur_val) { diff --git a/src/lib.c b/src/lib.c index e896599..8b07aa0 100644 --- a/src/lib.c +++ b/src/lib.c @@ -162,7 +162,7 @@ int ptp_send(struct PtpRuntime *r, struct PtpCommand *cmd) { int rc = ptp_receive_bulk_packets(r); if (rc < 0) { ptp_mutex_unlock_thread(r); - ptp_verbose_log("Failed to recieve packets: %d\n", rc); + ptp_verbose_log("Failed to receive packets: %d\n", rc); return PTP_IO_ERR; }